|
|
@ -73,6 +73,8 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
|
|
|
|
@Autowired
|
|
|
|
@Autowired
|
|
|
|
private BaseWarehouseMapper baseWarehouseMapper;
|
|
|
|
private BaseWarehouseMapper baseWarehouseMapper;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
|
|
|
private WmsRawOrderInMapper wmsRawOrderInMapper;
|
|
|
|
@Autowired
|
|
|
|
@Autowired
|
|
|
|
private RemoteOpenService remoteOpenService;
|
|
|
|
private RemoteOpenService remoteOpenService;
|
|
|
|
/**
|
|
|
|
/**
|
|
|
@ -760,8 +762,28 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
|
|
|
|
R result2 = remoteSapService.temporarilyCollected(mapList);
|
|
|
|
R result2 = remoteSapService.temporarilyCollected(mapList);
|
|
|
|
int code = result2.getCode();
|
|
|
|
int code = result2.getCode();
|
|
|
|
if (code == 200){//成功
|
|
|
|
if (code == 200){//成功
|
|
|
|
order.setSapTempStatus("1");//0是失败。1是成功
|
|
|
|
|
|
|
|
order.setSapTempInfor(result2.getMsg());
|
|
|
|
order.setSapTempInfor(result2.getMsg());
|
|
|
|
|
|
|
|
WmsRawOrderIn wmsRawOrderIn=new WmsRawOrderIn();
|
|
|
|
|
|
|
|
wmsRawOrderIn.setRawOrderInId(IdUtils.fastSimpleUUID());
|
|
|
|
|
|
|
|
wmsRawOrderIn.setFactoryCode(odsProcureOrder.getFactoryCode());
|
|
|
|
|
|
|
|
wmsRawOrderIn.setDnNo(order.getReceiptNoCode());
|
|
|
|
|
|
|
|
wmsRawOrderIn.setPoNo(order.getProcureCode());
|
|
|
|
|
|
|
|
wmsRawOrderIn.setPoLine(order.getUserDefined3());
|
|
|
|
|
|
|
|
wmsRawOrderIn.setMaterialCode(order.getMaterialCode());
|
|
|
|
|
|
|
|
wmsRawOrderIn.setMaterialDesc(order.getMaterialDesc());
|
|
|
|
|
|
|
|
wmsRawOrderIn.setRequestAmount(amount);
|
|
|
|
|
|
|
|
wmsRawOrderIn.setUnit(order.getUnit());
|
|
|
|
|
|
|
|
wmsRawOrderIn.setRequestTime(new Date());
|
|
|
|
|
|
|
|
wmsRawOrderIn.setOrderStatus("0");//暂收
|
|
|
|
|
|
|
|
wmsRawOrderIn.setActiveFlag("1");
|
|
|
|
|
|
|
|
wmsRawOrderIn.setSupplyCode(order.getSupplierCode());
|
|
|
|
|
|
|
|
wmsRawOrderIn.setUserDefined1(result2.getMsg());
|
|
|
|
|
|
|
|
wmsRawOrderIn.setSapFactoryCode(odsProcureOrder.getFactoryCode());
|
|
|
|
|
|
|
|
wmsRawOrderIn.setCreateBy(odsProcureOrder.getCreateBy());
|
|
|
|
|
|
|
|
wmsRawOrderInMapper.insertWmsRawOrderIn(wmsRawOrderIn);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
order.setSapTempStatus("1");//0是失败。1是成功
|
|
|
|
|
|
|
|
|
|
|
|
odsProcureOrderMapper.updateOdsProcureOrder(order);
|
|
|
|
odsProcureOrderMapper.updateOdsProcureOrder(order);
|
|
|
|
for (WmsRawOrderInSn wmsRawOrderInSn:wmsRawOrderInSns){
|
|
|
|
for (WmsRawOrderInSn wmsRawOrderInSn:wmsRawOrderInSns){
|
|
|
|
//收货
|
|
|
|
//收货
|
|
|
@ -814,6 +836,10 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
wmsRawOrderInSnMapper.updateU1Byid(wmsRawOrderInSn);//入库
|
|
|
|
wmsRawOrderInSnMapper.updateU1Byid(wmsRawOrderInSn);//入库
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}else {////失败|
|
|
|
|
}else {////失败|
|
|
|
|
result="暂收失败";
|
|
|
|
result="暂收失败";
|
|
|
|
order.setSapTempInfor(result2.getMsg());
|
|
|
|
order.setSapTempInfor(result2.getMsg());
|
|
|
|