From 68b750b647d82f428cb20b79164f7e8553322efc Mon Sep 17 00:00:00 2001 From: 18110972313 <780768673@qq.com> Date: Wed, 21 May 2025 18:17:54 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=88=B0=E8=B4=A7=E5=8D=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=BB=9F=E8=AE=A1=E5=85=A5=E5=BA=93=E3=80=81=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../idm/service/impl/ToSAPServiceImpl.java | 4 +- .../idm/controller/DeliveryController.java | 4 +- .../MaterialReceiveActController.java | 5 +- .../java/com/cim/idm/dao/DeliveryDao.java | 9 ++ .../com/cim/idm/service/IDeliveryService.java | 10 ++ .../idm/service/Impl/DeliveryServiceImpl.java | 13 ++ .../resources/com/cim/idm/dao/DeliveryDao.xml | 121 ++++++++++++++++++ 7 files changed, 161 insertions(+), 5 deletions(-) diff --git a/zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java b/zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java index 83b83ce..29a3c08 100644 --- a/zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java +++ b/zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java @@ -6441,7 +6441,7 @@ public class ToSAPServiceImpl { List> qmsDataList = new ArrayList<>(); //依据采购订单，查询待入库的物料(MATERIALPACKING) String querySql = " SELECT " + - " SUM(DR.DELIVERYNUM) AS MATERIALQUANTITY,\n" + + " DR.DELIVERYNUM AS MATERIALQUANTITY,\n" + " DR.RECEIVEREQUESTNAME,\n" + " DR.RECEIVEREQUESTDETAILNAME,\n" + " P.ERPLOCATION,\n" + @@ -6486,7 +6486,7 @@ public class ToSAPServiceImpl { "\t\t,P.OQARESULT, P.OQARESULTSTATE, P.UNIT, P.FUNIT, P.REMARK, P.SUPPLIERNAME\n" + "\t\t,P.ERPFACTORY, P.ERPLOCATION, BF.IQCFLAG, R.RECEIVEREQUESTTYPE\n" + "\t\t,EL.DESCRIPTION, SP.SUPPLIERNO,SP.SUPPLIERNAME,MP.MATERIALSPECNAME\n" + - "\t\t,MP.DESC_CN, MP.MATERIALGROUP, P.LOCATIONNAME, P.RECEIVETIME,P.TRUEGG "; + "\t\t,MP.DESC_CN, MP.MATERIALGROUP, P.LOCATIONNAME, P.RECEIVETIME,P.TRUEGG,DR.DELIVERYNUM "; Map hashMap = new HashMap(); hashMap.put("DELIVERYNAME", deliveryName); hashMap.put("SITENAME", siteName); 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 28dbe1c..5373899 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 @@ -174,7 +174,9 @@ public class DeliveryController { if (deliveryType.equals(DeliveryTypeEnums.BATCH.getCode())) { // 批次 return AjaxResult.me().setSuccess(true).setResultObj( - deliveryService.getStoreDetail(storeDetailDto.getDocumentName(), storeDetailDto.getSiteName(), nameList, deliveryName)); + deliveryService.getDeliveryStoreDetail(storeDetailDto.getDocumentName(), storeDetailDto.getSiteName(), nameList, deliveryName)); + /*return AjaxResult.me().setSuccess(true).setResultObj( + deliveryService.getStoreDetail(storeDetailDto.getDocumentName(), storeDetailDto.getSiteName(), nameList, deliveryName));*/ } else { // 辅材 return AjaxResult.me().setSuccess(true).setResultObj( 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 f57497d..f459824 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 @@ -33,6 +33,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; +import org.apache.commons.lang3.StringUtils; import java.math.BigDecimal; import java.sql.Timestamp; @@ -662,8 +663,8 @@ public class MaterialReceiveActController { } } catch (Exception e) { e.printStackTrace(); - return AjaxResult.me().setErrorCode(400).setMessage(e.toString()); + return AjaxResult.me().setErrorCode(400).setMessage(e.toString()).setSuccess(false); } - return AjaxResult.me().setSuccess(true); + return AjaxResult.me().setSuccess(true).setErrorCode(200); } } 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 f581cf1..1798356 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 @@ -136,4 +136,13 @@ public interface DeliveryDao { * @return 结果 */ int editDelivery(@Param("dto") DeliveryEditDto deliveryEditDto); + + /** + * 根据到货单获取入库详情 + */ + @MapKey("storeDetail") + List> getDeliveryStoreDetail(@Param("siteName") String siteName, + @Param("nameList") List nameList, + @Param("typeList") List typeList, + @Param("deliveryName") String deliveryName); } 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 e171209..f7e9469 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 @@ -117,4 +117,14 @@ public interface IDeliveryService { */ int editDelivery(DeliveryEditDto deliveryEditDto); + /** + * 获取采购单明细及批次 + * @param documentName 单据名称 + * @param siteName 组织 + * @param nameList 名称 + * @param deliveryName 到库单号 + * @return 采购订单 + */ + ReceiveDetailVo getDeliveryStoreDetail(String documentName, String siteName, List nameList, String deliveryName); + } 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 94dc5fd..69b7174 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 @@ -142,4 +142,17 @@ public class DeliveryServiceImpl implements IDeliveryService { public int editDelivery(DeliveryEditDto deliveryEditDto) { return deliveryDao.editDelivery(deliveryEditDto); } + + @Override + public ReceiveDetailVo getDeliveryStoreDetail(String documentName, String siteName, List nameList, String deliveryName) { + ReceiveDetailVo receiveDetailVo = new ReceiveDetailVo(); + // 采购单明细 + //List> storeDetail = deliveryDao.getStoreDetail(siteName, nameList, ReceiveTypeEnums.getPurchase(), deliveryName); + List> storeDetail = deliveryDao.getDeliveryStoreDetail(siteName, nameList, ReceiveTypeEnums.getPurchase(), deliveryName); + receiveDetailVo.setStoreDetail(storeDetail); + // 批次 + List> storeCharge = deliveryDao.getStoreCharge(siteName, documentName); + receiveDetailVo.setStoreCharge(storeCharge); + return receiveDetailVo; + } } 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 c53525f..b0924de 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 @@ -360,4 +360,125 @@ UPDATE MATERIALDELIVERY SET DELIVERYSTATE = #{dto.deliveryState} WHERE SITENAME = #{dto.siteName} AND DELIVERYNAME = #{dto.deliveryName} + + \ No newline at end of file