From bf0d6108a1f37871d4b5bd9968a504fdc570cd34 Mon Sep 17 00:00:00 2001 From: yanyang Date: Mon, 6 Mar 2023 11:50:59 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cnbm/admin/utils/BaseSupportUtils.java | 2 +- .../ChangePackagingBoxHistoryController.java | 5 +- .../controller/PrintModelController.java | 3 +- .../controller/WoPackagingBoxController.java | 20 ++++ .../WoPackagingBoxSubstrateController.java | 3 +- .../entity/WoPackagingBoxSubstrate.java | 9 +- .../excel/ChangePackagingBoxHistoryExcel.java | 23 +--- .../excel/WoPackagingBoxSubstrateExcel.java | 102 ++---------------- .../service/WoPackagingBoxServiceBiz.java | 3 + .../impl/PrintModelServiceBizImpl.java | 4 + .../impl/WoPackagingBoxServiceBizImpl.java | 15 +++ ...WoPackagingBoxSubstrateServiceBizImpl.java | 3 - 12 files changed, 63 insertions(+), 129 deletions(-) diff --git a/ym-admin/src/main/java/com/cnbm/admin/utils/BaseSupportUtils.java b/ym-admin/src/main/java/com/cnbm/admin/utils/BaseSupportUtils.java index 4f86c50..d9ecd4e 100644 --- a/ym-admin/src/main/java/com/cnbm/admin/utils/BaseSupportUtils.java +++ b/ym-admin/src/main/java/com/cnbm/admin/utils/BaseSupportUtils.java @@ -58,7 +58,7 @@ public abstract class BaseSupportUtils { */ public static T setCommonField(T t, String... ignoreProperties) { CommonField commonField = CommonField.builder() - .enabled(WhetherEnum.YES.getValue()) +// .enabled(WhetherEnum.YES.getValue()) .valid(WhetherEnum.YES.getValue()) .createTime(LocalDateTime.now()) .creatorId(getLoginUser().getId()) diff --git a/ym-packing/src/main/java/com/cnbm/packing/controller/ChangePackagingBoxHistoryController.java b/ym-packing/src/main/java/com/cnbm/packing/controller/ChangePackagingBoxHistoryController.java index 95380d7..2c07411 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/controller/ChangePackagingBoxHistoryController.java +++ b/ym-packing/src/main/java/com/cnbm/packing/controller/ChangePackagingBoxHistoryController.java @@ -118,8 +118,9 @@ public class ChangePackagingBoxHistoryController { @PreAuthorize("@ex.hasAuthority('packing:changePackagingBoxHistory:export')") public void export(@ApiIgnore @RequestParam Map params, HttpServletResponse response) throws Exception { List list = changePackagingBoxHistoryService.list(params); - - ExcelUtils.exportExcelToTarget(response, "包装箱模组操作记录", list, ChangePackagingBoxHistoryExcel.class); + if(list.size()>0) { + ExcelUtils.exportExcelToTarget(response, "包装箱模组操作记录", list, ChangePackagingBoxHistoryExcel.class); + } } } \ No newline at end of file diff --git a/ym-packing/src/main/java/com/cnbm/packing/controller/PrintModelController.java b/ym-packing/src/main/java/com/cnbm/packing/controller/PrintModelController.java index 3d2c220..97782ea 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/controller/PrintModelController.java +++ b/ym-packing/src/main/java/com/cnbm/packing/controller/PrintModelController.java @@ -49,7 +49,8 @@ public class PrintModelController { @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataTypeClass=String.class), @ApiImplicitParam(name = "name", value = "标签名称", paramType = "query", dataTypeClass = String.class), @ApiImplicitParam(name = "type", value = "类型，0：模组标签，1：等级标签", paramType = "query", dataTypeClass = Integer.class), - @ApiImplicitParam(name = "lineBody", value = "线体，1=F ; 2=S", paramType = "query", dataTypeClass = Integer.class) + @ApiImplicitParam(name = "lineBody", value = "线体，1=F ; 2=S", paramType = "query", dataTypeClass = Integer.class), + @ApiImplicitParam(name = "enabled", value = "启用状态:0 、停用，1、启用", paramType = "query", dataTypeClass = Integer.class) }) @PreAuthorize("@ex.hasAuthority('packing:printModel:page')") public Result> page(@ApiIgnore @RequestParam Map params){ 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 a9f330e..5be0225 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 @@ -12,7 +12,9 @@ import com.cnbm.common.validator.group.DefaultGroup; import com.cnbm.common.validator.group.UpdateGroup; import com.cnbm.packing.dto.IdVo; import com.cnbm.packing.dto.WoPackagingBoxDTO; +import com.cnbm.packing.entity.WoPackagingBoxSubstrate; import com.cnbm.packing.excel.WoPackagingBoxExcel; +import com.cnbm.packing.excel.WoPackagingBoxSubstrateExcel; import com.cnbm.packing.service.WoPackagingBoxServiceBiz; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -132,4 +134,22 @@ public class WoPackagingBoxController { return new Result().ok(data); } + @GetMapping("exportSubstrateList") + @ApiOperation("箱单明细导出") + @LogOperation("箱单明细导出") + @ApiImplicitParams({ + @ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataTypeClass = LocalDateTime.class), + @ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataTypeClass = LocalDateTime.class), + @ApiImplicitParam(name = "boxNo", value = "boxid", paramType = "query", dataTypeClass = String.class), + @ApiImplicitParam(name = "lineBody", value = "线体", paramType = "query", dataTypeClass = Integer.class), + @ApiImplicitParam(name = "printStatus", value = "打印状态：0、未打印，1、已打印", paramType = "query", dataTypeClass = Integer.class), + @ApiImplicitParam(name = "model", value = "模式，1-手动模式；2-自动模式", paramType = "query", dataTypeClass = Integer.class) + }) + public void exportSubstrateList(@ApiIgnore @RequestParam Map params, HttpServletResponse response) throws Exception { + List list = woPackagingBoxService.substrateList(params); + if (list.size() > 0) { + ExcelUtils.exportExcelToTarget(response, "箱单明细", list, WoPackagingBoxSubstrateExcel.class); + } + } + } \ No newline at end of file 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 add9f87..19364e4 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 @@ -144,10 +144,9 @@ public class WoPackagingBoxSubstrateController { @LogOperation("合箱") public Result insertSubstrate(@RequestBody ChangePackingBoxDTO dto){ - String woSubstrateId = dto.getWoSubstrateId(); //验证模组是否存在 QueryWrapper substrateQueryWrapper1 = new QueryWrapper<>(); - substrateQueryWrapper1.eq(StringUtils.isNotBlank(woSubstrateId), WoPackagingBoxSubstrate.WO_SUBSTRATE_ID, woSubstrateId); + substrateQueryWrapper1.eq(WoPackagingBoxSubstrate.WO_SUBSTRATE_ID, dto.getWoSubstrateId()); if(woPackagingBoxSubstrateMapper.selectCount(substrateQueryWrapper1 )== 0){ return new Result().error(1,"该模组不存在,请重新输入"); } diff --git a/ym-packing/src/main/java/com/cnbm/packing/entity/WoPackagingBoxSubstrate.java b/ym-packing/src/main/java/com/cnbm/packing/entity/WoPackagingBoxSubstrate.java index 8543de4..25bc8f9 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/entity/WoPackagingBoxSubstrate.java +++ b/ym-packing/src/main/java/com/cnbm/packing/entity/WoPackagingBoxSubstrate.java @@ -14,7 +14,7 @@ import lombok.Data; *

* * @author codeGenerator - * @since 2023-02-21 + * @since 2023-03-03 */ @Data @TableName("t_wo_packaging_box_substrate") @@ -80,10 +80,6 @@ public class WoPackagingBoxSubstrate implements Serializable { @ApiModelProperty("订单名") private String orderName; - @ApiModelProperty("真实PMPP") - private Float actualPmpp; - - private Long binclassFl1; private Long binclassFl2; @@ -144,6 +140,9 @@ public class WoPackagingBoxSubstrate implements Serializable { private Float uocFl2; + @ApiModelProperty("真实PMPP") + private Float actualPmpp; + public static final String ID = "ID"; diff --git a/ym-packing/src/main/java/com/cnbm/packing/excel/ChangePackagingBoxHistoryExcel.java b/ym-packing/src/main/java/com/cnbm/packing/excel/ChangePackagingBoxHistoryExcel.java index abe8f60..fc10100 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/excel/ChangePackagingBoxHistoryExcel.java +++ b/ym-packing/src/main/java/com/cnbm/packing/excel/ChangePackagingBoxHistoryExcel.java @@ -16,41 +16,20 @@ import java.util.Date; */ @Data public class ChangePackagingBoxHistoryExcel { - @Excel(name = "ID") - private Long id; + @Excel(name = "基板ID") private String substrateId; @Excel(name = "源包装箱") private String sourceBoxNo; @Excel(name = "源位置") private Integer sourceSlot; - @Excel(name = "离开时间") - private LocalDateTime leaveTime; @Excel(name = "目的包装箱") private String targetBoxNo; @Excel(name = "目的位置") private Integer targetSlot; - @Excel(name = "进入时间") - private LocalDateTime inputTime; - @Excel(name = "等级") - private String grade; @Excel(name = "操作类型") private Integer type; - @Excel(name = "删除标志，是否有效:1 可用 0不可用") - private Integer valid; - @Excel(name = "创建人") - private Long creatorId; - @Excel(name = "创建人姓名") - private String creatorName; @Excel(name = "操作时间") private LocalDateTime createTime; - @Excel(name = "更新人") - private Long updaterId; - @Excel(name = "更新人姓名") - private String updaterName; - @Excel(name = "更新时间") - private LocalDateTime updateTime; - @Excel(name = "版本号") - private Integer version; } \ No newline at end of file diff --git a/ym-packing/src/main/java/com/cnbm/packing/excel/WoPackagingBoxSubstrateExcel.java b/ym-packing/src/main/java/com/cnbm/packing/excel/WoPackagingBoxSubstrateExcel.java index 40bc9d6..0e8dcb4 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/excel/WoPackagingBoxSubstrateExcel.java +++ b/ym-packing/src/main/java/com/cnbm/packing/excel/WoPackagingBoxSubstrateExcel.java @@ -16,106 +16,22 @@ import java.util.Date; */ @Data public class WoPackagingBoxSubstrateExcel { - @Excel(name = "ID") - private Long id; - @Excel(name = "Box_ID") - private String packagingBoxId; + + @Excel(name = "产出时间") + private LocalDateTime createTime; @Excel(name = "substrate ID") private String woSubstrateId; - @Excel(name = "创建人") - private Long creatorId; - @Excel(name = "创建人姓名") - private String creatorName; - @Excel(name = "创建时间") - private LocalDateTime createTime; - @Excel(name = "更新人") - private Long updaterId; - @Excel(name = "更新人姓名") - private String updaterName; - @Excel(name = "更新时间") - private LocalDateTime updateTime; - @Excel(name = "版本号") - private Integer version; + @Excel(name = "Box_ID") + private String packagingBoxId; + @Excel(name = "Pmpp") + private Float pmpp; @Excel(name = "BOX_SLOT") private Integer slot; - @Excel(name = "进入时间") - private LocalDateTime inputTime; - @Excel(name = "删除标志，是否有效:1 可用 0不可用") - private Integer valid; - @Excel(name = "SAP MATERIAL,从t_wo_power_level 对应过来的") - private String sapMaterial; @Excel(name = "线体") private Integer lineBody; - @Excel(name = "功率等级") - private String powerLevel; - @Excel(name = "") - private LocalDateTime lastUpdateTime; - @Excel(name = "补偿后的功率，pmpp") - private Float pmpp; + @Excel(name = "实际功率") + private Float actualPmpp; @Excel(name = "订单") private String orderName; - @Excel(name = "") - private Long binclassFl1; - @Excel(name = "") - private Long binclassFl2; - @Excel(name = "") - private Float etaFl1; - @Excel(name = "") - private Float etaFl2; - @Excel(name = "") - private Float ffFl1; - @Excel(name = "") - private Float ffFl2; - @Excel(name = "") - private Float imppFl1; - @Excel(name = "") - private Float imppFl2; - @Excel(name = "") - private Float insolflashcontrolFl1; - @Excel(name = "") - private Float insolflashcontrolFl2; - @Excel(name = "") - private Float insolmppFl1; - @Excel(name = "") - private Float insolmppFl2; - @Excel(name = "") - private Float insolvocFl1; - @Excel(name = "") - private Float insolvocFl2; - @Excel(name = "") - private Float insolFl1; - @Excel(name = "") - private Float insolFl2; - @Excel(name = "") - private Float iscFl1; - @Excel(name = "") - private Float iscFl2; - @Excel(name = "") - private LocalDateTime measTimeFl1; - @Excel(name = "") - private LocalDateTime measTimeFl2; - @Excel(name = "") - private Float pmppFl1; - @Excel(name = "") - private Float pmppFl2; - @Excel(name = "") - private Float tcellFl1; - @Excel(name = "") - private Float tcellFl2; - @Excel(name = "") - private Float tmonicellFl1; - @Excel(name = "") - private Float tmonicellFl2; - @Excel(name = "") - private Float umppFl1; - @Excel(name = "") - private Float umppFl2; - @Excel(name = "") - private Float uocFl1; - @Excel(name = "") - private Float uocFl2; - @Excel(name = "真实PMPP") - private Float actualPmpp; - } \ No newline at end of file diff --git a/ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxServiceBiz.java b/ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxServiceBiz.java index 8db6c17..0d24bdf 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxServiceBiz.java +++ b/ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxServiceBiz.java @@ -5,6 +5,7 @@ import com.cnbm.common.service.CrudService; import com.cnbm.packing.dto.IdVo; import com.cnbm.packing.dto.WoPackagingBoxDTO; import com.cnbm.packing.entity.WoPackagingBox; +import com.cnbm.packing.entity.WoPackagingBoxSubstrate; import java.util.List; import java.util.Map; @@ -31,6 +32,8 @@ public interface WoPackagingBoxServiceBiz extends CrudService substrateList (Map params); + int updateIsArrivedByBoxNo(Integer isArrived, String boxNo); } \ No newline at end of file diff --git a/ym-packing/src/main/java/com/cnbm/packing/service/impl/PrintModelServiceBizImpl.java b/ym-packing/src/main/java/com/cnbm/packing/service/impl/PrintModelServiceBizImpl.java index d5f8344..9144c7d 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/service/impl/PrintModelServiceBizImpl.java +++ b/ym-packing/src/main/java/com/cnbm/packing/service/impl/PrintModelServiceBizImpl.java @@ -47,6 +47,10 @@ public class PrintModelServiceBizImpl extends CrudServiceImpl substrateList(Map params) { + QueryWrapper boxQueryWrapper = getWrapper(params); + List boxList = mapper.selectList(boxQueryWrapper); + List substrateList = new ArrayList<>(); + for(WoPackagingBox box: boxList){ + QueryWrapper substrateQueryWrapper = new QueryWrapper<>(); + substrateQueryWrapper.eq(StringUtils.isNotBlank(box.getBoxNo()), WoPackagingBoxSubstrate.PACKAGING_BOX_ID, box.getBoxNo()); + List woPackagingBoxSubstrateList = substrateMapper.selectList(substrateQueryWrapper); + substrateList.addAll(woPackagingBoxSubstrateList); + } + return substrateList; + } + @Override public int updateIsArrivedByBoxNo(Integer isArrived, String boxNo) { return mapper.updateIsArrivedByBoxNo(isArrived,boxNo); 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 9be8657..c753d62 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 @@ -14,17 +14,14 @@ import com.cnbm.packing.dto.ChangePackingBoxDTO; import com.cnbm.packing.dto.WoPackagingBoxSubstrateDTO; import com.cnbm.packing.entity.ChangePackagingBoxHistory; import com.cnbm.packing.entity.WoPackagingBoxSubstrate; -import com.cnbm.packing.mapper.WoPackagingBoxMapper; import com.cnbm.packing.mapper.WoPackagingBoxSubstrateMapper; import com.cnbm.packing.service.ChangePackagingBoxHistoryServiceBiz; import com.cnbm.packing.service.WoPackagingBoxSubstrateServiceBiz; import org.apache.commons.lang3.StringUtils; -import org.omg.CORBA.PRIVATE_MEMBER; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; import java.time.LocalDateTime; import java.util.Arrays; import java.util.Map; From 4fd5498f1ec41d4a3c5aeda2fa3752227f6f60b7 Mon Sep 17 00:00:00 2001 From: yanyang Date: Mon, 6 Mar 2023 17:03:01 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=A8=A1=E7=BB=84=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=8C=85=E8=A3=85=E7=AE=B1=20=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WoPackagingBoxController.java | 7 +++++ .../excel/WoPackagingBoxSubstrateExcel.java | 18 +++++++----- .../service/WoPackagingBoxServiceBiz.java | 2 ++ ...angePackagingBoxHistoryServiceBizImpl.java | 13 +++++---- .../impl/WoPackagingBoxServiceBizImpl.java | 29 +++++++++++++++---- ...WoPackagingPrintHistoryServiceBizImpl.java | 13 ++++++--- 6 files changed, 61 insertions(+), 21 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 5be0225..b1fb726 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 @@ -12,6 +12,7 @@ import com.cnbm.common.validator.group.DefaultGroup; import com.cnbm.common.validator.group.UpdateGroup; import com.cnbm.packing.dto.IdVo; import com.cnbm.packing.dto.WoPackagingBoxDTO; +import com.cnbm.packing.entity.WoPackagingBox; import com.cnbm.packing.entity.WoPackagingBoxSubstrate; import com.cnbm.packing.excel.WoPackagingBoxExcel; import com.cnbm.packing.excel.WoPackagingBoxSubstrateExcel; @@ -152,4 +153,10 @@ public class WoPackagingBoxController { } } + @GetMapping("boxList/{woSubstrateId}") + @ApiOperation("查询模组id所在包装箱") + public List get(@PathVariable("woSubstrateId") String woSubstrateId){ + return woPackagingBoxService.boxList(woSubstrateId); + } + } \ No newline at end of file diff --git a/ym-packing/src/main/java/com/cnbm/packing/excel/WoPackagingBoxSubstrateExcel.java b/ym-packing/src/main/java/com/cnbm/packing/excel/WoPackagingBoxSubstrateExcel.java index 0e8dcb4..f00db57 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/excel/WoPackagingBoxSubstrateExcel.java +++ b/ym-packing/src/main/java/com/cnbm/packing/excel/WoPackagingBoxSubstrateExcel.java @@ -17,21 +17,25 @@ import java.util.Date; @Data public class WoPackagingBoxSubstrateExcel { - @Excel(name = "产出时间") + @Excel(name = "创建时间") private LocalDateTime createTime; - @Excel(name = "substrate ID") + @Excel(name = "模组ID") private String woSubstrateId; @Excel(name = "Box_ID") private String packagingBoxId; - @Excel(name = "Pmpp") - private Float pmpp; @Excel(name = "BOX_SLOT") private Integer slot; - @Excel(name = "线体") - private Integer lineBody; - @Excel(name = "实际功率") + @Excel(name = "档位功率") + private String powerLevel; + @Excel(name = "补偿功率") + private Float pmpp; + @Excel(name = "实测功率") private Float actualPmpp; @Excel(name = "订单") private String orderName; + @Excel(name = "线体") + private Integer lineBody; + @Excel(name = "SAP物料号") + private String sapMaterial; } \ No newline at end of file diff --git a/ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxServiceBiz.java b/ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxServiceBiz.java index 09c46d7..a779e5b 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxServiceBiz.java +++ b/ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxServiceBiz.java @@ -38,6 +38,8 @@ public interface WoPackagingBoxServiceBiz extends CrudService substrateList (Map params); + List boxList (String woSubstrateId); + int updateIsArrivedByBoxNo(Integer isArrived, String boxNo); diff --git a/ym-packing/src/main/java/com/cnbm/packing/service/impl/ChangePackagingBoxHistoryServiceBizImpl.java b/ym-packing/src/main/java/com/cnbm/packing/service/impl/ChangePackagingBoxHistoryServiceBizImpl.java index b5c7f0c..94aaa4e 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/service/impl/ChangePackagingBoxHistoryServiceBizImpl.java +++ b/ym-packing/src/main/java/com/cnbm/packing/service/impl/ChangePackagingBoxHistoryServiceBizImpl.java @@ -8,7 +8,6 @@ import com.cnbm.common.page.PageData; import com.cnbm.common.service.impl.CrudServiceImpl; import com.cnbm.common.utils.ConvertUtils; import com.cnbm.packing.dto.ChangePackagingBoxHistoryDTO; -import com.cnbm.packing.dto.ChangePackagingBoxHistoryDTO; import com.cnbm.packing.entity.ChangePackagingBoxHistory; import com.cnbm.packing.mapper.ChangePackagingBoxHistoryMapper; import com.cnbm.packing.service.ChangePackagingBoxHistoryServiceBiz; @@ -17,6 +16,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -35,12 +35,15 @@ public class ChangePackagingBoxHistoryServiceBizImpl extends CrudServiceImpl getWrapper(Map params){ - LocalDateTime startTime = (LocalDateTime) params.get("startTime"); - LocalDateTime endTime = (LocalDateTime) params.get("endTime"); QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.between(startTime!=null && endTime!=null,ChangePackagingBoxHistory.CREATE_TIME, startTime, endTime); - wrapper.between(startTime!=null && endTime!=null,ChangePackagingBoxHistory.CREATE_TIME, startTime, endTime); + + DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + if(params.get("startTime")!=null && params.get("endTime")!=null){ + LocalDateTime startTime = LocalDateTime.parse(params.get("startTime").toString(),df); + LocalDateTime endTime = LocalDateTime.parse(params.get("endTime").toString(),df); + wrapper.between(startTime!=null && endTime!=null,ChangePackagingBoxHistory.CREATE_TIME, startTime, endTime); + } if(params.get("type")!=null) { Integer type = Integer.parseInt( params.get("type").toString()); wrapper.eq(ObjectUtils.isNotNull(type), ChangePackagingBoxHistory.TYPE, type); diff --git a/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java b/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java index 4bb2215..8c614c2 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java +++ b/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java @@ -22,6 +22,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -45,12 +46,15 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl getWrapper(Map params){ - LocalDateTime startTime = (LocalDateTime) params.get("startTime"); - LocalDateTime endTime = (LocalDateTime) params.get("endTime"); - String boxNo = (String) params.get("boxNo"); - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.between(startTime!=null && endTime!=null,WoPackagingBox.CREATE_TIME, startTime, endTime); + + DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + if(params.get("startTime")!=null && params.get("endTime")!=null){ + LocalDateTime startTime = LocalDateTime.parse(params.get("startTime").toString(),df); + LocalDateTime endTime = LocalDateTime.parse(params.get("endTime").toString(),df); + wrapper.between(startTime!=null && endTime!=null, WoPackagingBox.CREATE_TIME, startTime, endTime); + } + String boxNo = (String) params.get("boxNo"); wrapper.like(StringUtils.isNotBlank(boxNo), WoPackagingBox.BOX_NO, boxNo); if(params.get("lineBody")!=null) { Integer lineBody = Integer.parseInt(params.get("lineBody").toString()); @@ -141,6 +145,21 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl boxList(String woSubstrateId) { + QueryWrapper substrateQueryWrapper = new QueryWrapper<>(); + substrateQueryWrapper.eq(StringUtils.isNotBlank(woSubstrateId), WoPackagingBoxSubstrate.WO_SUBSTRATE_ID, woSubstrateId); + List substrateList = substrateMapper.selectList(substrateQueryWrapper); + List boxList = new ArrayList<>(); + for(WoPackagingBoxSubstrate substrate: substrateList){ + QueryWrapper boxQueryWrapper = new QueryWrapper<>(); + boxQueryWrapper.eq(StringUtils.isNotBlank(substrate.getPackagingBoxId()), WoPackagingBox.BOX_NO, substrate.getPackagingBoxId()); + List woPackagingBoxList = mapper.selectList(boxQueryWrapper); + boxList.addAll(woPackagingBoxList); + } + return boxList; + } + @Override public int updateIsArrivedByBoxNo(Integer isArrived, String boxNo) { return mapper.updateIsArrivedByBoxNo(isArrived,boxNo); diff --git a/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingPrintHistoryServiceBizImpl.java b/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingPrintHistoryServiceBizImpl.java index 6aecb00..99096cb 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingPrintHistoryServiceBizImpl.java +++ b/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingPrintHistoryServiceBizImpl.java @@ -19,6 +19,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -40,12 +41,16 @@ public class WoPackagingPrintHistoryServiceBizImpl extends CrudServiceImpl getWrapper(Map params){ - LocalDateTime startTime = (LocalDateTime) params.get("startTime"); - LocalDateTime endTime = (LocalDateTime) params.get("endTime"); - String boxNo = (String) params.get("boxNo"); QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.between(startTime!=null && endTime!=null, WoPackagingPrintHistory.PRINT_TIME, startTime, endTime); + + DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + if(params.get("startTime")!=null && params.get("endTime")!=null){ + LocalDateTime startTime = LocalDateTime.parse(params.get("startTime").toString(),df); + LocalDateTime endTime = LocalDateTime.parse(params.get("endTime").toString(),df); + wrapper.between(startTime!=null && endTime!=null, WoPackagingPrintHistory.PRINT_TIME, startTime, endTime); + } + String boxNo = (String) params.get("boxNo"); wrapper.like(StringUtils.isNotBlank(boxNo), WoPackagingPrintHistory.BOX_NO, boxNo); return wrapper; From ddc2343842dc02a9d1d5b800956f2014150cad2f Mon Sep 17 00:00:00 2001 From: yanyang Date: Mon, 6 Mar 2023 21:02:54 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E8=A3=85=E7=AE=B1?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E9=BB=98=E8=AE=A4=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=BD=93=E5=A4=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ChangePackagingBoxHistoryController.java | 3 ++- .../controller/WoPackagingBoxController.java | 9 +++++++ .../WoPackagingBoxSubstrateController.java | 10 +++++++ .../ChangePackagingBoxHistoryServiceBiz.java | 2 ++ .../service/WoPackagingBoxServiceBiz.java | 2 ++ .../WoPackagingBoxSubstrateServiceBiz.java | 2 ++ ...angePackagingBoxHistoryServiceBizImpl.java | 15 +++++++++-- .../impl/WoPackagingBoxServiceBizImpl.java | 26 ++++++++++++++++++- ...WoPackagingBoxSubstrateServiceBizImpl.java | 19 ++++++++++++-- .../ChangePackagingBoxHistoryMapper.xml | 2 +- 10 files changed, 83 insertions(+), 7 deletions(-) diff --git a/ym-packing/src/main/java/com/cnbm/packing/controller/ChangePackagingBoxHistoryController.java b/ym-packing/src/main/java/com/cnbm/packing/controller/ChangePackagingBoxHistoryController.java index 2c07411..1ad04f4 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/controller/ChangePackagingBoxHistoryController.java +++ b/ym-packing/src/main/java/com/cnbm/packing/controller/ChangePackagingBoxHistoryController.java @@ -11,6 +11,7 @@ import com.cnbm.common.validator.group.AddGroup; import com.cnbm.common.validator.group.DefaultGroup; import com.cnbm.common.validator.group.UpdateGroup; import com.cnbm.packing.dto.ChangePackagingBoxHistoryDTO; +import com.cnbm.packing.entity.ChangePackagingBoxHistory; import com.cnbm.packing.excel.ChangePackagingBoxHistoryExcel; import com.cnbm.packing.service.ChangePackagingBoxHistoryServiceBiz; import io.swagger.annotations.Api; @@ -117,7 +118,7 @@ public class ChangePackagingBoxHistoryController { }) @PreAuthorize("@ex.hasAuthority('packing:changePackagingBoxHistory:export')") public void export(@ApiIgnore @RequestParam Map params, HttpServletResponse response) throws Exception { - List list = changePackagingBoxHistoryService.list(params); + List list = changePackagingBoxHistoryService.historyList(params); if(list.size()>0) { ExcelUtils.exportExcelToTarget(response, "包装箱模组操作记录", list, ChangePackagingBoxHistoryExcel.class); } 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 b1fb726..43e9a48 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 @@ -159,4 +159,13 @@ public class WoPackagingBoxController { return woPackagingBoxService.boxList(woSubstrateId); } + @PostMapping("insertSubstrateManual") + @ApiOperation("手动新增包装箱") + @LogOperation("手动新增包装箱") + public IdVo insertSubstrateManual(@RequestBody WoPackagingBoxDTO dto){ + + return woPackagingBoxService.insertSubstrateManual(dto); + + } + } \ No newline at end of file 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 50be926..ac18e27 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 @@ -277,4 +277,14 @@ public class WoPackagingBoxSubstrateController { return new Result(); } + @PostMapping("updateSubstrateManual") + @ApiOperation("手动装箱编辑") + @LogOperation("手动装箱编辑") + public Result updateSubstrateManual(@RequestBody ChangePackingBoxDTO[] dtos){ + + woPackagingBoxSubstrateService.updateSubstrateManual(dtos); + + return new Result(); + } + } \ No newline at end of file diff --git a/ym-packing/src/main/java/com/cnbm/packing/service/ChangePackagingBoxHistoryServiceBiz.java b/ym-packing/src/main/java/com/cnbm/packing/service/ChangePackagingBoxHistoryServiceBiz.java index 6d4ba60..eb058bd 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/service/ChangePackagingBoxHistoryServiceBiz.java +++ b/ym-packing/src/main/java/com/cnbm/packing/service/ChangePackagingBoxHistoryServiceBiz.java @@ -28,4 +28,6 @@ public interface ChangePackagingBoxHistoryServiceBiz extends CrudService list(Map params); + List historyList(Map params); + } \ No newline at end of file diff --git a/ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxServiceBiz.java b/ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxServiceBiz.java index a779e5b..3d43e33 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxServiceBiz.java +++ b/ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxServiceBiz.java @@ -40,6 +40,8 @@ public interface WoPackagingBoxServiceBiz extends CrudService boxList (String woSubstrateId); + IdVo insertSubstrateManual(WoPackagingBoxDTO dto); + int updateIsArrivedByBoxNo(Integer isArrived, String boxNo); 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 bea2ab2..a51a80a 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 @@ -34,6 +34,8 @@ public interface WoPackagingBoxSubstrateServiceBiz extends CrudService page (Map params){ IPage page = baseDao.selectPage( - getPage(params, ChangePackagingBoxHistory.CREATE_TIME, true), - getWrapper(params) + getPage(params, ChangePackagingBoxHistory.CREATE_TIME, true), + getWrapper(params) ); return getPageData(page, ChangePackagingBoxHistoryDTO.class); } @@ -97,4 +100,12 @@ public class ChangePackagingBoxHistoryServiceBizImpl extends CrudServiceImpl historyList(Map params) { + QueryWrapper wrapper = getWrapper(params); + List historyList = mapper.selectList(wrapper); + return historyList; + } + } \ No newline at end of file diff --git a/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java b/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java index 8c614c2..6ec63b2 100644 --- a/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java +++ b/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java @@ -16,6 +16,7 @@ import com.cnbm.packing.mapper.WoPackagingBoxMapper; import com.cnbm.packing.mapper.WoPackagingBoxSubstrateMapper; import com.cnbm.packing.param.PowerReportQueryParam; import com.cnbm.packing.service.WoPackagingBoxServiceBiz; +import com.cnbm.packing.service.WoPackagingBoxSubstrateServiceBiz; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -41,6 +42,8 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl boxList = new ArrayList<>(); for(WoPackagingBoxSubstrate substrate: substrateList){ QueryWrapper boxQueryWrapper = new QueryWrapper<>(); - boxQueryWrapper.eq(StringUtils.isNotBlank(substrate.getPackagingBoxId()), WoPackagingBox.BOX_NO, substrate.getPackagingBoxId()); + boxQueryWrapper.like(StringUtils.isNotBlank(substrate.getPackagingBoxId()), WoPackagingBox.BOX_NO, substrate.getPackagingBoxId()); List woPackagingBoxList = mapper.selectList(boxQueryWrapper); boxList.addAll(woPackagingBoxList); } return boxList; } + @Override + @Transactional(rollbackFor = Exception.class) + public IdVo insertSubstrateManual(WoPackagingBoxDTO dto) { + //新增包装箱 + WoPackagingBox box = ConvertUtils.sourceToTarget(dto, WoPackagingBox.class); + BaseSupportUtils.setCommonField(box); + insert(box); + //新增模组 + List substrateList = dto.getSubstrateList(); + for(WoPackagingBoxSubstrate substrate : substrateList){ + substrate.setPackagingBoxId(box.getBoxNo()); + substrate.setPowerLevel(box.getPowerLevel()); + BaseSupportUtils.setCommonField(substrate); + woPackagingBoxSubstrateServiceBiz.insert(substrate); + } + return IdVo.builder().id(box.getId()).build(); + } + @Override public int updateIsArrivedByBoxNo(Integer isArrived, String boxNo) { return mapper.updateIsArrivedByBoxNo(isArrived,boxNo); 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 20330e9..6a3a569 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 @@ -163,8 +163,12 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(dto.getWoSubstrateId()), WoPackagingBoxSubstrate.WO_SUBSTRATE_ID, dto.getWoSubstrateId()); +// QueryWrapper wrapper = new QueryWrapper<>(); +// wrapper.eq(StringUtils.isNotBlank(dto.getWoSubstrateId()), WoPackagingBoxSubstrate.WO_SUBSTRATE_ID, dto.getWoSubstrateId()); + WoPackagingBoxSubstrate entity = ConvertUtils.sourceToTarget(dto, WoPackagingBoxSubstrate.class); + BaseSupportUtils.setCommonField(entity); + insert(entity); + /* if (mapper.selectCount(wrapper) > 0 && StringUtils.isNotBlank(dto.getWoSubstrateId())) { WoPackagingBoxSubstrate substrate = mapper.selectList(wrapper).get(0); substrate.setPackagingBoxId(dto.getPackagingBoxId()); @@ -181,6 +185,17 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl - order by id asc + order by CREATE_TIME desc