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

销售退货

Browse Source
This commit is contained in:
王帅 2025-05-15 19:44:03 +08:00
parent 72b3c89815
commit 2146620d74
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -519,6 +519,7 @@ public class MaterialReceiveActController {
String commitDate = trackOutBoDto.getCommitDate(); String commitDate = trackOutBoDto.getCommitDate();
String erpLocation = trackOutBoDto.getErpLocation(); String erpLocation = trackOutBoDto.getErpLocation();
String erpFactory1 = trackOutBoDto.getErpFactory(); String erpFactory1 = trackOutBoDto.getErpFactory();
String sign = trackOutBoDto.getSign();
// 采购单处理 // 采购单处理
for (MaterialReceiveRequest request : requests) { for (MaterialReceiveRequest request : requests) {
String receiveRequestName = request.getReceiveRequestName(); String receiveRequestName = request.getReceiveRequestName();
@ -563,8 +564,11 @@ 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); if ("app".equals(sign)) {
SDKMaterialPackingServiceImpl.updateStockState(makeEventInfo, undoId,opCode); SDKMaterialPackingServiceImpl.updateStockStateNew(makeEventInfo, undoId,opCode,erpLocation, erpFactory1);
} else {
SDKMaterialPackingServiceImpl.updateStockState(makeEventInfo, undoId, opCode);
}
} }
// 到货单据更新状态 // 到货单据更新状态
if (Objects.nonNull(materialDelivery)) { if (Objects.nonNull(materialDelivery)) {

2
zi-wms-pda/src/main/java/com/cim/idm/model/dto/TrackOutBoDto.java
View File

@ -15,6 +15,8 @@ public class TrackOutBoDto {
private String erpLocation; private String erpLocation;
/**组织*/ /**组织*/
private String erpFactory; private String erpFactory;
/**标识*/
private String sign;
} }

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

@ -324,7 +324,7 @@ public class SDKMaterialPackingServiceImpl extends CommonServiceDAO<MaterialPack
* @param erpLocation 仓库 * @param erpLocation 仓库
* @param erpFactory 组织 * @param erpFactory 组织
*/ */
public void updateStockState(EventInfo eventInfo, String UNDOID,String opCode, String erpLocation, String erpFactory) throws CustomException { public void updateStockStateNew(EventInfo eventInfo, String UNDOID,String opCode, String erpLocation, String erpFactory) throws CustomException {
// 查询仓库类型 // 查询仓库类型
String sqlErp = "SELECT TYPE FROM BS_ERPLOCATION WHERE ERPFACTORYNAME = :ERPFACTORYNAME AND ERPLOCATIONNAME = :ERPLOCATIONNAME"; String sqlErp = "SELECT TYPE FROM BS_ERPLOCATION WHERE ERPFACTORYNAME = :ERPFACTORYNAME AND ERPLOCATIONNAME = :ERPLOCATIONNAME";
Map<String, Object> hashMapErp = new HashMap<String, Object> (); Map<String, Object> hashMapErp = new HashMap<String, Object> ();