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

销售退货（pda）入库清除shiprequestname栏位

Browse Source
This commit is contained in:
王帅 2025-05-19 10:17:27 +08:00
parent a3c5d53f38
commit 523b88391a
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -555,7 +555,7 @@ public class MaterialReceiveActController {
EventInfoUtil util = new EventInfoUtil(); EventInfoUtil util = new EventInfoUtil();
makeEventInfo = util.makeEventInfo("NormalStockInForSDK", user, "NormalStockInForSDK"); makeEventInfo = util.makeEventInfo("NormalStockInForSDK", user, "NormalStockInForSDK");
// 更新入库凭证 // 更新入库凭证
SDKMaterialPackingServiceImpl.updateUndoIdByReceive(receiveRequestName, undoId, makeEventInfo); SDKMaterialPackingServiceImpl.updateUndoIdByReceive(receiveRequestName, undoId, makeEventInfo, sign);
/** /**
* updateUndoIdByReceive和updateStockState都在MATERIALPACKINGHISTORY表插入了数据，导致有重复的入库记录 * updateUndoIdByReceive和updateStockState都在MATERIALPACKINGHISTORY表插入了数据，导致有重复的入库记录
* 为了不影响后续通过undoId作为条件处理其它业务，新建方法updateMaterialPackingUndoIdByReceive，只更新undoId，不插入MATERIALPACKINGHISTORY表 * 为了不影响后续通过undoId作为条件处理其它业务，新建方法updateMaterialPackingUndoIdByReceive，只更新undoId，不插入MATERIALPACKINGHISTORY表

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

@ -389,7 +389,7 @@ public class SDKMaterialPackingServiceImpl extends CommonServiceDAO<MaterialPack
} }
public void updateUndoIdByReceive (String receiveRequestName,String UNDOID,EventInfo eventInfo) { public void updateUndoIdByReceive (String receiveRequestName,String UNDOID,EventInfo eventInfo, String sign) {
String sql = "SELECT MATERIALPACKINGNAME, SITENAME FROM MATERIALPACKING WHERE RECEIVEREQUESTNAME = :RECEIVEREQUESTNAME AND STOCKSTATE = 'Created' "; String sql = "SELECT MATERIALPACKINGNAME, SITENAME FROM MATERIALPACKING WHERE RECEIVEREQUESTNAME = :RECEIVEREQUESTNAME AND STOCKSTATE = 'Created' ";
Map<String, Object> hashMap = new HashMap<String,Object> (); Map<String, Object> hashMap = new HashMap<String,Object> ();
hashMap.put("RECEIVEREQUESTNAME", receiveRequestName); hashMap.put("RECEIVEREQUESTNAME", receiveRequestName);
@ -398,6 +398,9 @@ public class SDKMaterialPackingServiceImpl extends CommonServiceDAO<MaterialPack
SetEventInfo setEventInfo = new SetEventInfo(); SetEventInfo setEventInfo = new SetEventInfo();
Map<String, Object> bindMap = new HashMap<String, Object>(); Map<String, Object> bindMap = new HashMap<String, Object>();
bindMap.put("unDoID",UNDOID); bindMap.put("unDoID",UNDOID);
if ("app".equals(sign)) {
bindMap.put("shipRequestName", "");
}
setEventInfo.setUserColumns(bindMap); setEventInfo.setUserColumns(bindMap);
MaterialPackingKey materialPackingKey = new MaterialPackingKey(map.get("SITENAME").toString(), map.get("MATERIALPACKINGNAME").toString()); MaterialPackingKey materialPackingKey = new MaterialPackingKey(map.get("SITENAME").toString(), map.get("MATERIALPACKINGNAME").toString());
MaterialPackingServiceProxy.getMaterialPackingService().setEvent(materialPackingKey, eventInfo, setEventInfo); MaterialPackingServiceProxy.getMaterialPackingService().setEvent(materialPackingKey, eventInfo, setEventInfo);