From 918ebdfb53375490d393eb3948dbcbaecb7bce3b Mon Sep 17 00:00:00 2001 From: Amjacks <1932302177@qq.com> Date: Fri, 11 Apr 2025 11:13:08 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=88=B0=E8=B4=A7=E5=8D=95=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=89=B9=E6=AC=A1&=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../idm/controller/DeliveryController.java | 2 +- .../MaterialReceiveActController.java | 131 +++++++----------- .../java/com/cim/idm/dao/DeliveryDao.java | 11 +- .../com/cim/idm/dao/MaterialPackingDao.java | 23 +++ .../dto/packing/MaterialPackingListDto.java | 18 +++ .../com/cim/idm/service/IDeliveryService.java | 9 +- .../idm/service/IMaterialPackingService.java | 31 +++++ .../idm/service/Impl/DeliveryServiceImpl.java | 7 +- .../MaterialPackingServiceServiceImpl.java | 51 +++++++ .../resources/com/cim/idm/dao/DeliveryDao.xml | 14 +- .../com/cim/idm/dao/MaterialPackingDao.xml | 19 +++ 11 files changed, 229 insertions(+), 87 deletions(-) create mode 100644 zi-wms-pda/src/main/java/com/cim/idm/dao/MaterialPackingDao.java create mode 100644 zi-wms-pda/src/main/java/com/cim/idm/model/dto/packing/MaterialPackingListDto.java create mode 100644 zi-wms-pda/src/main/java/com/cim/idm/service/IMaterialPackingService.java create mode 100644 zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MaterialPackingServiceServiceImpl.java create mode 100644 zi-wms-pda/src/main/resources/com/cim/idm/dao/MaterialPackingDao.xml diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/DeliveryController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/DeliveryController.java index 2bf715e..6f1902d 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/DeliveryController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/DeliveryController.java @@ -71,7 +71,7 @@ public class DeliveryController { if (Objects.nonNull(byKey)) { deliveryName = byKey.getDeliveryName(); // 到库单（找出该单据下的所有的采购单） - nameList = deliveryService.getReceiveByDelivery(storeDetailDto) + nameList = deliveryService.getRelByDelivery(storeDetailDto) .stream().map(MaterialDeliveryReceive::getReceiveRequestName).collect(Collectors.toList()); } else { // 采购单 diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java index 796afc8..a66351b 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java @@ -4,11 +4,15 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.cim.idm.framework.IDMFrameServiceProxy; import com.cim.idm.framework.data.EventInfo; +import com.cim.idm.model.dto.delivery.StoreDetailDto; +import com.cim.idm.model.dto.packing.MaterialPackingListDto; import com.cim.idm.model.po.MaterialReceiveRequest; import com.cim.idm.model.MaterialreceiveActDto; import com.cim.idm.model.dto.TrackOutBoDto; +import com.cim.idm.model.po.delivery.MaterialDelivery; import com.cim.idm.mwmsextend.materialpacking.service.MaterialPackingServiceImpl; import com.cim.idm.service.IDeliveryService; +import com.cim.idm.service.IMaterialPackingService; import com.cim.idm.service.impl.QMSServiceImpl; import com.cim.idm.service.impl.ToSAPServiceImpl; import com.cim.idm.utils.AjaxResult; @@ -17,7 +21,6 @@ import com.cim.idm.wmsextend.generic.errorHandler.CustomException; import com.cim.idm.wmspackage.materialpacking.MaterialPackingServiceProxy; import com.cim.idm.wmspackage.materialpacking.management.data.MaterialPacking; import com.cim.idm.wmspackage.materialpacking.management.data.MaterialPackingKey; -import com.cim.idm.wmspackage.materialpacking.management.info.RemoveInfo; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -43,6 +46,9 @@ public class MaterialReceiveActController { @Resource private IDeliveryService deliveryService; + @Resource + private IMaterialPackingService mpService; + private static Log log = LogFactory.getLog(MaterialReceiveActController.class); private EventInfo makeEventInfo; @@ -298,46 +304,27 @@ public class MaterialReceiveActController { @RequestMapping(value = "/DeleteTrackOutBox", method = RequestMethod.POST) public AjaxResult DeleteTrackOutBox(@RequestBody JSONObject in ) throws Exception{ + // 获取属性 TrackOutBoDto boxs = JSON.toJavaObject(in, TrackOutBoDto.class); MaterialreceiveActDto box = boxs.getMaterialreceiveAct(); String user = boxs.getUser(); String materialSpecName = box.getMaterialSpecName(); String receiveRequestName = box.getReceiveRequestName(); - String sdkid = box.getSdkid(); - String phase = box.getPhase(); String siteName = box.getSiteName(); makeEventInfo = new EventInfoUtil().makeEventInfo("DeleteTrackOutBox", user, "DeleteTrackOutBox"); - String sql = " SELECT * FROM MATERIALPACKING m WHERE RECEIVEREQUESTNAME = :RECEIVEREQUESTNAME" - + " AND MATERIALSPECNAME = :MATERIALSPECNAME AND (:PHASE IS NULL OR PHASE = :PHASE) AND (:SDK_ID IS NULL OR SDK_ID = :SDK_ID) AND STOCKSTATE = 'Created'"; - Map hashMap = new HashMap (); - hashMap.put("MATERIALSPECNAME", materialSpecName); - hashMap.put("RECEIVEREQUESTNAME", receiveRequestName); - hashMap.put("PHASE", phase); - hashMap.put("SDK_ID", sdkid); - List> queryForList = IDMFrameServiceProxy.getSqlTemplate().queryForList(sql, hashMap); + // 获取列表 + MaterialPackingListDto dto = new MaterialPackingListDto(); + dto.setMaterialSpecName(materialSpecName); + dto.setReceiveRequestName(receiveRequestName); + dto.setPhase(box.getPhase()); + dto.setSdkId(box.getSdkid()); + List> queryForList = mpService.getMaterialPacking(dto); for (Map map : queryForList) { + // 找到条码明细表的数据，先更新订单在删除条码明细 + Map hashMap = new HashMap<> (); + hashMap.put("MATERIALSPECNAME", materialSpecName); String materialPackingName = map.get("MATERIALPACKINGNAME").toString(); - MaterialPackingKey materialPackingKey = new MaterialPackingKey(siteName, materialPackingName); - RemoveInfo removeInfo = new RemoveInfo(); - MaterialPackingServiceProxy.getMaterialPackingService().remove(materialPackingKey,makeEventInfo,removeInfo); - //找到条码明细表的数据，先更新订单在删除条码明细 - String selectSql = "SELECT * FROM MATERIALPACKINGSUB m WHERE m.MATERIALPACKINGNAME = :MATERIALPACKINGNAME"; - hashMap.put("MATERIALPACKINGNAME", materialPackingName); - List> queryForList2 = IDMFrameServiceProxy.getSqlTemplate().queryForList(selectSql, hashMap); - for (Map map2 : queryForList2) { - String qty = map2.get("QTY").toString(); - String receiveRequestName2 = map2.get("RECEIVEREQUESTNAME").toString(); - String receiveRequestDetailName2 = map2.get("RECEIVEREQUESTDETAILNAME").toString(); - hashMap.put("RECEIVEREQUESTNAME", receiveRequestName2); - hashMap.put("RECEIVEREQUESTDETAILNAME", receiveRequestDetailName2); - hashMap.put("QTY", qty); - String updateSql = "UPDATE MATERIALRECEIVEREQUESTDETAIL T SET T.RECEIVEDQUANTITY = T.RECEIVEDQUANTITY - :QTY " - + "WHERE T.RECEIVEREQUESTNAME = :RECEIVEREQUESTNAME AND T.RECEIVEREQUESTDETAILNAME = :RECEIVEREQUESTDETAILNAME"; - IDMFrameServiceProxy.getSqlTemplate().update(updateSql, hashMap); - - String deleteSql = "DELETE FROM MATERIALPACKINGSUB m WHERE m.MATERIALPACKINGNAME = :MATERIALPACKINGNAME AND RECEIVEREQUESTNAME = :RECEIVEREQUESTNAME"; - IDMFrameServiceProxy.getSqlTemplate().update(deleteSql, hashMap); - } + mpService.delMaterialPacking(hashMap, materialPackingName, siteName, makeEventInfo); } //更新订单数量 return AjaxResult.me().setResultObj(null); @@ -346,36 +333,18 @@ public class MaterialReceiveActController { @RequestMapping(value = "/DeleteTrackOutThisBox", method = RequestMethod.POST) public AjaxResult DeleteTrackOutThisBox(@RequestBody JSONObject in ) throws Exception{ + // 获取属性 TrackOutBoDto boxs = JSON.toJavaObject(in, TrackOutBoDto.class); MaterialreceiveActDto box = boxs.getMaterialreceiveAct(); String user = boxs.getUser(); String materialSpecName = box.getMaterialSpecName(); - String materialPackingName2 = box.getMaterialPackingName(); - String siteName = "SDK"; + String materialPackingName = box.getMaterialPackingName(); + String siteName = box.getSiteName(); makeEventInfo = new EventInfoUtil().makeEventInfo("DeleteTrackOutBox", user, "DeleteTrackOutBox"); - Map hashMap = new HashMap (); + // 找到条码明细表的数据，先更新订单在删除条码明细 + Map hashMap = new HashMap<> (); hashMap.put("MATERIALSPECNAME", materialSpecName); - MaterialPackingKey materialPackingKey = new MaterialPackingKey(siteName, materialPackingName2); - RemoveInfo removeInfo = new RemoveInfo(); - MaterialPackingServiceProxy.getMaterialPackingService().remove(materialPackingKey,makeEventInfo,removeInfo); - //找到条码明细表的数据，先更新订单在删除条码明细 - String selectSql = "SELECT * FROM MATERIALPACKINGSUB m WHERE m.MATERIALPACKINGNAME = :MATERIALPACKINGNAME"; - hashMap.put("MATERIALPACKINGNAME", materialPackingName2); - List> queryForList2 = IDMFrameServiceProxy.getSqlTemplate().queryForList(selectSql, hashMap); - for (Map map2 : queryForList2) { - String qty = map2.get("QTY").toString(); - String receiveRequestName2 = map2.get("RECEIVEREQUESTNAME").toString(); - String receiveRequestDetailName2 = map2.get("RECEIVEREQUESTDETAILNAME").toString(); - hashMap.put("RECEIVEREQUESTNAME", receiveRequestName2); - hashMap.put("RECEIVEREQUESTDETAILNAME", receiveRequestDetailName2); - hashMap.put("QTY", qty); - String updateSql = "UPDATE MATERIALRECEIVEREQUESTDETAIL T SET T.RECEIVEDQUANTITY = T.RECEIVEDQUANTITY - :QTY " - + "WHERE T.RECEIVEREQUESTNAME = :RECEIVEREQUESTNAME AND T.RECEIVEREQUESTDETAILNAME = :RECEIVEREQUESTDETAILNAME"; - IDMFrameServiceProxy.getSqlTemplate().update(updateSql, hashMap); - - String deleteSql = "DELETE FROM MATERIALPACKINGSUB m WHERE m.MATERIALPACKINGNAME = :MATERIALPACKINGNAME"; - IDMFrameServiceProxy.getSqlTemplate().update(deleteSql, hashMap); - } + mpService.delMaterialPacking(hashMap, materialPackingName, siteName, makeEventInfo); //更新订单数量 return AjaxResult.me().setResultObj(null); } @@ -527,49 +496,49 @@ public class MaterialReceiveActController { @RequestMapping(value = "/commitToERP", method = RequestMethod.POST) public AjaxResult commitToERP(@RequestBody JSONObject in ) { TrackOutBoDto trackOutBoDto = JSON.toJavaObject(in, TrackOutBoDto.class); + // 采购单 + List requests = new ArrayList<>(); + // 判定单据类型 + StoreDetailDto storeDetailDto = new StoreDetailDto(); + storeDetailDto.setDocumentName(trackOutBoDto.getReceiveRequestName()); + storeDetailDto.setSiteName(trackOutBoDto.getSiteName()); + MaterialDelivery materialDelivery = deliveryService.getByKey(storeDetailDto); + if (Objects.nonNull(materialDelivery)) { + // 到货单据 + requests = deliveryService.getReceiveByDelivery(storeDetailDto); + } else { + requests.add(deliveryService.getReceiveByKey(storeDetailDto)); + } String user = trackOutBoDto.getUser(); String opCode = trackOutBoDto.getOpCode(); String commitDate = trackOutBoDto.getCommitDate(); - String name = trackOutBoDto.getReceiveRequestName(); - String site = trackOutBoDto.getSiteName(); - // 采购单 - List requests = new ArrayList<>(); - // @TODO 判定单据类型 - /*MaterialReceiveRequest byKey = deliveryService.getByKey(site, name); - if (byKey.getReceiveRequestType().equals(ReceiveTypeEnums.DK.getCode())) { - // 到货单 - requests = deliveryService.getReceiveByDelivery(site, name); - } else { - requests.add(byKey); - }*/ // 采购单处理 for (MaterialReceiveRequest request : requests) { String receiveRequestName = request.getReceiveRequestName(); String siteName = request.getSiteName(); String erpFactory = request.getSTOCKORGNO(); try { - //调用QMS + // 调用 QMS qMSServiceImpl.PreIQCInfoSend(receiveRequestName, "SDK",opCode, erpFactory); } catch (CustomException e) { - // TODO Auto-generated catch block e.printStackTrace(); return AjaxResult.me().setSuccess(false).setMessage(e.toString()); } - - String undoid; + String undoId; try { - undoid = SendERPStockIn(receiveRequestName, siteName, user, opCode,commitDate,opCode); + undoId = SendERPStockIn(receiveRequestName, siteName, user, opCode,commitDate,opCode); } catch (Exception e) { - // TODO Auto-generated catch block e.printStackTrace(); return AjaxResult.me().setSuccess(false).setMessage(e.toString()); - }//发送过账 - makeEventInfo = new EventInfoUtil().makeEventInfo("NormalStockInForSDK", user, "NormalStockInForSDK"); - //更新入库凭证 - SDKMaterialPackingServiceImpl.updateUndoIdByReceive(receiveRequestName, undoid, makeEventInfo); - //更新库存状态 - SDKMaterialPackingServiceImpl.SaveUnDoInfo( undoid,commitDate); - SDKMaterialPackingServiceImpl.updateStockState( makeEventInfo, undoid,opCode); + } + // 发送过账 + EventInfoUtil util = new EventInfoUtil(); + makeEventInfo = util.makeEventInfo("NormalStockInForSDK", user, "NormalStockInForSDK"); + // 更新入库凭证 + SDKMaterialPackingServiceImpl.updateUndoIdByReceive(receiveRequestName, undoId, makeEventInfo); + // 更新库存状态 + SDKMaterialPackingServiceImpl.SaveUnDoInfo( undoId,commitDate); + SDKMaterialPackingServiceImpl.updateStockState( makeEventInfo, undoId,opCode); } return AjaxResult.me().setResultObj(null); } diff --git a/zi-wms-pda/src/main/java/com/cim/idm/dao/DeliveryDao.java b/zi-wms-pda/src/main/java/com/cim/idm/dao/DeliveryDao.java index f82383c..3457b32 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/dao/DeliveryDao.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/dao/DeliveryDao.java @@ -62,9 +62,16 @@ public interface DeliveryDao { MaterialReceiveRequest getReceiveByKey(@Param("dto") StoreDetailDto storeDetailDto); /** - * 根据到库单获取采购单名称 + * 根据到库单获取关系 */ - List getReceiveByDelivery(@Param("dto") StoreDetailDto storeDetailDto); + List getRelByDelivery(@Param("dto") StoreDetailDto storeDetailDto); + + /** + * 根据到库单获取采购单名称 + * @param storeDetailDto 到库单 + * @return 采购单名称列表 + */ + List getReceiveByDelivery(@Param("dto") StoreDetailDto storeDetailDto); /** * 根据到库单获取采购单名称 diff --git a/zi-wms-pda/src/main/java/com/cim/idm/dao/MaterialPackingDao.java b/zi-wms-pda/src/main/java/com/cim/idm/dao/MaterialPackingDao.java new file mode 100644 index 0000000..8dfd8d1 --- /dev/null +++ b/zi-wms-pda/src/main/java/com/cim/idm/dao/MaterialPackingDao.java @@ -0,0 +1,23 @@ +package com.cim.idm.dao; + +import com.cim.idm.model.dto.packing.MaterialPackingListDto; +import org.apache.ibatis.annotations.MapKey; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.Map; + +@Component +@Mapper +public interface MaterialPackingDao { + + /** + * 散列盘点存储过程调用 + * @param dto dto + * @return 物料信息 + */ + @MapKey("dto") + List> getMaterialPacking(@Param("dto") MaterialPackingListDto dto); +} diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/dto/packing/MaterialPackingListDto.java b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/packing/MaterialPackingListDto.java new file mode 100644 index 0000000..e43862a --- /dev/null +++ b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/packing/MaterialPackingListDto.java @@ -0,0 +1,18 @@ +package com.cim.idm.model.dto.packing; + +import lombok.Data; + +@Data +public class MaterialPackingListDto { + // 物料号 + private String materialSpecName; + + // 到货单名称 + private String receiveRequestName; + + // 阶段 + private String phase; + + // sdk id + private String sdkId; +} diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/IDeliveryService.java b/zi-wms-pda/src/main/java/com/cim/idm/service/IDeliveryService.java index e873eb3..be10991 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/IDeliveryService.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/IDeliveryService.java @@ -53,12 +53,19 @@ public interface IDeliveryService { */ MaterialReceiveRequest getReceiveByKey(StoreDetailDto storeDetailDto); + /** + * 根据到库单获取关系 + * @param storeDetailDto 到库单 + * @return 采购单名称列表 + */ + List getRelByDelivery(StoreDetailDto storeDetailDto); + /** * 根据到库单获取采购单名称 * @param storeDetailDto 到库单 * @return 采购单名称列表 */ - List getReceiveByDelivery(StoreDetailDto storeDetailDto); + List getReceiveByDelivery(StoreDetailDto storeDetailDto); /** * 根据到库单获取采购单名称 diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/IMaterialPackingService.java b/zi-wms-pda/src/main/java/com/cim/idm/service/IMaterialPackingService.java new file mode 100644 index 0000000..d8100fa --- /dev/null +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/IMaterialPackingService.java @@ -0,0 +1,31 @@ +package com.cim.idm.service; + + +import com.cim.idm.framework.data.EventInfo; +import com.cim.idm.model.dto.packing.MaterialPackingListDto; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + + +@Service("mpService") +public interface IMaterialPackingService { + + /** + * 散列盘点存储过程调用 + * @param dto dto + * @return 物料信息 + */ + List> getMaterialPacking(MaterialPackingListDto dto); + + /** + * 删除物料批次 + * @param hashMap 数据 + * @param materialPackingName 包名 + * @param siteName 工厂 + * @param makeEventInfo 事件 + */ + void delMaterialPacking(Map hashMap, String materialPackingName, + String siteName, EventInfo makeEventInfo); +} diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/DeliveryServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/DeliveryServiceImpl.java index e863f50..37dd8d2 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/DeliveryServiceImpl.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/DeliveryServiceImpl.java @@ -83,7 +83,12 @@ public class DeliveryServiceImpl implements IDeliveryService { } @Override - public List getReceiveByDelivery(StoreDetailDto storeDetailDto) { + public List getRelByDelivery(StoreDetailDto storeDetailDto) { + return deliveryDao.getRelByDelivery(storeDetailDto); + } + + @Override + public List getReceiveByDelivery(StoreDetailDto storeDetailDto) { return deliveryDao.getReceiveByDelivery(storeDetailDto); } diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MaterialPackingServiceServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MaterialPackingServiceServiceImpl.java new file mode 100644 index 0000000..04d2895 --- /dev/null +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MaterialPackingServiceServiceImpl.java @@ -0,0 +1,51 @@ +package com.cim.idm.service.Impl; + +import com.cim.idm.dao.MaterialPackingDao; +import com.cim.idm.framework.IDMFrameServiceProxy; +import com.cim.idm.framework.data.EventInfo; +import com.cim.idm.model.dto.packing.MaterialPackingListDto; +import com.cim.idm.service.IMaterialPackingService; +import com.cim.idm.wmspackage.materialpacking.MaterialPackingServiceProxy; +import com.cim.idm.wmspackage.materialpacking.management.data.MaterialPackingKey; +import com.cim.idm.wmspackage.materialpacking.management.info.RemoveInfo; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Map; + + +@Service +public class MaterialPackingServiceServiceImpl implements IMaterialPackingService { + + @Resource + private MaterialPackingDao materialPackingDao; + + + @Override + public List> getMaterialPacking(MaterialPackingListDto dto) { + return materialPackingDao.getMaterialPacking(dto); + } + + @Override + public void delMaterialPacking(Map hashMap, String materialPackingName, String siteName, EventInfo makeEventInfo) { + MaterialPackingKey materialPackingKey = new MaterialPackingKey(siteName, materialPackingName); + RemoveInfo removeInfo = new RemoveInfo(); + MaterialPackingServiceProxy.getMaterialPackingService().remove(materialPackingKey, makeEventInfo, removeInfo); + // 找到条码明细表的数据，先更新订单在删除条码明细 + String selectSql = "SELECT * FROM MATERIALPACKINGSUB m WHERE m.MATERIALPACKINGNAME = :MATERIALPACKINGNAME"; + hashMap.put("MATERIALPACKINGNAME", materialPackingName); + List> queryForList2 = IDMFrameServiceProxy.getSqlTemplate().queryForList(selectSql, hashMap); + for (Map item : queryForList2) { + hashMap.put("RECEIVEREQUESTNAME", item.get("RECEIVEREQUESTNAME").toString()); + hashMap.put("RECEIVEREQUESTDETAILNAME", item.get("RECEIVEREQUESTDETAILNAME").toString()); + hashMap.put("QTY", item.get("QTY").toString()); + String updateSql = "UPDATE MATERIALRECEIVEREQUESTDETAIL T SET T.RECEIVEDQUANTITY = T.RECEIVEDQUANTITY - :QTY " + + "WHERE T.RECEIVEREQUESTNAME = :RECEIVEREQUESTNAME AND T.RECEIVEREQUESTDETAILNAME = :RECEIVEREQUESTDETAILNAME"; + IDMFrameServiceProxy.getSqlTemplate().update(updateSql, hashMap); + + String deleteSql = "DELETE FROM MATERIALPACKINGSUB m WHERE m.MATERIALPACKINGNAME = :MATERIALPACKINGNAME AND RECEIVEREQUESTNAME = :RECEIVEREQUESTNAME"; + IDMFrameServiceProxy.getSqlTemplate().update(deleteSql, hashMap); + } + } +} diff --git a/zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml b/zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml index 4088b1b..f01d56f 100644 --- a/zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml +++ b/zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml @@ -206,12 +206,24 @@ AND RECEIVEREQUESTNAME = #{dto.documentName} - SELECT md.DELIVERYNAME, md.DELIVERYNUM, md.RECEIVEREQUESTNAME, md.MATERIALSPECNAME FROM MATERIALDELIVERYRECEIVE md WHERE md.DELIVERYNAME = #{dto.documentName} + + + SELECT * FROM MATERIALPACKING m + WHERE MATERIALSPECNAME = #{dto.materialSpecName} + + AND PHASE = #{dto.phase} + + + AND RECEIVEREQUESTNAME = #{dto.receiveRequestName} + + + AND SDK_ID = #{dto.sdkId} + + AND STOCKSTATE = 'Created' + + \ No newline at end of file