From 792d0ebfc1587dfbbcb717f74b35bda26ad9e683 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=B8=85?= <3115919733@qq.com> Date: Tue, 20 May 2025 18:09:42 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BB=93=E5=BA=93=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cim/idm/model/dto/WareHouseEditDto.java | 4 ++++ .../src/main/resources/com/cim/idm/dao/WareHouseDao.xml | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/dto/WareHouseEditDto.java b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/WareHouseEditDto.java index eb6d829..f8a1d65 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/model/dto/WareHouseEditDto.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/WareHouseEditDto.java @@ -10,4 +10,8 @@ public class WareHouseEditDto { private String useLocation; // 是否熟化 private String isOven; + // 仓库管理远员 + private String locationUser; + // 是否自动备货 + private String zdbhFlag; } diff --git a/zi-wms-pda/src/main/resources/com/cim/idm/dao/WareHouseDao.xml b/zi-wms-pda/src/main/resources/com/cim/idm/dao/WareHouseDao.xml index 65d0035..e085c02 100644 --- a/zi-wms-pda/src/main/resources/com/cim/idm/dao/WareHouseDao.xml +++ b/zi-wms-pda/src/main/resources/com/cim/idm/dao/WareHouseDao.xml @@ -3,7 +3,8 @@ - update BS_ERPLOCATION set USE_LOCATION = #{dto.useLocation}, IS_OVEN = #{dto.isOven} + update BS_ERPLOCATION set USE_LOCATION = #{dto.useLocation}, IS_OVEN = #{dto.isOven}, + LOCATION_USER = #{dto.locationUser, jdbcType=VARCHAR}, ZDBHFLAG = #{dto.zdbhFlag} where ERPFACTORYNAME = #{dto.erpFactoryName} and ERPLOCATIONNAME = #{dto.erpLocationName} From 1bf40df8866955fc5d2d85055fc22fe886a0d9a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=B8=85?= <3115919733@qq.com> Date: Wed, 21 May 2025 09:48:26 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=B4=A7=E4=BD=8D=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../idm/controller/WareHouseController.java | 6 ++++ .../java/com/cim/idm/dao/WareHouseDao.java | 2 ++ .../idm/model/dto/storage/StorageAddDto.java | 6 ++++ .../idm/model/dto/storage/StorageEditDto.java | 2 ++ .../idm/model/dto/storage/StoragePageDto.java | 8 +++++ .../cim/idm/model/po/storage/StorageSpec.java | 8 +++++ .../cim/idm/service/IWareHouseService.java | 8 +++++ .../service/Impl/WareHouseServiceImpl.java | 5 +++ .../com/cim/idm/dao/WareHouseDao.xml | 34 ++++++++++++++----- 9 files changed, 71 insertions(+), 8 deletions(-) diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/WareHouseController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/WareHouseController.java index 672c248..8f23002 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/WareHouseController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/WareHouseController.java @@ -7,6 +7,7 @@ import com.cim.idm.model.dto.storage.StorageAddDto; import com.cim.idm.model.dto.storage.StorageDelDto; import com.cim.idm.model.dto.storage.StorageEditDto; import com.cim.idm.model.dto.storage.StorageSearchDto; +import com.cim.idm.model.po.storage.StorageSpec; import com.cim.idm.service.IWareHouseService; import com.cim.idm.utils.AjaxResult; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -77,4 +78,9 @@ public class WareHouseController { public AjaxResult search(@RequestBody StorageSearchDto storageSearchDto) { return AjaxResult.me().setSuccess(true).setResultObj(wareHouseService.search(storageSearchDto)); } + + @PostMapping(value = "/getLocation") + public AjaxResult getLocation(@RequestBody StorageSpec storageSpec) { + return AjaxResult.me().setSuccess(true).setResultObj(wareHouseService.getLocation(storageSpec.getErpLocation())); + } } diff --git a/zi-wms-pda/src/main/java/com/cim/idm/dao/WareHouseDao.java b/zi-wms-pda/src/main/java/com/cim/idm/dao/WareHouseDao.java index 9d3aaa1..17f9918 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/dao/WareHouseDao.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/dao/WareHouseDao.java @@ -65,4 +65,6 @@ public interface WareHouseDao { */ List search(@Param("storageName") String storageName, @Param("prefix") List prefix); + + StorageSpec getLocation(@Param("erpLocation") String erpLocation); } diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/dto/storage/StorageAddDto.java b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/storage/StorageAddDto.java index 7d80864..74c86cd 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/model/dto/storage/StorageAddDto.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/storage/StorageAddDto.java @@ -13,4 +13,10 @@ public class StorageAddDto { private String description; //货位属性 private String storageUseType; + // 组织 + private String erpFactory; + // 仓库 + private String erpLocation; + // 创建人 + private String createUser; } diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/dto/storage/StorageEditDto.java b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/storage/StorageEditDto.java index dba2e6b..7012d49 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/model/dto/storage/StorageEditDto.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/storage/StorageEditDto.java @@ -13,4 +13,6 @@ public class StorageEditDto { private String description; //货位属性 private String storageUseType; + private String createUser; + } diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/dto/storage/StoragePageDto.java b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/storage/StoragePageDto.java index bff88b0..3a75681 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/model/dto/storage/StoragePageDto.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/storage/StoragePageDto.java @@ -13,4 +13,12 @@ public class StoragePageDto { //货位属性 private String storageUseType; + // 组织 + private String erpFactory; + // 仓库 + private String erpLocation; + // 组织名称 + private String orgName; + // 仓库名称 + private String erpLocationName; } diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/po/storage/StorageSpec.java b/zi-wms-pda/src/main/java/com/cim/idm/model/po/storage/StorageSpec.java index 3c43508..b389710 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/model/po/storage/StorageSpec.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/model/po/storage/StorageSpec.java @@ -13,4 +13,12 @@ public class StorageSpec { private String description; //货位属性 private String storageUseType; + // 组织 + private String erpFactory; + // 仓库 + private String erpLocation; + // 组织名称 + private String orgName; + // 仓库名称 + private String erpLocationName; } diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/IWareHouseService.java b/zi-wms-pda/src/main/java/com/cim/idm/service/IWareHouseService.java index 1efcb00..6dc9a19 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/IWareHouseService.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/IWareHouseService.java @@ -8,6 +8,7 @@ import com.cim.idm.model.dto.storage.StorageEditDto; import com.cim.idm.model.dto.storage.StorageSearchDto; import com.cim.idm.model.po.storage.StorageSpec; import com.github.pagehelper.PageInfo; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -61,4 +62,11 @@ public interface IWareHouseService { * @return 结果 */ List search(StorageSearchDto storageSearchDto); + + /** + * 获取仓库信息 + * @param erpLocation + * @return + */ + StorageSpec getLocation(String erpLocation); } diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/WareHouseServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/WareHouseServiceImpl.java index d657554..b3a1ee9 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/WareHouseServiceImpl.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/WareHouseServiceImpl.java @@ -68,4 +68,9 @@ public class WareHouseServiceImpl implements IWareHouseService { } return wareHouseDao.search(storageSearchDto.getStorageName(), prefix); } + + @Override + public StorageSpec getLocation(String erpLocation) { + return wareHouseDao.getLocation(erpLocation); + } } diff --git a/zi-wms-pda/src/main/resources/com/cim/idm/dao/WareHouseDao.xml b/zi-wms-pda/src/main/resources/com/cim/idm/dao/WareHouseDao.xml index e085c02..d4224be 100644 --- a/zi-wms-pda/src/main/resources/com/cim/idm/dao/WareHouseDao.xml +++ b/zi-wms-pda/src/main/resources/com/cim/idm/dao/WareHouseDao.xml @@ -9,17 +9,25 @@ @@ -32,12 +40,15 @@ - insert into STORAGESPEC(SITENAME, STORAGENAME, DESCRIPTION, STORAGEUSETYPE) - values (#{storageSpec.siteName}, #{storageSpec.storageName}, #{storageSpec.description}, #{storageSpec.storageUseType}) + insert into STORAGESPEC(SITENAME, STORAGENAME, DESCRIPTION, STORAGEUSETYPE, + ERPFACTORY, ERPLOCATION, CREATEUSER, CREATETIME) + values (#{storageSpec.siteName}, #{storageSpec.storageName}, #{storageSpec.description}, #{storageSpec.storageUseType}, + #{storageSpec.erpFactory}, #{storageSpec.erpLocation}, #{storageSpec.createUser}, SYSDATE) - update STORAGESPEC set DESCRIPTION = #{edit.description} ,STORAGEUSETYPE = #{edit.storageUseType} + update STORAGESPEC set DESCRIPTION = #{edit.description} ,STORAGEUSETYPE = #{edit.storageUseType}, + LASTEVENTTIME = SYSDATE, LASTEVENTUSER = #{edit.createUser} where SITENAME = #{edit.siteName} and STORAGENAME = #{edit.storageName} @@ -59,4 +70,11 @@ AND STORAGENAME LIKE #{storageName}||'%' + + \ No newline at end of file From 57f878745a7994deab9a4e0f637c883654c4eb3b Mon Sep 17 00:00:00 2001 From: 18110972313 <780768673@qq.com> Date: Wed, 21 May 2025 11:33:46 +0800 Subject: [PATCH 3/5] =?UTF-8?q?update=20=E4=BF=AE=E6=94=B9=E5=88=B0?= =?UTF-8?q?=E8=B4=A7=E5=8D=95=E5=85=A5=E5=BA=93=E8=B0=83=E7=94=A8QMS?= =?UTF-8?q?=E8=B4=A8=E6=A3=80=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cim/idm/service/impl/QMSServiceImpl.java | 54 ++++++++++++++++--- .../idm/service/impl/ToSAPServiceImpl.java | 5 +- .../idm/controller/DeliveryController.java | 23 ++++++++ 3 files changed, 73 insertions(+), 9 deletions(-) diff --git a/zi-wms-inf/src/main/java/com/cim/idm/service/impl/QMSServiceImpl.java b/zi-wms-inf/src/main/java/com/cim/idm/service/impl/QMSServiceImpl.java index f184706..6acad30 100644 --- a/zi-wms-inf/src/main/java/com/cim/idm/service/impl/QMSServiceImpl.java +++ b/zi-wms-inf/src/main/java/com/cim/idm/service/impl/QMSServiceImpl.java @@ -477,7 +477,49 @@ public class QMSServiceImpl implements QMSService{ } - public String sendToIQCByDataList(String opCode, List> list) throws CustomException { + public String sendToIQCByDataList(String opCode, String siteName, String deliveryName) throws CustomException { + String sql = " \n" + + "SELECT \n" + + "\t\tP.SITENAME,\n" + + " \t\tEL.DESCRIPTION AS ERPLOCATIONDESC,\n" + + "\t\tP.LOCATIONNAME,\t\n" + + "\t\tTO_CHAR(P.RECEIVETIME ,'YYYY-MM-DD' ) deliveryDate,\n" + + "\t\tP.MATERIALSPECNAME AS materialCode,\n" + + "\t\tMP.DESC_CN AS materialName,\n" + + "\t\tMP.MATERIALGROUP AS materialGroup,\n" + + "\t\tCOUNT(DISTINCT P.CHARGE ) batchQuantity,\n" + + " P.UNIT AS quantityUnit,\n" + + "\t\tSP.SUPPLIERNO AS SUPPLIERCODE,\n" + + "\t\tSP.SUPPLIERNAME,\n" + + "\t\tLISTAGG(DISTINCT P.CHARGE , ';') WITHIN GROUP (ORDER BY P.CHARGE) AS LOTS\n" + + "\t\t\tFROM\n" + + " MATERIALPACKING P \n" + + "LEFT JOIN SUPPLIER SP\tON SP.SUPPLIERNO = P.SUPPLIERNAME\n" + + "LEFT JOIN BS_ERPLOCATION EL ON EL.ERPLOCATIONNAME = P.ERPLOCATION AND EL.SITENAME = P.SITENAME\n" + + "LEFT JOIN MATERIALSPEC MP ON MP.MATERIALSPECNAME = P.MATERIALSPECNAME AND MP.SITENAME = P.SITENAME\n" + + "LEFT JOIN BS_MATERIALFACTORY BF ON BF.MATERIALSPECNAME = P.MATERIALSPECNAME AND BF.ERPFACTORY = P.ERPFACTORY\n" + + "LEFT JOIN MATERIALRECEIVEREQUESTDETAIL RD ON P.SITENAME = RD.SITENAME \n" + + "LEFT JOIN MATERIALRECEIVEREQUEST R ON RD.RECEIVEREQUESTNAME = R.RECEIVEREQUESTNAME AND RD.SITENAME = R.SITENAME\n" + + "LEFT JOIN MATERIALDELIVERYRECEIVE DR ON R.RECEIVEREQUESTNAME=DR.RECEIVEREQUESTNAME \n" + + "LEFT JOIN MATERIALDELIVERY D ON DR.DELIVERYNAME = D.DELIVERYNAME WHERE\n" + + " D.SITENAME =:SITENAME\n" + + " AND D.DELIVERYNAME =:DELIVERYNAME\n" + + " AND D.DELIVERYSTATE = '02'\n" + + "\t\tAND DR.MATERIALSPECNAME=RD.MATERIALSPECNAME\n" + + "\t\tAND RD.RECEIVEREQUESTDETAILNAME=DR.RECEIVEREQUESTDETAILNAME\n" + + "\t\tAND P.RECEIVEREQUESTNAME = DR.DELIVERYNAME \n" + + "\t\tAND P.MATERIALSPECNAME = DR.MATERIALSPECNAME AND P.STOCKSTATE = 'Created' \n" + + "\t\tGROUP BY \n" + + "\t\tP.SITENAME,EL.DESCRIPTION,TO_CHAR(P.RECEIVETIME ,'YYYY-MM-DD' ),\n" + + "\t\tP.MATERIALSPECNAME,MP.DESC_CN, MP.MATERIALGROUP,P.UNIT,SP.SUPPLIERNO, SP.SUPPLIERNAME,\n" + + "\t\tSUBSTR(P.TRUEGG , 1, INSTR(P.TRUEGG , '*') - 1) ,P.LOCATIONNAME "; + Map hashMap = new HashMap (); + hashMap.put("SITENAME", siteName); + hashMap.put("DELIVERYNAME", deliveryName); + List> list = IDMFrameServiceProxy.getSqlTemplate().queryForList(sql, hashMap); + if (list == null || list.size() < 1) { + throw new CustomException("条码在系统中不存在"); + } JSONArray jsonArray = new JSONArray(); for (int i = 0; i < list.size(); i++) { @@ -497,12 +539,12 @@ public class QMSServiceImpl implements QMSService{ jsonObject.put("supplierName", list.get(i).get("SUPPLIERNAME")); jsonObject.put("supplierCode", list.get(i).get("SUPPLIERCODE")); jsonObject.put("materialName", list.get(i).get("MATERIALNAME")); - jsonObject.put("materialCode", list.get(i).get("MATERIALCODE")); + jsonObject.put("materialCode", list.get(i).get("MATERIALSPECNAME")); jsonObject.put("materialGroup", list.get(i).get("MATERIALGROUP")); - jsonObject.put("batchQuantity", list.get(i).get("BATCHQUANTITY")); - jsonObject.put("quantityUnit", list.get(i).get("QUANTITYUNIT")); - jsonObject.put("deliveryDate", list.get(i).get("DELIVERYDATE")); - jsonObject.put("specifications", list.get(i).get("BATCHNUMBER")); + jsonObject.put("batchQuantity", list.get(i).get("BATCHQUANTITY"));// + jsonObject.put("quantityUnit", list.get(i).get("UNIT"));//QUANTITYUNIT + jsonObject.put("deliveryDate", list.get(i).get("DELIVERYDATE"));// + jsonObject.put("specifications", list.get(i).get("BATCHNUMBER"));// jsonObject.put("LOCATIONNAME", list.get(i).get("LOCATIONNAME")); jsonObject.put("inspector", "检验室(原材仓)"); 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 cf9cfa7..80d35e4 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 @@ -6535,7 +6535,7 @@ public class ToSAPServiceImpl { sendData = ToSAPMessageUtil.mm067(user, bodyData, itemData, commitDate); exceptionMsg = "SAP返回"; sapreturn = toSAPMessageUtil.sendHttpPost(toSAPMessageUtil.materialChangeLocationUrl,"",sendData); - //sapreturn = "{\"HEAD\":{\"INTF_ID\":\"MM067\",\"SRC_SYSTEM\":\"WMS\",\"DEST_SYSTEM\":\"SAP\",\"SRC_MSGID\":\"4908eca1-e70f-4b09-8c79-fb3d34f0f42c\"},\"RETURN\":{\"STATUS\":\"S\",\"MSGTXT\":\"\",\"MBLNR\":\"5000000303\",\"MJAHR\":\"2025\"}}"; + //sapreturn = "{\"HEAD\":{\"INTF_ID\":\"MM067\",\"SRC_SYSTEM\":\"WMS\",\"DEST_SYSTEM\":\"SAP\",\"SRC_MSGID\":\"4908eca1-e70f-4b09-8c79-fb3d34f0f42c\"},\"RETURN\":{\"STATUS\":\"S\",\"MSGTXT\":\"\",\"MBLNR\":\"5000000324\",\"MJAHR\":\"2025\"}}"; org.json.JSONObject receiveJsonObject = new org.json.JSONObject(sapreturn); org.json.JSONObject returnJsonObject = (org.json.JSONObject) receiveJsonObject.get("RETURN"); @@ -6576,9 +6576,8 @@ public class ToSAPServiceImpl { // 调用 QMS //qMSServiceImpl.PreIQCInfoSend(receiveRequestName, "SDK",opCode, erpFactory); exceptionMsg = "QMS返回"; - qmsServiceImpl.sendToIQCByDataList(opCode, qmsDataList); + qmsServiceImpl.sendToIQCByDataList(opCode, "SDK",deliveryName); } - // 更新入库凭证,更新库存状态 if (StringUtils.isNotEmpty(undoId)){ // 更新入库凭证 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 5acc9ca..28dbe1c 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 @@ -6,6 +6,7 @@ import com.cim.idm.constants.delivery.DeliveryTypeEnums; import com.cim.idm.exception.GlobalException; import com.cim.idm.model.dto.delivery.DeliveryDelDto; import com.cim.idm.model.dto.delivery.DeliveryDto; +import com.cim.idm.model.dto.delivery.DeliveryEditDto; import com.cim.idm.model.dto.delivery.StoreDetailDto; import com.cim.idm.model.po.MaterialReceiveRequest; import com.cim.idm.model.dto.PageDto; @@ -180,4 +181,26 @@ public class DeliveryController { deliveryService.getMaterialDetail(storeDetailDto.getDocumentName(), storeDetailDto.getSiteName(), nameList, deliveryName)); } } + + /** + * 修改到货单 + */ + @PostMapping(value = "/updateDeliveryStates") + public AjaxResult UpdateDeliveryStates(@RequestBody DeliveryEditDto deliveryEditDto) { + StoreDetailDto storeDetailDto = new StoreDetailDto(); + storeDetailDto.setDocumentName(deliveryEditDto.getDeliveryName()); + storeDetailDto.setSiteName(deliveryEditDto.getSiteName()); + // 校验 + MaterialDelivery byKey = deliveryService.getByKey(storeDetailDto); + if (Objects.isNull(byKey)) { + throw new GlobalException("不存在到货单"); + } + if (!byKey.getDeliveryState().equals(DeliveryStateEnums.CREATE.getCode())) { + throw new GlobalException("到货单进行中或已结束，不允许修改"); + } + if (deliveryService.editDelivery(deliveryEditDto) > 0) { + return AjaxResult.me().setSuccess(true).setResultObj("修改成功"); + } + return AjaxResult.me().setErrorCode(-1).setMessage("修改失败"); + } } From 6dfb9f7ce97cedcc874dc1be264054437ca6deac Mon Sep 17 00:00:00 2001 From: 18110972313 <780768673@qq.com> Date: Wed, 21 May 2025 12:04:18 +0800 Subject: [PATCH 4/5] =?UTF-8?q?update=20=E4=BF=AE=E6=94=B9=E5=88=B0?= =?UTF-8?q?=E8=B4=A7=E5=8D=95=E5=85=A5=E5=BA=93=E8=B0=83=E7=94=A8QMS?= =?UTF-8?q?=E8=B4=A8=E6=A3=80=E6=8A=A5=E6=96=87=E6=8B=BC=E6=8E=A5SQL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cim/idm/service/impl/QMSServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zi-wms-inf/src/main/java/com/cim/idm/service/impl/QMSServiceImpl.java b/zi-wms-inf/src/main/java/com/cim/idm/service/impl/QMSServiceImpl.java index 6acad30..ace0053 100644 --- a/zi-wms-inf/src/main/java/com/cim/idm/service/impl/QMSServiceImpl.java +++ b/zi-wms-inf/src/main/java/com/cim/idm/service/impl/QMSServiceImpl.java @@ -484,6 +484,7 @@ public class QMSServiceImpl implements QMSService{ " \t\tEL.DESCRIPTION AS ERPLOCATIONDESC,\n" + "\t\tP.LOCATIONNAME,\t\n" + "\t\tTO_CHAR(P.RECEIVETIME ,'YYYY-MM-DD' ) deliveryDate,\n" + + "\t\tDR.RECEIVEREQUESTNAME,\n" + "\t\tP.MATERIALSPECNAME AS materialCode,\n" + "\t\tMP.DESC_CN AS materialName,\n" + "\t\tMP.MATERIALGROUP AS materialGroup,\n" + @@ -512,7 +513,7 @@ public class QMSServiceImpl implements QMSService{ "\t\tGROUP BY \n" + "\t\tP.SITENAME,EL.DESCRIPTION,TO_CHAR(P.RECEIVETIME ,'YYYY-MM-DD' ),\n" + "\t\tP.MATERIALSPECNAME,MP.DESC_CN, MP.MATERIALGROUP,P.UNIT,SP.SUPPLIERNO, SP.SUPPLIERNAME,\n" + - "\t\tSUBSTR(P.TRUEGG , 1, INSTR(P.TRUEGG , '*') - 1) ,P.LOCATIONNAME "; + "\t\tSUBSTR(P.TRUEGG , 1, INSTR(P.TRUEGG , '*') - 1) ,P.LOCATIONNAME,DR.RECEIVEREQUESTNAME "; Map hashMap = new HashMap (); hashMap.put("SITENAME", siteName); hashMap.put("DELIVERYNAME", deliveryName); From 8446d21b1b1f9cef864c52aaaf6b11946417ec3e Mon Sep 17 00:00:00 2001 From: 18110972313 <780768673@qq.com> Date: Wed, 21 May 2025 12:30:17 +0800 Subject: [PATCH 5/5] =?UTF-8?q?update=20=E6=96=B0=E5=A2=9E=E5=88=B0?= =?UTF-8?q?=E8=B4=A7=E5=8D=95=E6=9F=A5=E8=AF=A2=E6=96=B9=E6=B3=95=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BE=9B=E5=BA=94=E5=95=86=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cim/idm/model/dto/PurchaseDto.java | 3 +++ zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/dto/PurchaseDto.java b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/PurchaseDto.java index e437349..6d27110 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/model/dto/PurchaseDto.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/PurchaseDto.java @@ -30,4 +30,7 @@ public class PurchaseDto { // 到货单类型 private String deliveryType; + + // 供应商 + private String supplierNo; } 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 da8fc28..c53525f 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 @@ -74,6 +74,9 @@ AND m.ORDERDATE BETWEEN TO_DATE( #{dto.fromDate}, 'YYYY/MM/DDHH24MISS' ) AND TO_DATE( #{dto.toDate}, 'YYYY/MM/DDHH24MISS' ) + + AND m.SUPPLIERNO LIKE '%'||#{dto.supplierNo}||'%' + AND ms.IS_BATCH = #{isBatch}