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

Compare commits

base: 10539622:388021590f13f1bd6010ec5b93ff5f12474392cc
Branches Tags
10539622:main
..
compare: 10539622:3fa4ce1caca4eb6bc82779ad63f4d21021e3966a
Branches Tags
10539622:main

No commits in common. "388021590f13f1bd6010ec5b93ff5f12474392cc" and "3fa4ce1caca4eb6bc82779ad63f4d21021e3966a" have entirely different histories.
388021590f ... 3fa4ce1cac

6 changed files with 4 additions and 38 deletions
Show Stats Expand all files Collapse all files

4
zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java
View File

@ -5241,9 +5241,9 @@ public class ToSAPServiceImpl {
if (StringUtils.isEmpty((String)mm.get("PACKINGGRADE"))) {
insmk = "2";
//BWART 移动类型
item.put("BWART", "323"); //非质检
item.put("BWART", "311"); //非质检
}else {
item.put("BWART", "311"); // 质检
item.put("BWART", "323"); // 质检
}
// String insmk = StringUtils.equals(mm.get("OQARESULTSTATE").toString(),"END")?"":"X";
item.put("INSMK", insmk);

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

@ -578,9 +578,6 @@ public class MaterialReceiveActController {
} else {
SDKMaterialPackingServiceImpl.updateStockState(makeEventInfo, undoId, opCode);
}
// 更新单据状态
SDKMaterialPackingServiceImpl.updateOrderState(receiveRequestName);
}
// 到货单据更新状态
if (Objects.nonNull(materialDelivery)) {

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

@ -271,8 +271,6 @@ public class NoChargeStockIn {
//10、更新库存状态
//SDKMP.updateStockState(receiveAct,makeEventInfo,billcode);
SDKMP.updateStockState(makeEventInfo, billcode,opCode);
// 更新单据状态
SDKMP.updateOrderState(request.getReceiveRequestName());
}
return AjaxResult.me().setMessage("入库成功");

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

@ -52,8 +52,6 @@ public class MaterialShipServiceImpl implements IMaterialShipService {
private EventInfo makeEventInfo;
@Autowired
private DeliveryDao deliveryDao;
SDKMaterialPackingServiceImpl SDKMP = new SDKMaterialPackingServiceImpl();
/**
* 出库方法实现
*/
@ -2099,9 +2097,6 @@ public class MaterialShipServiceImpl implements IMaterialShipService {
updateReceiveRequestQtyMap.put("LASTEVENTUSER", eventInfo.getEventUser());
updateReceiveRequestQtyMap.put("LASTEVENTCOMMENT", eventInfo.getEventComment());
IDMFrameServiceProxy.getSqlTemplate().update(updateReceiveRequestQtySql, updateReceiveRequestQtyMap);
// 更新单据状态
SDKMP.updateOrderState(materialDeliveryReceive.getReceiveRequestName());
}
}
}

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

@ -15,7 +15,6 @@ import com.cim.idm.wmspackage.name.NameServiceProxy;
import com.cim.idm.wmspackage.receiverequestbatch.management.data.MaterialReceiveActKey;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@ -539,27 +538,4 @@ public class SDKMaterialPackingServiceImpl extends CommonServiceDAO<MaterialPack
}
}
// 更新单据状态为完成
public void updateOrderState(String receiveRequestName) {
String sql = "SELECT SUM(ml.REQUESTQUANTITY-NVL(ml.RECEIVEDQUANTITY,0)) qty FROM MATERIALRECEIVEREQUESTDETAIL ml WHERE RECEIVEREQUESTNAME = :RECEIVEREQUESTNAME";
Map<String, Object> hashMap = new HashMap<String, Object> ();
hashMap.put("RECEIVEREQUESTNAME", receiveRequestName);
List<Map<String, Object>> queryForList = IDMFrameServiceProxy.getSqlTemplate().queryForList(sql, hashMap);
if(queryForList.size() > 0) {
// 如果qty小于等于0，则单据状态改为完成
Object qtyObj = queryForList.get(0).get("qty");
if (qtyObj != null) {
BigDecimal qty = new BigDecimal(qtyObj.toString());
if (qty.compareTo(BigDecimal.ZERO) > 0) {
}else {
sql = "UPDATE MATERIALRECEIVEREQUEST SET RECEIVEREQUESTSTATE = 'Completed' WHERE RECEIVEREQUESTNAME = :RECEIVEREQUESTNAME";
IDMFrameServiceProxy.getSqlTemplate().update(sql, hashMap);
}
}
}
}
}

4
zi-wms-pda/src/main/resources/com/cim/idm/dao/ToSapDao.xml
View File

@ -74,13 +74,13 @@
SELECT mpsrd.GOALMATERIALSPEC, #{unDoID}
FROM MATERIALSHIPREQUESTDETAIL mpsrd
WHERE m.SHIPREQUESTNAME = mpsrd.SHIPREQUESTNAME
AND m.SHIPREQUESTDETAILNAME = mpsrd.SHIPREQUESTDETAILNAME
AND m.MATERIALPACKINGNAME = mpsrd.SHIPREQUESTDETAILNAME
)
WHERE EXISTS (
SELECT 1
FROM MATERIALSHIPREQUESTDETAIL mpsrd
WHERE m.SHIPREQUESTNAME = mpsrd.SHIPREQUESTNAME
AND m.SHIPREQUESTDETAILNAME = mpsrd.SHIPREQUESTDETAILNAME
AND m.MATERIALPACKINGNAME = mpsrd.SHIPREQUESTDETAILNAME
)
AND m.MATERIALPACKINGNAME IN
<foreach item="box" index="index" collection="boxList" open="(" separator="," close=")">