From 106a7aa8bd023e468f56d455cf5f0374d5208c1d Mon Sep 17 00:00:00 2001 From: Amjacks <1932302177@qq.com> Date: Thu, 10 Apr 2025 09:09:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat=20sap=E4=B8=8B=E5=8F=91=E7=89=A9?= =?UTF-8?q?=E6=96=99=E4=B8=BB=E6=95=B0=E6=8D=AE=E8=A7=A3=E6=9E=90=E6=81=92?= =?UTF-8?q?=E6=B8=A9=E6=81=92=E6=B9=BF=E3=80=81=E7=86=9F=E5=8C=96=E5=B1=9E?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cim/idm/constants/MaturingEnums.java | 29 +++++++++++++++++++ .../com/cim/idm/constants/StorageEnums.java | 28 ++++++++++++++++++ .../idm/controller/SAPToWMSController.java | 15 ++++++---- 3 files changed, 66 insertions(+), 6 deletions(-) create mode 100644 zi-wms-pda/src/main/java/com/cim/idm/constants/MaturingEnums.java create mode 100644 zi-wms-pda/src/main/java/com/cim/idm/constants/StorageEnums.java diff --git a/zi-wms-pda/src/main/java/com/cim/idm/constants/MaturingEnums.java b/zi-wms-pda/src/main/java/com/cim/idm/constants/MaturingEnums.java new file mode 100644 index 0000000..6ec35b5 --- /dev/null +++ b/zi-wms-pda/src/main/java/com/cim/idm/constants/MaturingEnums.java @@ -0,0 +1,29 @@ +package com.cim.idm.constants; + +import lombok.Getter; + +@Getter +public enum MaturingEnums { + NOT_MATURED("01", "不熟化"), + NORMAL_TEMPERATURE("02", "常温"), + LOW_TEMPERATURE("03", "低温"), + MODERATE_TEMPERATURE("04", "中温"), + HIGH_TEMPERATURE("05", "高温"); + + private final String code; + private final String info; + + MaturingEnums(String code, String info) { + this.code = code; + this.info = info; + } + + public String getMaturing(String code) { + for (MaturingEnums value : MaturingEnums.values()) { + if (value.getCode().equals(code)) { + return value.getInfo(); + } + } + return MaturingEnums.NOT_MATURED.getCode(); + } +} diff --git a/zi-wms-pda/src/main/java/com/cim/idm/constants/StorageEnums.java b/zi-wms-pda/src/main/java/com/cim/idm/constants/StorageEnums.java new file mode 100644 index 0000000..3c1134c --- /dev/null +++ b/zi-wms-pda/src/main/java/com/cim/idm/constants/StorageEnums.java @@ -0,0 +1,28 @@ +package com.cim.idm.constants; + +import lombok.Getter; + +@Getter +public enum StorageEnums { + GENERAL_WAREHOUSE("01", "普通仓库"), + CONSTANT_TEMPERATURE_WAREHOUSE("02", "恒温仓库"), + COLD_WAREHOUSE("03", "冷藏仓库"), + DRY_FILM_WAREHOUSE("04", "干膜仓库"); + + private final String code; + private final String info; + + StorageEnums(String code, String info) { + this.code = code; + this.info = info; + } + + public String getStorage(String code) { + for (StorageEnums value : StorageEnums.values()) { + if (value.getCode().equals(code)) { + return value.getInfo(); + } + } + return StorageEnums.GENERAL_WAREHOUSE.getCode(); + } +} diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/SAPToWMSController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/SAPToWMSController.java index ff17428..1e911a1 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/SAPToWMSController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/SAPToWMSController.java @@ -82,9 +82,9 @@ public class SAPToWMSController { ArrayList> data = request.getBODY(); // 主表 - String insertSql="INSERT INTO MATERIALSPEC (sitename, materialspecname, materialgroup, materialgroupdescription, materialunit, materialunitdesc, deliverycycle, minorderqty, phase, materialtype, mstae, oldmaterialspecname, highvalueflag, commonmaterialflag, purchasetype, width, financialtype, createtime, createuser, lasteventtime, lasteventuser, lasteventtimekey, lasteventname, lasteventcomment,desc_en,IS_CON_TEMP ,MATURATIONTIME ,MATURATIONFLAG ,DEGREE,EXPIRATION_RULES, ZTURENAME, ZMDQ) " + SystemPropHelper.CR + - "VALUES(:sitename, :materialspecname, :materialgroup, :materialgroupdescription, :materialunit, :materialunitdesc,:deliverycycle, :minorderqty, :phase, :materialtype, :mstae, :oldmaterialspecname, :highvalueflag, :commonmaterialflag, :purchasetype, :width, :financialtype, :createtime, :createuser, :lasteventtime, :lasteventuser, :lasteventtimekey, :lasteventname, :lasteventcomment,:desc_en,:IS_CON_TEMP ,:MATURATIONTIME ,:MATURATIONFLAG ,:DEGREE,:EXPIRATION_RULES, :zturename, :zmdq)"; - String updateSql = "UPDATE MATERIALSPEC SET materialgroup = :materialgroup,desc_en=:desc_en,IS_CON_TEMP=:IS_CON_TEMP ,MATURATIONTIME=:MATURATIONTIME ,MATURATIONFLAG=:MATURATIONFLAG ,DEGREE=:DEGREE,EXPIRATION_RULES=:EXPIRATION_RULES, materialgroupdescription = :materialgroupdescription, materialunit = :materialunit, materialunitdesc = :materialunitdesc, deliverycycle = :deliverycycle, minorderqty = :minorderqty, phase = :phase, materialtype = :materialtype, mstae = :mstae, oldmaterialspecname = :oldmaterialspecname, highvalueflag = highvalueflag, commonmaterialflag = :commonmaterialflag, purchasetype = :purchasetype, width = :width, financialtype = :financialtype, createtime = :createtime, createuser = :createuser, lasteventtime = :lasteventtime, lasteventuser = :lasteventuser, lasteventtimekey = :lasteventtimekey, lasteventname = :lasteventname, lasteventcomment = :lasteventcomment, zturename = :zturename, zmdq = :zmdq where materialspecname = :materialspecname and sitename = :sitename"; + String insertSql="INSERT INTO MATERIALSPEC (sitename, materialspecname, materialgroup, materialgroupdescription, materialunit, materialunitdesc, deliverycycle, minorderqty, phase, materialtype, mstae, oldmaterialspecname, highvalueflag, commonmaterialflag, purchasetype, width, financialtype, createtime, createuser, lasteventtime, lasteventuser, lasteventtimekey, lasteventname, lasteventcomment,desc_en,IS_CON_TEMP ,MATURATIONTIME ,MATURATIONFLAG ,DEGREE,EXPIRATION_RULES, ZTURENAME, ZMDQ, IS_CON_TEMP_T, MATURATIONTIME_T, MATURATIONFLAG_T) " + SystemPropHelper.CR + + "VALUES(:sitename, :materialspecname, :materialgroup, :materialgroupdescription, :materialunit, :materialunitdesc,:deliverycycle, :minorderqty, :phase, :materialtype, :mstae, :oldmaterialspecname, :highvalueflag, :commonmaterialflag, :purchasetype, :width, :financialtype, :createtime, :createuser, :lasteventtime, :lasteventuser, :lasteventtimekey, :lasteventname, :lasteventcomment,:desc_en,:IS_CON_TEMP ,:MATURATIONTIME ,:MATURATIONFLAG ,:DEGREE,:EXPIRATION_RULES, :zturename, :zmdq, :IS_CON_TEMP_T, :MATURATIONTIME_T, :MATURATIONFLAG_T)"; + String updateSql = "UPDATE MATERIALSPEC SET materialgroup = :materialgroup,desc_en=:desc_en,IS_CON_TEMP=:IS_CON_TEMP ,MATURATIONTIME=:MATURATIONTIME ,MATURATIONFLAG=:MATURATIONFLAG ,DEGREE=:DEGREE,EXPIRATION_RULES=:EXPIRATION_RULES, materialgroupdescription = :materialgroupdescription, materialunit = :materialunit, materialunitdesc = :materialunitdesc, deliverycycle = :deliverycycle, minorderqty = :minorderqty, phase = :phase, materialtype = :materialtype, mstae = :mstae, oldmaterialspecname = :oldmaterialspecname, highvalueflag = highvalueflag, commonmaterialflag = :commonmaterialflag, purchasetype = :purchasetype, width = :width, financialtype = :financialtype, createtime = :createtime, createuser = :createuser, lasteventtime = :lasteventtime, lasteventuser = :lasteventuser, lasteventtimekey = :lasteventtimekey, lasteventname = :lasteventname, lasteventcomment = :lasteventcomment, zturename = :zturename, zmdq = :zmdq, IS_CON_TEMP_T = :IS_CON_TEMP_T, MATURATIONTIME_T = :MATURATIONTIME_T, MATURATIONFLAG_T = :MATURATIONFLAG_T where materialspecname = :materialspecname and sitename = :sitename"; // 附加单位 String insertMarmSql = "insert into BS_MATERIALUNIT (materialspecname, additionalunit, modulecule, denominator) " + "VALUES(:materialspecname, :additionalunit, :modulecule, :denominator)"; @@ -178,7 +178,7 @@ public class SAPToWMSController { ZBZQTYPE="0"; } //存储条件ZRAUBE 01普通 02恒温 03冷藏 04干膜 - if(StringUtils.equals(ZRAUBE, "02")) + /*if(StringUtils.equals(ZRAUBE, "02")) { ZRAUBE="Y"; } @@ -193,11 +193,14 @@ public class SAPToWMSController { { MATURATIONFLAG="N"; - } + }*/ map.put("IS_CON_TEMP", ZRAUBE); + map.put("IS_CON_TEMP_T", ZRAUBE); map.put("MATURATIONTIME", ZDAY); - map.put("MATURATIONFLAG", MATURATIONFLAG); + map.put("MATURATIONTIME_T", ZDAY); + map.put("MATURATIONFLAG", ZTEMPB); + map.put("MATURATIONFLAG_T", ZTEMPB); map.put("DEGREE", ZTEMPB); map.put("EXPIRATION_RULES", ZBZQTYPE); From c8de025d22e289c45be52684042bbe7e9ca6bc5e Mon Sep 17 00:00:00 2001 From: Amjacks <1932302177@qq.com> Date: Thu, 10 Apr 2025 15:31:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat=20=E6=9B=B4=E6=94=B9=E5=88=B0=E8=B4=A7?= =?UTF-8?q?=E5=8D=95=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cim/idm/constants/DeliveryStateEnums.java | 17 +++++++ .../cim/idm/constants/DeliveryTypeEnums.java | 17 +++++++ .../cim/idm/constants/DocumentTypeEnums.java | 17 +++++++ .../cim/idm/constants/ReceiveTypeEnums.java | 3 +- .../idm/controller/DeliveryController.java | 49 ++++++++++--------- .../java/com/cim/idm/dao/DeliveryDao.java | 30 ++++++------ .../model/dto/{ => delivery}/DeliveryDto.java | 10 ++-- .../{ => delivery}/DeliveryRelationDto.java | 2 +- .../model/dto/delivery/StoreDetailDto.java | 13 +++++ .../model/po/delivery/MaterialDelivery.java | 16 ++++++ .../MaterialDeliveryReceive.java} | 8 +-- .../com/cim/idm/service/IDeliveryService.java | 29 ++++++----- .../idm/service/Impl/DeliveryServiceImpl.java | 30 ++++++------ .../resources/com/cim/idm/dao/DeliveryDao.xml | 41 +++++++--------- 14 files changed, 182 insertions(+), 100 deletions(-) create mode 100644 zi-wms-pda/src/main/java/com/cim/idm/constants/DeliveryStateEnums.java create mode 100644 zi-wms-pda/src/main/java/com/cim/idm/constants/DeliveryTypeEnums.java create mode 100644 zi-wms-pda/src/main/java/com/cim/idm/constants/DocumentTypeEnums.java rename zi-wms-pda/src/main/java/com/cim/idm/model/dto/{ => delivery}/DeliveryDto.java (64%) rename zi-wms-pda/src/main/java/com/cim/idm/model/dto/{ => delivery}/DeliveryRelationDto.java (86%) create mode 100644 zi-wms-pda/src/main/java/com/cim/idm/model/dto/delivery/StoreDetailDto.java create mode 100644 zi-wms-pda/src/main/java/com/cim/idm/model/po/delivery/MaterialDelivery.java rename zi-wms-pda/src/main/java/com/cim/idm/model/po/{MaterialReceiveDelivery.java => delivery/MaterialDeliveryReceive.java} (62%) diff --git a/zi-wms-pda/src/main/java/com/cim/idm/constants/DeliveryStateEnums.java b/zi-wms-pda/src/main/java/com/cim/idm/constants/DeliveryStateEnums.java new file mode 100644 index 0000000..1751d3e --- /dev/null +++ b/zi-wms-pda/src/main/java/com/cim/idm/constants/DeliveryStateEnums.java @@ -0,0 +1,17 @@ +package com.cim.idm.constants; + +import lombok.Getter; + +@Getter +public enum DeliveryStateEnums { + CREATE("01", "新建"), + FINISH("02", "结束"); + + private final String code; + private final String info; + + DeliveryStateEnums(String code, String info) { + this.code = code; + this.info = info; + } +} diff --git a/zi-wms-pda/src/main/java/com/cim/idm/constants/DeliveryTypeEnums.java b/zi-wms-pda/src/main/java/com/cim/idm/constants/DeliveryTypeEnums.java new file mode 100644 index 0000000..802944e --- /dev/null +++ b/zi-wms-pda/src/main/java/com/cim/idm/constants/DeliveryTypeEnums.java @@ -0,0 +1,17 @@ +package com.cim.idm.constants; + +import lombok.Getter; + +@Getter +public enum DeliveryTypeEnums { + BATCH("01", "批次到货单"), + AUXILIARY_MATERIALS("02", "辅材到货单"); + + private final String code; + private final String info; + + DeliveryTypeEnums(String code, String info) { + this.code = code; + this.info = info; + } +} diff --git a/zi-wms-pda/src/main/java/com/cim/idm/constants/DocumentTypeEnums.java b/zi-wms-pda/src/main/java/com/cim/idm/constants/DocumentTypeEnums.java new file mode 100644 index 0000000..1af2cac --- /dev/null +++ b/zi-wms-pda/src/main/java/com/cim/idm/constants/DocumentTypeEnums.java @@ -0,0 +1,17 @@ +package com.cim.idm.constants; + +import lombok.Getter; + +@Getter +public enum DocumentTypeEnums { + DELIVERY("01", "到货单"), + RECEIVE("02", "采购单"); + + private final String code; + private final String info; + + DocumentTypeEnums(String code, String info) { + this.code = code; + this.info = info; + } +} diff --git a/zi-wms-pda/src/main/java/com/cim/idm/constants/ReceiveTypeEnums.java b/zi-wms-pda/src/main/java/com/cim/idm/constants/ReceiveTypeEnums.java index b25773c..c161c01 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/constants/ReceiveTypeEnums.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/constants/ReceiveTypeEnums.java @@ -10,8 +10,7 @@ public enum ReceiveTypeEnums { Z001("Z001", "生产物资采购订单"), Z002("Z002", "研发采购订单"), Z003("Z003", "非生产物资采购订单"), - Z004("Z004", "固定资产、在建工程采购订单"), - DK("DK", "到库单"); + Z004("Z004", "固定资产、在建工程采购订单"); private final String code; private final String info; 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 be5b5dd..1289210 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 @@ -1,11 +1,12 @@ package com.cim.idm.controller; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.cim.idm.constants.ReceiveTypeEnums; -import com.cim.idm.model.dto.DeliveryDto; +import com.cim.idm.model.dto.delivery.DeliveryDto; +import com.cim.idm.model.dto.delivery.StoreDetailDto; import com.cim.idm.model.po.MaterialReceiveRequest; import com.cim.idm.model.dto.PageDto; +import com.cim.idm.model.po.delivery.MaterialDelivery; +import com.cim.idm.model.po.delivery.MaterialDeliveryReceive; import com.cim.idm.service.IDeliveryService; import com.cim.idm.utils.AjaxResult; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -33,17 +34,16 @@ public class DeliveryController { * 创建入库单 */ @PostMapping(value = "/create") - public AjaxResult createDelivery(@RequestBody JSONObject in) { - DeliveryDto dto = JSON.toJavaObject(in, DeliveryDto.class); + public AjaxResult createDelivery(@RequestBody DeliveryDto dto) { return AjaxResult.me().setSuccess(true).setMessage(deliveryService.createDelivery(dto)); } /** * 获取采购单 */ - @PostMapping(value = "/getPurchase") - public AjaxResult getPurchase(@RequestBody PageDto in) { - return AjaxResult.me().setSuccess(true).setResultObj(deliveryService.getPurchase(in)); + @PostMapping(value = "/getReceiveList") + public AjaxResult getReceiveList(@RequestBody PageDto in) { + return AjaxResult.me().setSuccess(true).setResultObj(deliveryService.getReceiveList(in)); } /** @@ -54,30 +54,33 @@ public class DeliveryController { public AjaxResult getStoreDetail(@RequestBody JSONObject in) { Map params = (Map) in.get("params"); // siteName - String siteName = params.get("SITENAME"); - String receiveRequestName = params.get("RECEIVEREQUESTNAME"); + StoreDetailDto storeDetailDto = new StoreDetailDto(); + storeDetailDto.setSiteName(params.get("SITENAME")); + storeDetailDto.setDocumentName(params.get("RECEIVEREQUESTNAME")); // 单据名称集合 List nameList = new ArrayList<>(); - // 判定是否是到库单 - MaterialReceiveRequest byKey = deliveryService.getByKey(siteName, receiveRequestName); - if (Objects.isNull(byKey)) { - return AjaxResult.me().setSuccess(false).setMessage("不存在该单据"); - } - String typeByKey = byKey.getReceiveRequestType(); - // 到货单 String deliveryName = null; - if (typeByKey.equals(ReceiveTypeEnums.DK.getCode())) { + MaterialDelivery byKey = deliveryService.getByKey(storeDetailDto); + // 到货单 + if (Objects.nonNull(byKey)) { + deliveryName = byKey.getDeliveryName(); // 到库单（找出该单据下的所有的采购单） - nameList = deliveryService.getReceiveByDelivery(siteName, receiveRequestName) - .stream().map(MaterialReceiveRequest::getReceiveRequestName).collect(Collectors.toList()); - deliveryName = receiveRequestName; + nameList = deliveryService.getReceiveByDelivery(storeDetailDto) + .stream().map(MaterialDeliveryReceive::getReceiveRequestName).collect(Collectors.toList()); } else { // 采购单 - nameList.add(receiveRequestName); + MaterialReceiveRequest receiveByKey = deliveryService.getReceiveByKey(storeDetailDto); + if (Objects.nonNull(receiveByKey)) { + nameList.add(storeDetailDto.getDocumentName()); + } + } + // 异常 + if (nameList.isEmpty()) { + return AjaxResult.me().setSuccess(false).setMessage("不存在该单据"); } // 获取采购单明细及批次 return AjaxResult.me().setSuccess(true).setResultObj( - deliveryService.getStoreDetail(siteName, nameList, deliveryName)); + deliveryService.getStoreDetail(storeDetailDto.getSiteName(), nameList, deliveryName)); } /** 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 79cf7cc..21db1c2 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 @@ -1,7 +1,10 @@ package com.cim.idm.dao; -import com.cim.idm.model.dto.DeliveryRelationDto; -import com.cim.idm.model.po.MaterialReceiveDelivery; +import com.cim.idm.model.dto.delivery.DeliveryDto; +import com.cim.idm.model.dto.delivery.DeliveryRelationDto; +import com.cim.idm.model.dto.delivery.StoreDetailDto; +import com.cim.idm.model.po.delivery.MaterialDelivery; +import com.cim.idm.model.po.delivery.MaterialDeliveryReceive; import com.cim.idm.model.po.MaterialReceiveRequest; import com.cim.idm.model.dto.PurchaseDto; import com.cim.idm.model.vo.DeliveryReceiveDetailVo; @@ -21,9 +24,8 @@ public interface DeliveryDao { /** * 新增到货单 */ - int createDelivery(@Param("siteName") String siteName, - @Param("receiveRequestName") String receiveRequestName, - @Param("receiveRequestType") String receiveRequestType ); + int createDelivery(@Param("dto") DeliveryDto dto, + @Param("state") String state); /** * 新增到货单关系 @@ -33,7 +35,7 @@ public interface DeliveryDao { /** * 获取采购订单 */ - List getPurchase(@Param("dto") PurchaseDto dto, + List getReceiveList(@Param("dto") PurchaseDto dto, @Param("typeList") List typeList); /** @@ -54,19 +56,17 @@ public interface DeliveryDao { /** * 根据 key 获取值 */ - MaterialReceiveRequest getByKey(@Param("siteName") String siteName, - @Param("receiveRequestName") String receiveRequestName); + MaterialDelivery getByKey(@Param("dto") StoreDetailDto storeDetailDto); + + /** + * 根据 key 获取采购单 + */ + MaterialReceiveRequest getReceiveByKey(@Param("dto") StoreDetailDto storeDetailDto); /** * 根据到库单获取采购单名称 */ - List getReceiveByDelivery(@Param("siteName") String siteName, - @Param("receiveRequestName") String receiveRequestName); - - /** - * 获取到库单关系 - */ - List getRelation(@Param("deliveryName") String deliveryName); + List getReceiveByDelivery(@Param("dto") StoreDetailDto storeDetailDto); /** * 根据到库单获取采购单名称 diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/dto/DeliveryDto.java b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/delivery/DeliveryDto.java similarity index 64% rename from zi-wms-pda/src/main/java/com/cim/idm/model/dto/DeliveryDto.java rename to zi-wms-pda/src/main/java/com/cim/idm/model/dto/delivery/DeliveryDto.java index f4deb03..9e24770 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/model/dto/DeliveryDto.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/delivery/DeliveryDto.java @@ -1,4 +1,4 @@ -package com.cim.idm.model.dto; +package com.cim.idm.model.dto.delivery; import com.cim.idm.wmspackage.invoice.management.data.MaterialReceiveRequestKey; import lombok.Data; @@ -10,11 +10,11 @@ public class DeliveryDto { // siteName private String siteName; - // 单号名称 - private String receiveRequestName; + // 到货单名称 + private String deliveryName; - // 数据 - private List dataList; + // 类型 + private String deliveryType; // 数据 private List receiveList; diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/dto/DeliveryRelationDto.java b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/delivery/DeliveryRelationDto.java similarity index 86% rename from zi-wms-pda/src/main/java/com/cim/idm/model/dto/DeliveryRelationDto.java rename to zi-wms-pda/src/main/java/com/cim/idm/model/dto/delivery/DeliveryRelationDto.java index 83b8f57..4c36105 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/model/dto/DeliveryRelationDto.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/delivery/DeliveryRelationDto.java @@ -1,4 +1,4 @@ -package com.cim.idm.model.dto; +package com.cim.idm.model.dto.delivery; import lombok.Data; diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/dto/delivery/StoreDetailDto.java b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/delivery/StoreDetailDto.java new file mode 100644 index 0000000..d46e159 --- /dev/null +++ b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/delivery/StoreDetailDto.java @@ -0,0 +1,13 @@ +package com.cim.idm.model.dto.delivery; + +import lombok.Data; + +@Data +public class StoreDetailDto { + + // 工厂 + private String siteName; + + // 单据名称 + private String documentName; +} diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/po/delivery/MaterialDelivery.java b/zi-wms-pda/src/main/java/com/cim/idm/model/po/delivery/MaterialDelivery.java new file mode 100644 index 0000000..3f26a1c --- /dev/null +++ b/zi-wms-pda/src/main/java/com/cim/idm/model/po/delivery/MaterialDelivery.java @@ -0,0 +1,16 @@ +package com.cim.idm.model.po.delivery; + +import lombok.Data; + +@Data +public class MaterialDelivery { + + // 工厂 + private String siteName; + // 到货单号 + private String deliveryName; + // 到货单类型 + private String deliveryType; + // 到货单状态 + private String deliveryState; +} diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/po/MaterialReceiveDelivery.java b/zi-wms-pda/src/main/java/com/cim/idm/model/po/delivery/MaterialDeliveryReceive.java similarity index 62% rename from zi-wms-pda/src/main/java/com/cim/idm/model/po/MaterialReceiveDelivery.java rename to zi-wms-pda/src/main/java/com/cim/idm/model/po/delivery/MaterialDeliveryReceive.java index 20ba28d..7ce3035 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/model/po/MaterialReceiveDelivery.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/model/po/delivery/MaterialDeliveryReceive.java @@ -1,15 +1,15 @@ -package com.cim.idm.model.po; +package com.cim.idm.model.po.delivery; import lombok.Data; @Data -public class MaterialReceiveDelivery { +public class MaterialDeliveryReceive { - // 到库单 + // 到库单号 private String deliveryName; // 到库数量 private String deliveryNum; - // 采购单 + // 采购单号 private String receiveRequestName; // 料号 private String materialSpecName; 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 9dbfc11..8d27029 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 @@ -1,7 +1,9 @@ package com.cim.idm.service; -import com.cim.idm.model.dto.DeliveryDto; -import com.cim.idm.model.po.MaterialReceiveDelivery; +import com.cim.idm.model.dto.delivery.DeliveryDto; +import com.cim.idm.model.dto.delivery.StoreDetailDto; +import com.cim.idm.model.po.delivery.MaterialDelivery; +import com.cim.idm.model.po.delivery.MaterialDeliveryReceive; import com.cim.idm.model.po.MaterialReceiveRequest; import com.cim.idm.model.dto.PageDto; import com.cim.idm.model.vo.DeliveryReceiveDetailVo; @@ -24,7 +26,7 @@ public interface IDeliveryService { * @param dto 请求 * @return 采购订单 */ - PageInfo getPurchase(PageDto dto); + PageInfo getReceiveList(PageDto dto); /** * 获取采购单明细及批次 @@ -37,23 +39,24 @@ public interface IDeliveryService { /** * 根据 key 获取值 - * @param siteName 组织 - * @param receiveRequestName 单据名称 + * @param storeDetailDto 单据请求 * @return 类型 */ - MaterialReceiveRequest getByKey(String siteName, String receiveRequestName); + MaterialDelivery getByKey(StoreDetailDto storeDetailDto); + + /** + * 根据 key 获取采购单 + * @param storeDetailDto 单据请求 + * @return 类型 + */ + MaterialReceiveRequest getReceiveByKey(StoreDetailDto storeDetailDto); /** * 根据到库单获取采购单名称 - * @param receiveRequestName 到库单 + * @param storeDetailDto 到库单 * @return 采购单名称列表 */ - List getReceiveByDelivery(String siteName, String receiveRequestName); - - /** - * 获取到库单关系 - */ - List getRelation(String deliveryName); + List getReceiveByDelivery(StoreDetailDto storeDetailDto); /** * 根据到库单获取采购单名称 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 79c7f32..2bc44a0 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 @@ -1,13 +1,16 @@ package com.cim.idm.service.Impl; import com.alibaba.fastjson.JSON; +import com.cim.idm.constants.DeliveryStateEnums; import com.cim.idm.constants.ReceiveTypeEnums; import com.cim.idm.dao.DeliveryDao; import com.cim.idm.model.dto.PageDto; import com.cim.idm.model.dto.PurchaseDto; -import com.cim.idm.model.dto.DeliveryDto; -import com.cim.idm.model.dto.DeliveryRelationDto; -import com.cim.idm.model.po.MaterialReceiveDelivery; +import com.cim.idm.model.dto.delivery.DeliveryDto; +import com.cim.idm.model.dto.delivery.DeliveryRelationDto; +import com.cim.idm.model.dto.delivery.StoreDetailDto; +import com.cim.idm.model.po.delivery.MaterialDelivery; +import com.cim.idm.model.po.delivery.MaterialDeliveryReceive; import com.cim.idm.model.po.MaterialReceiveRequest; import com.cim.idm.model.vo.DeliveryReceiveDetailVo; import com.cim.idm.model.vo.MaterialReceiveRequestVo; @@ -31,8 +34,7 @@ public class DeliveryServiceImpl implements IDeliveryService { @Transactional public String createDelivery(DeliveryDto dto) { // 添加到库单 - if (deliveryDao.createDelivery(dto.getSiteName(), - dto.getReceiveRequestName(), ReceiveTypeEnums.DK.getCode()) <= 0) { + if (deliveryDao.createDelivery(dto, DeliveryStateEnums.CREATE.getCode()) <= 0) { return "添加到库单失败"; } // 添加到库单关系 @@ -41,7 +43,7 @@ public class DeliveryServiceImpl implements IDeliveryService { // 数量大于 0 if (Objects.nonNull(item.getDeliveryNum()) && item.getDeliveryNum() > 0) { // 到库单号 - item.setDeliveryName(dto.getReceiveRequestName()); + item.setDeliveryName(dto.getDeliveryName()); res.add(item); } } @@ -52,10 +54,10 @@ public class DeliveryServiceImpl implements IDeliveryService { } @Override - public PageInfo getPurchase(PageDto dto) { + public PageInfo getReceiveList(PageDto dto) { PageMethod.startPage(dto.getPageNum(), dto.getPageSize()); PurchaseDto purchaseDto = JSON.toJavaObject(dto.getParams(), PurchaseDto.class); - return new PageInfo<>(deliveryDao.getPurchase(purchaseDto, ReceiveTypeEnums.getPurchase())); + return new PageInfo<>(deliveryDao.getReceiveList(purchaseDto, ReceiveTypeEnums.getPurchase())); } @Override @@ -71,18 +73,18 @@ public class DeliveryServiceImpl implements IDeliveryService { } @Override - public MaterialReceiveRequest getByKey(String siteName, String receiveRequestName) { - return deliveryDao.getByKey(siteName, receiveRequestName); + public MaterialDelivery getByKey(StoreDetailDto storeDetailDto) { + return deliveryDao.getByKey(storeDetailDto); } @Override - public List getReceiveByDelivery(String siteName, String receiveRequestName) { - return deliveryDao.getReceiveByDelivery(siteName, receiveRequestName); + public MaterialReceiveRequest getReceiveByKey(StoreDetailDto storeDetailDto) { + return deliveryDao.getReceiveByKey(storeDetailDto); } @Override - public List getRelation(String deliveryName) { - return deliveryDao.getRelation(deliveryName); + public List getReceiveByDelivery(StoreDetailDto storeDetailDto) { + return deliveryDao.getReceiveByDelivery(storeDetailDto); } @Override 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 52754a0..954041c 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 @@ -3,14 +3,14 @@ - INSERT INTO MATERIALRECEIVEREQUEST(SITENAME, RECEIVEREQUESTNAME, RECEIVEREQUESTTYPE) - VALUES (#{siteName}, #{receiveRequestName}, #{receiveRequestType}) + INSERT INTO MATERIALDELIVERY(SITENAME, DELIVERYNAME, DELIVERYTYPE, DELIVERYSTATE) + VALUES (#{dto.siteName}, #{dto.deliveryName}, #{dto.deliveryType}, #{state}) INSERT ALL - INTO MATERIALRECEIVEDELIVERY (RECEIVEREQUESTNAME, DELIVERYNAME, DELIVERYNUM, MATERIALSPECNAME) VALUES (#{item.receiveRequestName}, #{item.deliveryName}, #{item.deliveryNum}, #{item.materialSpecName}) + INTO MATERIALDELIVERYRECEIVE (RECEIVEREQUESTNAME, DELIVERYNAME, DELIVERYNUM, MATERIALSPECNAME) VALUES (#{item.receiveRequestName}, #{item.deliveryName}, #{item.deliveryNum}, #{item.materialSpecName}) SELECT * FROM dual @@ -39,7 +39,7 @@ - SELECT DISTINCT m.SITENAME, m.RECEIVEREQUESTNAME, m.RECEIVEREQUESTTYPE, m.ORDERDATE, m.SUPPLIERNO, m.LASTEVENTNAME, m.LASTEVENTTIME, m.LASTEVENTUSER, m.LASTEVENTCOMMENT, s.SUPPLIERNAME, STOCKORGNO ERPFACTORY, o.ORGNAME, ms.MATERIALSPECNAME, ms.DESC_CN, d.CREATETIME, @@ -114,7 +114,7 @@ ,DELIVERY AS ( SELECT sum(md.DELIVERYNUM) DELIVERYNUM, md.MATERIALSPECNAME MATERIALSPECNAME - FROM MATERIALRECEIVEDELIVERY md + FROM MATERIALDELIVERYRECEIVE md WHERE md.DELIVERYNAME = #{deliveryName} and md.RECEIVEREQUESTNAME IN @@ -192,33 +192,28 @@ ) TTT - + select SITENAME, DELIVERYNAME, DELIVERYTYPE, DELIVERYSTATE + from MATERIALDELIVERY + WHERE SITENAME = #{dto.siteName} + AND DELIVERYNAME = #{dto.documentName} + + + - - - SELECT md.DELIVERYNAME, md.DELIVERYNUM, md.RECEIVEREQUESTNAME, md.MATERIALSPECNAME - FROM MATERIALRECEIVEDELIVERY md - WHERE md.DELIVERYNAME = #{deliveryName} + FROM MATERIALDELIVERYRECEIVE md + WHERE md.DELIVERYNAME = #{dto.documentName}