10539622/2025-03-JS-SDK-svr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

fix:修改状态方法

Browse Source
This commit is contained in:
郭飞 2025-05-15 19:30:25 +08:00
parent 4504b4cec4
commit 72b3c89815
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java
View File

@ -563,7 +563,8 @@ public class MaterialReceiveActController {
SDKMaterialPackingServiceImpl.updateMaterialPackingUndoIdByReceive(receiveRequestName, undoId); SDKMaterialPackingServiceImpl.updateMaterialPackingUndoIdByReceive(receiveRequestName, undoId);
// 更新库存状态 // 更新库存状态
SDKMaterialPackingServiceImpl.SaveUnDoInfo( undoId,commitDate); SDKMaterialPackingServiceImpl.SaveUnDoInfo( undoId,commitDate);
SDKMaterialPackingServiceImpl.updateStockState(makeEventInfo, undoId,opCode,erpLocation, erpFactory1); // SDKMaterialPackingServiceImpl.updateStockState(makeEventInfo, undoId,opCode,erpLocation, erpFactory1);
SDKMaterialPackingServiceImpl.updateStockState(makeEventInfo, undoId,opCode);
} }
// 到货单据更新状态 // 到货单据更新状态
if (Objects.nonNull(materialDelivery)) { if (Objects.nonNull(materialDelivery)) {

12
zi-wms-pda/src/main/java/com/cim/idm/service/Impl/InvoiceServiceImpl.java
View File

@ -3353,12 +3353,13 @@ public class InvoiceServiceImpl implements InvoiceService {
Boolean success = untils.sendMaterialInfoToMES_NEW2(shipRequestName, "", materialPackingKeyList,billCode,eventUser); Boolean success = untils.sendMaterialInfoToMES_NEW2(shipRequestName, "", materialPackingKeyList,billCode,eventUser);
if (!success) { if (!success) {
String undo = cancelShipInter(billCode, eventUser); String undo = cancelShipInter(billCode, eventUser);
if (undo == null || undo.isEmpty()) { if (undo == null || undo.isEmpty()) {
throw new GlobalException("下发mes失败后冲销失败！"); throw new GlobalException("下发mes失败后冲销失败！");
}else {
throw new GlobalException("发送到mes失败！");
} }
throw new GlobalException("发送到mes失败！");
} }
WlySaveUnDoInfo( billCode,commitDate); WlySaveUnDoInfo( billCode,commitDate);
@ -3380,8 +3381,9 @@ public class InvoiceServiceImpl implements InvoiceService {
String undo = cancelShipInter(billCode, eventUser); String undo = cancelShipInter(billCode, eventUser);
if (undo == null || undo.isEmpty()) { if (undo == null || undo.isEmpty()) {
throw new GlobalException("下发mes失败后冲销失败！"); throw new GlobalException("下发mes失败后冲销失败！");
}else {
throw new GlobalException("发送到mes失败！");
} }
throw new GlobalException("发送到mes失败！");
} }
untils.SaveUnDoInfo_ForSap(materialPackingKeyList, billCode, makeEventInfo); untils.SaveUnDoInfo_ForSap(materialPackingKeyList, billCode, makeEventInfo);
@ -3396,12 +3398,12 @@ public class InvoiceServiceImpl implements InvoiceService {
Boolean success = untils.sendMaterialInfoToMES_NEW(shipRequestName, "", materialPackingKeyList,billCode,eventUser); Boolean success = untils.sendMaterialInfoToMES_NEW(shipRequestName, "", materialPackingKeyList,billCode,eventUser);
if (!success) { if (!success) {
String undo = cancelShipInter(billCode, eventUser); String undo = cancelShipInter(billCode, eventUser);
if (undo == null || undo.isEmpty()) { if (undo == null || undo.isEmpty()) {
throw new GlobalException("下发mes失败后冲销失败！"); throw new GlobalException("下发mes失败后冲销失败！");
}else {
throw new GlobalException("发送到mes失败！");
} }
throw new GlobalException("发送到mes失败！");
} }
//更新MES管芯数据 //更新MES管芯数据