From 9a5625021492637f6e8e10dbb56c7b5fd0f400ec Mon Sep 17 00:00:00 2001 From: Amjacks <1932302177@qq.com> Date: Mon, 31 Mar 2025 15:02:54 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E5=8C=85=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cim/idm/controller/ChargeSplitController.java | 2 +- .../java/com/cim/idm/controller/DeliveryController.java | 6 +++--- .../java/com/cim/idm/controller/FGStockInController.java | 4 +--- .../java/com/cim/idm/controller/InvoiceController.java | 3 +-- .../main/java/com/cim/idm/controller/LabelController.java | 3 +++ .../com/cim/idm/controller/MaterialPackingController.java | 4 ++-- .../cim/idm/controller/MaterialReceiveActController.java | 4 ++-- .../com/cim/idm/controller/NoInvoiceManagerContoller.java | 3 +-- .../com/cim/idm/controller/ProduceReturnController.java | 2 +- .../com/cim/idm/controller/PurchaseReturnController.java | 2 +- .../java/com/cim/idm/controller/SaleReturnController.java | 2 +- zi-wms-pda/src/main/java/com/cim/idm/dao/DeliveryDao.java | 8 ++++---- .../java/com/cim/idm/model/{ => bo}/StorageObject.java | 2 +- .../java/com/cim/idm/model/{ => dto}/DeliveryDto.java | 2 +- .../com/cim/idm/model/{ => dto}/DeliveryRelationDto.java | 2 +- .../MaterialNotPostedDto.java} | 5 +++-- .../main/java/com/cim/idm/model/{ => dto}/PageDto.java | 2 +- .../java/com/cim/idm/model/{ => dto}/PurchaseDto.java | 2 +- .../java/com/cim/idm/model/{ => dto}/StoragePrintDto.java | 2 +- .../java/com/cim/idm/model/{ => dto}/TrackOutBoDto.java | 3 ++- .../cim/idm/model/{ => po}/MaterialReceiveRequest.java | 2 +- .../idm/model/{ => po}/MaterialReceiveRequestDetail.java | 2 +- .../main/java/com/cim/idm/service/IDeliveryService.java | 8 ++++---- .../java/com/cim/idm/service/Impl/BSLabelServiceImpl.java | 2 ++ .../com/cim/idm/service/Impl/DeliveryServiceImpl.java | 7 ++++++- .../java/com/cim/idm/service/Impl/LabelServiceImpl.java | 1 + .../src/main/java/com/cim/idm/service/LabelService.java | 1 + .../src/main/resources/com/cim/idm/dao/DeliveryDao.xml | 8 ++++---- 28 files changed, 52 insertions(+), 42 deletions(-) rename zi-wms-pda/src/main/java/com/cim/idm/model/{ => bo}/StorageObject.java (77%) rename zi-wms-pda/src/main/java/com/cim/idm/model/{ => dto}/DeliveryDto.java (92%) rename zi-wms-pda/src/main/java/com/cim/idm/model/{ => dto}/DeliveryRelationDto.java (87%) rename zi-wms-pda/src/main/java/com/cim/idm/model/{MaterialNotPostedRequest.java => dto/MaterialNotPostedDto.java} (71%) rename zi-wms-pda/src/main/java/com/cim/idm/model/{ => dto}/PageDto.java (84%) rename zi-wms-pda/src/main/java/com/cim/idm/model/{ => dto}/PurchaseDto.java (82%) rename zi-wms-pda/src/main/java/com/cim/idm/model/{ => dto}/StoragePrintDto.java (89%) rename zi-wms-pda/src/main/java/com/cim/idm/model/{ => dto}/TrackOutBoDto.java (75%) rename zi-wms-pda/src/main/java/com/cim/idm/model/{ => po}/MaterialReceiveRequest.java (96%) rename zi-wms-pda/src/main/java/com/cim/idm/model/{ => po}/MaterialReceiveRequestDetail.java (98%) diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/ChargeSplitController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/ChargeSplitController.java index 7815ce9..b462029 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/ChargeSplitController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/ChargeSplitController.java @@ -2,7 +2,7 @@ package com.cim.idm.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.cim.idm.model.MaterialReceiveRequest; +import com.cim.idm.model.po.MaterialReceiveRequest; import com.cim.idm.utils.AjaxResult; import com.cim.idm.wmspackage.materialpacking.management.data.MaterialPacking; import org.springframework.beans.factory.annotation.Autowired; 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 5f08688..7fb446e 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 @@ -3,9 +3,9 @@ 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.DeliveryDto; -import com.cim.idm.model.MaterialReceiveRequest; -import com.cim.idm.model.PageDto; +import com.cim.idm.model.dto.DeliveryDto; +import com.cim.idm.model.po.MaterialReceiveRequest; +import com.cim.idm.model.dto.PageDto; import com.cim.idm.service.IDeliveryService; import com.cim.idm.utils.AjaxResult; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/FGStockInController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/FGStockInController.java index b6236fd..951ff8d 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/FGStockInController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/FGStockInController.java @@ -5,12 +5,11 @@ import com.alibaba.fastjson.JSONObject; import com.cim.idm.exception.GlobalException; import com.cim.idm.framework.IDMFrameServiceProxy; import com.cim.idm.model.MaterialPacking; -import com.cim.idm.model.MaterialReceiveRequest; +import com.cim.idm.model.po.MaterialReceiveRequest; import com.cim.idm.response.BaseResponse; import com.cim.idm.response.RespGenerator; import com.cim.idm.utils.AjaxResult; import com.cim.idm.utils.CommonUtils; -import com.cim.idm.wmspackage.name.NameServiceProxy; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.web.bind.annotation.RequestBody; @@ -18,7 +17,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/InvoiceController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/InvoiceController.java index 793b023..1bb9a9c 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/InvoiceController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/InvoiceController.java @@ -6,6 +6,7 @@ import com.cim.idm.exception.GlobalException; import com.cim.idm.framework.IDMFrameServiceProxy; import com.cim.idm.framework.data.EventInfo; import com.cim.idm.model.*; +import com.cim.idm.model.po.MaterialReceiveRequest; import com.cim.idm.service.QueryService; import com.cim.idm.utils.AjaxResult; import com.cim.idm.utils.EventInfoUtil; @@ -23,14 +24,12 @@ import com.cim.idm.wmspackage.name.NameServiceProxy; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.jdbc.core.BeanPropertyRowMapper; import org.springframework.transaction.annotation.Transactional; 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 java.io.IOException; import java.math.BigDecimal; import java.text.SimpleDateFormat; import java.util.*; diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/LabelController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/LabelController.java index 27b7a15..57bc3a6 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/LabelController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/LabelController.java @@ -7,6 +7,9 @@ import com.cim.idm.exception.GlobalException; import com.cim.idm.framework.IDMFrameServiceProxy; import com.cim.idm.framework.data.EventInfo; import com.cim.idm.model.*; +import com.cim.idm.model.dto.TrackOutBoDto; +import com.cim.idm.model.dto.StoragePrintDto; +import com.cim.idm.model.po.MaterialReceiveRequest; import com.cim.idm.mwmsextend.materialpacking.service.MaterialPackingServiceImpl; import com.cim.idm.response.BaseResponse; import com.cim.idm.response.RespGenerator; diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialPackingController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialPackingController.java index 85d7f86..e65b89b 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialPackingController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialPackingController.java @@ -2,7 +2,7 @@ package com.cim.idm.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.cim.idm.model.*; +import com.cim.idm.model.dto.MaterialNotPostedDto; import com.cim.idm.utils.AjaxResult; import com.cim.idm.wmspackage.materialpacking.MaterialPackingServiceProxy; import com.cim.idm.wmspackage.materialpacking.management.data.MaterialPackingKey; @@ -23,7 +23,7 @@ public class MaterialPackingController { */ @PostMapping(value = "/update") public AjaxResult update(@RequestBody JSONObject in) { - MaterialNotPostedRequest sl = JSON.toJavaObject(in, MaterialNotPostedRequest.class); + MaterialNotPostedDto sl = JSON.toJavaObject(in, MaterialNotPostedDto.class); // 获取数据 List collect = sl.getDataList().stream().map(item -> { MaterialPackingKey packingKey = new MaterialPackingKey(); 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 64197d0..761fdba 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 @@ -5,9 +5,9 @@ import com.alibaba.fastjson.JSONObject; import com.cim.idm.constants.ReceiveTypeEnums; import com.cim.idm.framework.IDMFrameServiceProxy; import com.cim.idm.framework.data.EventInfo; -import com.cim.idm.model.MaterialReceiveRequest; +import com.cim.idm.model.po.MaterialReceiveRequest; import com.cim.idm.model.MaterialreceiveActDto; -import com.cim.idm.model.TrackOutBoDto; +import com.cim.idm.model.dto.TrackOutBoDto; import com.cim.idm.mwmsextend.materialpacking.service.MaterialPackingServiceImpl; import com.cim.idm.service.IDeliveryService; import com.cim.idm.service.impl.QMSServiceImpl; diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/NoInvoiceManagerContoller.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/NoInvoiceManagerContoller.java index 2c7ebc0..0881541 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/NoInvoiceManagerContoller.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/NoInvoiceManagerContoller.java @@ -10,11 +10,10 @@ import java.util.Map; import java.util.Objects; import com.cim.idm.exception.GlobalException; -import com.cim.idm.model.MaterialReceiveRequest; +import com.cim.idm.model.po.MaterialReceiveRequest; import com.cim.idm.model.ShelfDto; import com.cim.idm.utils.AjaxResult; import com.cim.idm.utils.CommonUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/ProduceReturnController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/ProduceReturnController.java index 7fd405e..eb3e025 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/ProduceReturnController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/ProduceReturnController.java @@ -7,7 +7,7 @@ import com.cim.idm.exception.GlobalException; import com.cim.idm.framework.IDMFrameServiceProxy; import com.cim.idm.framework.data.EventInfo; import com.cim.idm.model.MaterialPacking; -import com.cim.idm.model.MaterialReceiveRequest; +import com.cim.idm.model.po.MaterialReceiveRequest; import com.cim.idm.utils.AjaxResult; import com.cim.idm.utils.CommonUtils; import com.cim.idm.utils.EventInfoUtil; diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/PurchaseReturnController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/PurchaseReturnController.java index 5a3ccd1..4652f13 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/PurchaseReturnController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/PurchaseReturnController.java @@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.cim.idm.dao.PurchaseReturnServiceDao; import com.cim.idm.framework.IDMFrameServiceProxy; -import com.cim.idm.model.MaterialReceiveRequest; +import com.cim.idm.model.po.MaterialReceiveRequest; import com.cim.idm.model.PurchaseReturnDto; import com.cim.idm.model.StockOutDto; import com.cim.idm.service.PurchaseReturnService; diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/SaleReturnController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/SaleReturnController.java index 22e7f4d..fc22d3d 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/SaleReturnController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/SaleReturnController.java @@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject; import com.cim.idm.exception.GlobalException; import com.cim.idm.framework.IDMFrameServiceProxy; import com.cim.idm.model.MaterialPacking; -import com.cim.idm.model.MaterialReceiveRequest; +import com.cim.idm.model.po.MaterialReceiveRequest; import com.cim.idm.model.MaterialshipRequest; import com.cim.idm.utils.AjaxResult; import com.cim.idm.utils.CommonUtils; 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 a964aa2..7106d67 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,9 +1,9 @@ package com.cim.idm.dao; -import com.cim.idm.model.DeliveryRelationDto; -import com.cim.idm.model.MaterialReceiveRequest; -import com.cim.idm.model.MaterialReceiveRequestDetail; -import com.cim.idm.model.PurchaseDto; +import com.cim.idm.model.dto.DeliveryRelationDto; +import com.cim.idm.model.po.MaterialReceiveRequest; +import com.cim.idm.model.po.MaterialReceiveRequestDetail; +import com.cim.idm.model.dto.PurchaseDto; import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/StorageObject.java b/zi-wms-pda/src/main/java/com/cim/idm/model/bo/StorageObject.java similarity index 77% rename from zi-wms-pda/src/main/java/com/cim/idm/model/StorageObject.java rename to zi-wms-pda/src/main/java/com/cim/idm/model/bo/StorageObject.java index 99995e2..7235172 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/model/StorageObject.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/model/bo/StorageObject.java @@ -1,4 +1,4 @@ -package com.cim.idm.model; +package com.cim.idm.model.bo; import lombok.Data; diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/DeliveryDto.java b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/DeliveryDto.java similarity index 92% rename from zi-wms-pda/src/main/java/com/cim/idm/model/DeliveryDto.java rename to zi-wms-pda/src/main/java/com/cim/idm/model/dto/DeliveryDto.java index 14eeea1..f4deb03 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/model/DeliveryDto.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/DeliveryDto.java @@ -1,4 +1,4 @@ -package com.cim.idm.model; +package com.cim.idm.model.dto; import com.cim.idm.wmspackage.invoice.management.data.MaterialReceiveRequestKey; import lombok.Data; diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/DeliveryRelationDto.java b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/DeliveryRelationDto.java similarity index 87% rename from zi-wms-pda/src/main/java/com/cim/idm/model/DeliveryRelationDto.java rename to zi-wms-pda/src/main/java/com/cim/idm/model/dto/DeliveryRelationDto.java index eeb4a71..89c4943 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/model/DeliveryRelationDto.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/DeliveryRelationDto.java @@ -1,4 +1,4 @@ -package com.cim.idm.model; +package com.cim.idm.model.dto; import lombok.Data; diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/MaterialNotPostedRequest.java b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/MaterialNotPostedDto.java similarity index 71% rename from zi-wms-pda/src/main/java/com/cim/idm/model/MaterialNotPostedRequest.java rename to zi-wms-pda/src/main/java/com/cim/idm/model/dto/MaterialNotPostedDto.java index fd2819c..06d80e1 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/model/MaterialNotPostedRequest.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/MaterialNotPostedDto.java @@ -1,11 +1,12 @@ -package com.cim.idm.model; +package com.cim.idm.model.dto; +import com.cim.idm.model.MaterialPacking; import lombok.Data; import java.util.List; @Data -public class MaterialNotPostedRequest { +public class MaterialNotPostedDto { // 批次 private String CHARGE; diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/PageDto.java b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/PageDto.java similarity index 84% rename from zi-wms-pda/src/main/java/com/cim/idm/model/PageDto.java rename to zi-wms-pda/src/main/java/com/cim/idm/model/dto/PageDto.java index c5570d2..346e583 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/model/PageDto.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/PageDto.java @@ -1,4 +1,4 @@ -package com.cim.idm.model; +package com.cim.idm.model.dto; import lombok.Data; import com.alibaba.fastjson.JSONObject; diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/PurchaseDto.java b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/PurchaseDto.java similarity index 82% rename from zi-wms-pda/src/main/java/com/cim/idm/model/PurchaseDto.java rename to zi-wms-pda/src/main/java/com/cim/idm/model/dto/PurchaseDto.java index 521d9de..b016cf2 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/model/PurchaseDto.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/PurchaseDto.java @@ -1,4 +1,4 @@ -package com.cim.idm.model; +package com.cim.idm.model.dto; import lombok.Data; diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/StoragePrintDto.java b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/StoragePrintDto.java similarity index 89% rename from zi-wms-pda/src/main/java/com/cim/idm/model/StoragePrintDto.java rename to zi-wms-pda/src/main/java/com/cim/idm/model/dto/StoragePrintDto.java index f801fcf..b173e45 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/model/StoragePrintDto.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/StoragePrintDto.java @@ -1,4 +1,4 @@ -package com.cim.idm.model; +package com.cim.idm.model.dto; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/TrackOutBoDto.java b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/TrackOutBoDto.java similarity index 75% rename from zi-wms-pda/src/main/java/com/cim/idm/model/TrackOutBoDto.java rename to zi-wms-pda/src/main/java/com/cim/idm/model/dto/TrackOutBoDto.java index 56f4b45..09eb743 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/model/TrackOutBoDto.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/model/dto/TrackOutBoDto.java @@ -1,5 +1,6 @@ -package com.cim.idm.model; +package com.cim.idm.model.dto; +import com.cim.idm.model.MaterialreceiveActDto; import lombok.Data; @Data diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/MaterialReceiveRequest.java b/zi-wms-pda/src/main/java/com/cim/idm/model/po/MaterialReceiveRequest.java similarity index 96% rename from zi-wms-pda/src/main/java/com/cim/idm/model/MaterialReceiveRequest.java rename to zi-wms-pda/src/main/java/com/cim/idm/model/po/MaterialReceiveRequest.java index 15dfbb1..658e08c 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/model/MaterialReceiveRequest.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/model/po/MaterialReceiveRequest.java @@ -1,4 +1,4 @@ -package com.cim.idm.model; +package com.cim.idm.model.po; import lombok.Data; diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/MaterialReceiveRequestDetail.java b/zi-wms-pda/src/main/java/com/cim/idm/model/po/MaterialReceiveRequestDetail.java similarity index 98% rename from zi-wms-pda/src/main/java/com/cim/idm/model/MaterialReceiveRequestDetail.java rename to zi-wms-pda/src/main/java/com/cim/idm/model/po/MaterialReceiveRequestDetail.java index cd39960..ef43cb8 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/model/MaterialReceiveRequestDetail.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/model/po/MaterialReceiveRequestDetail.java @@ -1,4 +1,4 @@ -package com.cim.idm.model; +package com.cim.idm.model.po; import lombok.Data; 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 c340f25..b727f28 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,9 +1,9 @@ package com.cim.idm.service; -import com.cim.idm.model.DeliveryDto; -import com.cim.idm.model.MaterialReceiveRequest; -import com.cim.idm.model.PageDto; -import com.cim.idm.model.MaterialReceiveRequestDetail; +import com.cim.idm.model.dto.DeliveryDto; +import com.cim.idm.model.po.MaterialReceiveRequest; +import com.cim.idm.model.dto.PageDto; +import com.cim.idm.model.po.MaterialReceiveRequestDetail; import com.github.pagehelper.PageInfo; import java.util.List; diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/BSLabelServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/BSLabelServiceImpl.java index f3251d4..7ed2ae3 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/BSLabelServiceImpl.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/BSLabelServiceImpl.java @@ -12,6 +12,8 @@ import com.cim.idm.framework.orm.info.KeyInfo; import com.cim.idm.framework.orm.service.CommonServiceDAO; import com.cim.idm.framework.util.time.TimeStampUtil; import com.cim.idm.model.*; +import com.cim.idm.model.bo.StorageObject; +import com.cim.idm.model.dto.StoragePrintDto; import com.cim.idm.mwmsextend.generic.util.CommonUtil; import com.cim.idm.wmsextend.generic.errorHandler.CustomException; import com.cim.idm.wmsextend.generic.util.ObjectUtil; 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 dac29d0..5737f1b 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 @@ -3,7 +3,12 @@ package com.cim.idm.service.Impl; import com.alibaba.fastjson.JSON; import com.cim.idm.constants.ReceiveTypeEnums; import com.cim.idm.dao.DeliveryDao; -import com.cim.idm.model.*; +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.MaterialReceiveRequest; +import com.cim.idm.model.po.MaterialReceiveRequestDetail; import com.cim.idm.service.IDeliveryService; import com.cim.idm.wmspackage.invoice.management.data.MaterialReceiveRequestKey; import com.github.pagehelper.PageInfo; diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/LabelServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/LabelServiceImpl.java index a718ac6..5d79165 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/LabelServiceImpl.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/LabelServiceImpl.java @@ -2,6 +2,7 @@ package com.cim.idm.service.Impl; import com.cim.idm.framework.data.EventInfo; import com.cim.idm.model.*; +import com.cim.idm.model.dto.StoragePrintDto; import com.cim.idm.service.LabelService; import com.cim.idm.utils.EventInfoUtil; import com.cim.idm.wmsextend.generic.errorHandler.CustomException; diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/LabelService.java b/zi-wms-pda/src/main/java/com/cim/idm/service/LabelService.java index b913d38..590aaac 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/LabelService.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/LabelService.java @@ -2,6 +2,7 @@ package com.cim.idm.service; import com.cim.idm.model.*; +import com.cim.idm.model.dto.StoragePrintDto; import com.cim.idm.wmsextend.generic.errorHandler.CustomException; /** 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 a2f0475..18728ea 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 @@ -24,7 +24,7 @@ - SELECT SITENAME, RECEIVEREQUESTNAME FROM MATERIALRECEIVEREQUEST WHERE SITENAME = #{dto.siteName} AND RECEIVEREQUESTTYPE IN @@ -130,7 +130,7 @@ ) TTT - SELECT SITENAME, RECEIVEREQUESTNAME, RECEIVEREQUESTTYPE, PURCHASEORDERGROUP, RECEIVEREQUESTSTATE, SUPPLIERNO, OEMSITENAME, OEMSITEINCHARGE, SYSTEMTYPE, LASTEVENTNAME, LASTEVENTTIMEKEY, LASTEVENTTIME, LASTEVENTUSER, LASTEVENTCOMMENT, ERPPONAME, SAVEREASON, RESPPERSON, RESPDEPART, SOLVETIME, PASSSTATE, WORKER, SDK_ID, @@ -142,7 +142,7 @@ AND RECEIVEREQUESTNAME = #{receiveRequestName} - SELECT SITENAME, RECEIVEREQUESTNAME, RECEIVEREQUESTTYPE, PURCHASEORDERGROUP, RECEIVEREQUESTSTATE, SUPPLIERNO, OEMSITENAME, OEMSITEINCHARGE, SYSTEMTYPE, LASTEVENTNAME, LASTEVENTTIMEKEY, LASTEVENTTIME, LASTEVENTUSER, LASTEVENTCOMMENT, ERPPONAME, SAVEREASON, RESPPERSON, RESPDEPART, SOLVETIME, PASSSTATE, WORKER, SDK_ID, @@ -154,7 +154,7 @@ AND DELIVERYNAME = #{receiveRequestName} - SELECT SITENAME, RECEIVEREQUESTNAME, RECEIVEREQUESTDETAILNAME, POCATEGORY, RECEIVEREQUESTDETAILTYPE, MATERIALSPECNAME, DESCRIPTION, REQUESTQUANTITY, RECEIVEDQUANTITY, ERPLOCATION, RETURNFLAG, FREEFLAG, RECEIVEREQUESTDETAILSTATE, HOLDSTATE, IQCFLAG, PLANDATE, CREATEUSER, CREATETIME, CHARGE, ERPFACTORY,