From f3f08353aeede5d05d068c83c5fcb451a5a365f7 Mon Sep 17 00:00:00 2001 From: yanyang Date: Tue, 7 Mar 2023 10:27:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E7=BB=84=E4=BF=A1=E6=81=AF=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WoPackagingBoxController.java | 2 +- .../WoPackagingBoxSubstrateController.java | 7 ++++++- .../packing/dto/WoPackagingBoxSubstrateDTO.java | 6 ++++++ .../mapper/WoPackagingBoxSubstrateMapper.java | 3 +++ .../service/WoPackagingBoxSubstrateServiceBiz.java | 3 +++ .../WoPackagingBoxSubstrateServiceBizImpl.java | 6 ++++++ .../mapper/WoPackagingBoxSubstrateMapper.xml | 14 ++++++++++++++ 7 files changed, 39 insertions(+), 2 deletions(-) diff --git a/ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxController.java b/ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxController.java index 43e9a48..5b3cbd0 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxController.java +++ b/ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxController.java @@ -155,7 +155,7 @@ public class WoPackagingBoxController { @GetMapping("boxList/{woSubstrateId}") @ApiOperation("查询模组id所在包装箱") - public List get(@PathVariable("woSubstrateId") String woSubstrateId){ + public List boxList(@PathVariable("woSubstrateId") String woSubstrateId){ return woPackagingBoxService.boxList(woSubstrateId); } diff --git a/ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxSubstrateController.java b/ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxSubstrateController.java index ac18e27..d9651f7 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxSubstrateController.java +++ b/ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxSubstrateController.java @@ -29,7 +29,6 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; -import org.omg.CORBA.PRIVATE_MEMBER; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -287,4 +286,10 @@ public class WoPackagingBoxSubstrateController { return new Result(); } + @GetMapping("substrateList/{woSubstrateId}") + @ApiOperation("模组信息查询") + public List substrateList(@PathVariable("woSubstrateId") String woSubstrateId){ + return woPackagingBoxSubstrateService.substrateList(woSubstrateId); + } + } \ No newline at end of file diff --git a/ym-packing/src/main/java/com/cnbm/packing/dto/WoPackagingBoxSubstrateDTO.java b/ym-packing/src/main/java/com/cnbm/packing/dto/WoPackagingBoxSubstrateDTO.java index 5c9e7f7..76ad776 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/dto/WoPackagingBoxSubstrateDTO.java +++ b/ym-packing/src/main/java/com/cnbm/packing/dto/WoPackagingBoxSubstrateDTO.java @@ -173,4 +173,10 @@ public class WoPackagingBoxSubstrateDTO implements Serializable { @ApiModelProperty(value = "真实PMPP") private Float actualPmpp; + @ApiModelProperty(value = "包装箱创建时间") + private LocalDateTime boxCreateTime; + + @ApiModelProperty(value = "打印时间（最近一次打印时间）") + private LocalDateTime printTime; + } \ No newline at end of file diff --git a/ym-packing/src/main/java/com/cnbm/packing/mapper/WoPackagingBoxSubstrateMapper.java b/ym-packing/src/main/java/com/cnbm/packing/mapper/WoPackagingBoxSubstrateMapper.java index 7e73412..f8241ac 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/mapper/WoPackagingBoxSubstrateMapper.java +++ b/ym-packing/src/main/java/com/cnbm/packing/mapper/WoPackagingBoxSubstrateMapper.java @@ -1,5 +1,6 @@ package com.cnbm.packing.mapper; import com.cnbm.packing.dto.PowerReportDTO; +import com.cnbm.packing.dto.WoPackagingBoxSubstrateDTO; import com.cnbm.packing.param.PowerReportQueryParam; import org.apache.ibatis.annotations.Param; @@ -25,4 +26,6 @@ public interface WoPackagingBoxSubstrateMapper extends BaseDao powerReport(@Param("queryParam") PowerReportQueryParam queryParam); List orderNameList(); + + List substrateList(@Param("woSubstrateId") String woSubstrateId); } diff --git a/ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxSubstrateServiceBiz.java b/ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxSubstrateServiceBiz.java index a51a80a..34db86f 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxSubstrateServiceBiz.java +++ b/ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxSubstrateServiceBiz.java @@ -6,6 +6,7 @@ import com.cnbm.packing.dto.ChangePackingBoxDTO; import com.cnbm.packing.dto.WoPackagingBoxSubstrateDTO; import com.cnbm.packing.entity.WoPackagingBoxSubstrate; +import java.util.List; import java.util.Map; /** @@ -38,6 +39,8 @@ public interface WoPackagingBoxSubstrateServiceBiz extends CrudService substrateList (String woSubstrateId); + int updatePackagingBoxIdAndSlotByWoSubstrateId(String packagingBoxId,Integer slot,String woSubstrateId); } \ No newline at end of file diff --git a/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxSubstrateServiceBizImpl.java b/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxSubstrateServiceBizImpl.java index 6a3a569..2295eb7 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxSubstrateServiceBizImpl.java +++ b/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxSubstrateServiceBizImpl.java @@ -24,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; import java.util.Arrays; +import java.util.List; import java.util.Map; /** @@ -199,6 +200,11 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl substrateList(String woSubstrateId) { + return mapper.substrateList(woSubstrateId); + } + @Override public WoPackagingBoxSubstrate getBySubId(String subId) { return mapper.getOneByWoSubstrateId(subId); diff --git a/ym-packing/src/main/resources/mapper/WoPackagingBoxSubstrateMapper.xml b/ym-packing/src/main/resources/mapper/WoPackagingBoxSubstrateMapper.xml index 0f16436..aa8eb5c 100644 --- a/ym-packing/src/main/resources/mapper/WoPackagingBoxSubstrateMapper.xml +++ b/ym-packing/src/main/resources/mapper/WoPackagingBoxSubstrateMapper.xml @@ -118,5 +118,19 @@ group by twpbs.ORDER_NAME + +