CaiXiang/cigs4
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

yanyang #15

Merged
yanyang merged 2 commits from yanyang into master 2023-03-03 15:02:46 +08:00
Conversation 0 Commits 2 Files Changed 26 +85 -78
26 changed files with 85 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 333d076f6e - Show all commits

2
ym-generator/src/main/java/com/cnbm/generator/code/controller/WoPackagingBoxSubstrateController.java
View File

@ -31,7 +31,7 @@ import java.util.Map;
* 包装箱基板关联表 ( 基板表 ) 前端控制器 * 包装箱基板关联表 ( 基板表 ) 前端控制器
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-02-23 * @since 2023-03-03
*/ */
@RestController @RestController
@RequestMapping("/code/woPackagingBoxSubstrate") @RequestMapping("/code/woPackagingBoxSubstrate")

7
ym-generator/src/main/java/com/cnbm/generator/code/dto/WoPackagingBoxSubstrateDTO.java
View File

@ -14,7 +14,7 @@ import java.math.BigDecimal;
* 包装箱基板关联表 ( 基板表 ) * 包装箱基板关联表 ( 基板表 )
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-02-23 * @since 2023-03-03
*/ */
@Data @Data
@ApiModel(value = "包装箱基板关联表 ( 基板表 )DTO对象") @ApiModel(value = "包装箱基板关联表 ( 基板表 )DTO对象")
@ -74,7 +74,7 @@ public class WoPackagingBoxSubstrateDTO implements Serializable {
@ApiModelProperty(value = "") @ApiModelProperty(value = "")
private LocalDateTime lastUpdateTime; private LocalDateTime lastUpdateTime;
@ApiModelProperty(value = "补偿pmpp") @ApiModelProperty(value = "补偿后的功率，pmpp")
private Float pmpp; private Float pmpp;
@ApiModelProperty(value = "订单名") @ApiModelProperty(value = "订单名")
@ -170,4 +170,7 @@ public class WoPackagingBoxSubstrateDTO implements Serializable {
@ApiModelProperty(value = "") @ApiModelProperty(value = "")
private Float uocFl2; private Float uocFl2;
@ApiModelProperty(value = "真实PMPP")
private Float actualPmpp;
} }

9
ym-generator/src/main/java/com/cnbm/generator/code/entity/WoPackagingBoxSubstrate.java
View File

@ -14,7 +14,7 @@ import lombok.Data;
* </p> * </p>
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-02-23 * @since 2023-03-03
*/ */
@Data @Data
@TableName("t_wo_packaging_box_substrate") @TableName("t_wo_packaging_box_substrate")
@ -74,7 +74,7 @@ public class WoPackagingBoxSubstrate implements Serializable {
private LocalDateTime lastUpdateTime; private LocalDateTime lastUpdateTime;
@ApiModelProperty("补偿pmpp") @ApiModelProperty("补偿后的功率，pmpp")
private Float pmpp; private Float pmpp;
@ApiModelProperty("订单名") @ApiModelProperty("订单名")
@ -140,6 +140,9 @@ public class WoPackagingBoxSubstrate implements Serializable {
private Float uocFl2; private Float uocFl2;
@ApiModelProperty("真实PMPP")
private Float actualPmpp;
public static final String ID = "ID"; public static final String ID = "ID";
@ -239,4 +242,6 @@ public class WoPackagingBoxSubstrate implements Serializable {
public static final String UOC_FL2 = "UOC_FL2"; public static final String UOC_FL2 = "UOC_FL2";
public static final String ACTUAL_PMPP = "ACTUAL_PMPP";
} }

6
ym-generator/src/main/java/com/cnbm/generator/code/excel/WoPackagingBoxSubstrateExcel.java
View File

@ -12,7 +12,7 @@ import java.util.Date;
* 包装箱基板关联表 ( 基板表 ) * 包装箱基板关联表 ( 基板表 )
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-02-23 * @since 2023-03-03
*/ */
@Data @Data
public class WoPackagingBoxSubstrateExcel { public class WoPackagingBoxSubstrateExcel {
@ -50,7 +50,7 @@ public class WoPackagingBoxSubstrateExcel {
private String powerLevel; private String powerLevel;
@Excel(name = "") @Excel(name = "")
private LocalDateTime lastUpdateTime; private LocalDateTime lastUpdateTime;
@Excel(name = "补偿pmpp") @Excel(name = "补偿后的功率，pmpp")
private Float pmpp; private Float pmpp;
@Excel(name = "订单名") @Excel(name = "订单名")
private String orderName; private String orderName;
@ -114,5 +114,7 @@ public class WoPackagingBoxSubstrateExcel {
private Float uocFl1; private Float uocFl1;
@Excel(name = "") @Excel(name = "")
private Float uocFl2; private Float uocFl2;
@Excel(name = "真实PMPP")
private Float actualPmpp;
} }

2
ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPackagingBoxSubstrateMapper.java
View File

@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper;
* 包装箱基板关联表 ( 基板表 ) * 包装箱基板关联表 ( 基板表 )
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-02-23 * @since 2023-03-03
*/ */
@Mapper @Mapper
public interface WoPackagingBoxSubstrateMapper extends BaseDao<WoPackagingBoxSubstrate> { public interface WoPackagingBoxSubstrateMapper extends BaseDao<WoPackagingBoxSubstrate> {

1
ym-generator/src/main/java/com/cnbm/generator/code/mapper/WoPackagingBoxSubstrateMapper.xml
View File

@ -51,6 +51,7 @@
<id column="UMPP_FL2" property="umppFl2" /> <id column="UMPP_FL2" property="umppFl2" />
<id column="UOC_FL1" property="uocFl1" /> <id column="UOC_FL1" property="uocFl1" />
<id column="UOC_FL2" property="uocFl2" /> <id column="UOC_FL2" property="uocFl2" />
<id column="ACTUAL_PMPP" property="actualPmpp" />
</resultMap> </resultMap>
</mapper> </mapper>

12
ym-generator/src/main/java/com/cnbm/generator/code/mysql/WoPackagingBoxSubstratemysql.sql
View File

@ -1,7 +1,7 @@
-- 菜单初始SQL -- 菜单初始SQL
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1628638869145812994, 1067246875800000035, '包装箱基板关联表 ( 基板表 )', 'code/woPackagingBoxSubstrate', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now()); INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date)VALUES (1631549072342364161, 1067246875800000035, '包装箱基板关联表 ( 基板表 )', 'code/woPackagingBoxSubstrate', NULL, 0, 'icon-desktop', 0, 1067246875800000001, now(), 1067246875800000001, now());
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1628638869145812995, 1628638869145812994, '查看', NULL, 'code:woPackagingBoxSubstrate:page,code:woPackagingBoxSubstrate:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now()); INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1631549072342364162, 1631549072342364161, '查看', NULL, 'code:woPackagingBoxSubstrate:page,code:woPackagingBoxSubstrate:info', 1, NULL, 0, 1067246875800000001, now(), 1067246875800000001, now());
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1628638869145812996, 1628638869145812994, '新增', NULL, 'code:woPackagingBoxSubstrate:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now()); INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1631549072342364163, 1631549072342364161, '新增', NULL, 'code:woPackagingBoxSubstrate:save', 1, NULL, 1, 1067246875800000001, now(), 1067246875800000001, now());
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1628638869145812997, 1628638869145812994, '修改', NULL, 'code:woPackagingBoxSubstrate:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now()); INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1631549072342364164, 1631549072342364161, '修改', NULL, 'code:woPackagingBoxSubstrate:update', 1, NULL, 2, 1067246875800000001, now(), 1067246875800000001, now());
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1628638869145812998, 1628638869145812994, '删除', NULL, 'code:woPackagingBoxSubstrate:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now()); INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1631549072342364165, 1631549072342364161, '删除', NULL, 'code:woPackagingBoxSubstrate:delete', 1, NULL, 3, 1067246875800000001, now(), 1067246875800000001, now());
INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1628638869145812999, 1628638869145812994, '导出', NULL, 'code:woPackagingBoxSubstrate:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now()); INSERT INTO sys_menu(id, pid, name, url, permissions, type, icon, sort, creator, create_date, updater, update_date) VALUES (1631549072342364166, 1631549072342364161, '导出', NULL, 'code:woPackagingBoxSubstrate:export', 1, NULL, 4, 1067246875800000001, now(), 1067246875800000001, now());

2
ym-generator/src/main/java/com/cnbm/generator/code/service/WoPackagingBoxSubstrateServiceBiz.java
View File

@ -8,7 +8,7 @@ import com.cnbm.generator.code.entity.WoPackagingBoxSubstrate;
* 包装箱基板关联表 ( 基板表 ) * 包装箱基板关联表 ( 基板表 )
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-02-23 * @since 2023-03-03
*/ */
public interface WoPackagingBoxSubstrateServiceBiz extends CrudService<WoPackagingBoxSubstrate, WoPackagingBoxSubstrateDTO> { public interface WoPackagingBoxSubstrateServiceBiz extends CrudService<WoPackagingBoxSubstrate, WoPackagingBoxSubstrateDTO> {

2
ym-generator/src/main/java/com/cnbm/generator/code/service/impl/WoPackagingBoxSubstrateServiceBizImpl.java
View File

@ -15,7 +15,7 @@ import java.util.Map;
* 包装箱基板关联表 ( 基板表 ) * 包装箱基板关联表 ( 基板表 )
* *
* @author codeGenerator * @author codeGenerator
* @since 2023-02-23 * @since 2023-03-03
*/ */
@Service @Service
public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl<WoPackagingBoxSubstrateMapper, WoPackagingBoxSubstrate, WoPackagingBoxSubstrateDTO> implements WoPackagingBoxSubstrateServiceBiz { public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl<WoPackagingBoxSubstrateMapper, WoPackagingBoxSubstrate, WoPackagingBoxSubstrateDTO> implements WoPackagingBoxSubstrateServiceBiz {

7
ym-packing/src/main/java/com/cnbm/packing/controller/ChangePackagingBoxHistoryController.java
View File

@ -110,11 +110,16 @@ public class ChangePackagingBoxHistoryController {
@GetMapping("export") @GetMapping("export")
@ApiOperation("导出") @ApiOperation("导出")
@LogOperation("导出") @LogOperation("导出")
@ApiImplicitParams({
@ApiImplicitParam(name = "startTime", value = "开始时间", paramType = "query", dataTypeClass = LocalDateTime.class),
@ApiImplicitParam(name = "endTime", value = "结束时间", paramType = "query", dataTypeClass = LocalDateTime.class),
@ApiImplicitParam(name = "type", value = "类型，1=加入包装箱；2=移除包装箱；3=换箱", paramType = "query", dataTypeClass=Integer.class)
})
@PreAuthorize("@ex.hasAuthority('packing:changePackagingBoxHistory:export')") @PreAuthorize("@ex.hasAuthority('packing:changePackagingBoxHistory:export')")
public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception { public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<ChangePackagingBoxHistoryDTO> list = changePackagingBoxHistoryService.list(params); List<ChangePackagingBoxHistoryDTO> list = changePackagingBoxHistoryService.list(params);
ExcelUtils.exportExcelToTarget(response, null, list, ChangePackagingBoxHistoryExcel.class); ExcelUtils.exportExcelToTarget(response, "包装箱模组操作记录", list, ChangePackagingBoxHistoryExcel.class);
} }
} }

5
ym-packing/src/main/java/com/cnbm/packing/dto/WoPackagingBoxSubstrateDTO.java
View File

@ -74,7 +74,7 @@ public class WoPackagingBoxSubstrateDTO implements Serializable {
@ApiModelProperty(value = "") @ApiModelProperty(value = "")
private LocalDateTime lastUpdateTime; private LocalDateTime lastUpdateTime;
@ApiModelProperty(value = "补偿pmpp") @ApiModelProperty(value = "补偿后的功率，pmpp")
private Float pmpp; private Float pmpp;
@ApiModelProperty(value = "订单名") @ApiModelProperty(value = "订单名")
@ -170,4 +170,7 @@ public class WoPackagingBoxSubstrateDTO implements Serializable {
@ApiModelProperty(value = "") @ApiModelProperty(value = "")
private Float uocFl2; private Float uocFl2;
@ApiModelProperty(value = "真实PMPP")
private Float actualPmpp;
} }

7
ym-packing/src/main/java/com/cnbm/packing/entity/WoPackagingBoxSubstrate.java
View File

@ -74,12 +74,16 @@ public class WoPackagingBoxSubstrate implements Serializable {
private LocalDateTime lastUpdateTime; private LocalDateTime lastUpdateTime;
@ApiModelProperty("补偿pmpp") @ApiModelProperty("补偿后的功率，pmpp")
private Float pmpp; private Float pmpp;
@ApiModelProperty("订单名") @ApiModelProperty("订单名")
private String orderName; private String orderName;
@ApiModelProperty("真实PMPP")
private Float actualPmpp;
private Long binclassFl1; private Long binclassFl1;
private Long binclassFl2; private Long binclassFl2;
@ -239,5 +243,6 @@ public class WoPackagingBoxSubstrate implements Serializable {
public static final String UOC_FL2 = "UOC_FL2"; public static final String UOC_FL2 = "UOC_FL2";
public static final String ACTUAL_PMPP = "ACTUAL_PMPP";
} }

14
ym-packing/src/main/java/com/cnbm/packing/excel/ChangePackagingBoxHistoryExcel.java
View File

@ -18,23 +18,23 @@ import java.util.Date;
public class ChangePackagingBoxHistoryExcel { public class ChangePackagingBoxHistoryExcel {
@Excel(name = "ID") @Excel(name = "ID")
private Long id; private Long id;
@Excel(name = "基板ID或模组id") @Excel(name = "基板ID")
private String substrateId; private String substrateId;
@Excel(name = "源包装箱box no, 关联t_wo_packaging_box.box_no 字段") @Excel(name = "源包装箱")
private String sourceBoxNo; private String sourceBoxNo;
@Excel(name = "源箱slot") @Excel(name = "源位置")
private Integer sourceSlot; private Integer sourceSlot;
@Excel(name = "离开时间") @Excel(name = "离开时间")
private LocalDateTime leaveTime; private LocalDateTime leaveTime;
@Excel(name = "目标箱box no, 关联t_wo_packaging_box.box_no 字段") @Excel(name = "目的包装箱")
private String targetBoxNo; private String targetBoxNo;
@Excel(name = "目标箱slot") @Excel(name = "目的位置")
private Integer targetSlot; private Integer targetSlot;
@Excel(name = "进入时间") @Excel(name = "进入时间")
private LocalDateTime inputTime; private LocalDateTime inputTime;
@Excel(name = "等级") @Excel(name = "等级")
private String grade; private String grade;
@Excel(name = "类型，1=加入包装箱；2=移除包装箱；3=换箱") @Excel(name = "操作类型")
private Integer type; private Integer type;
@Excel(name = "删除标志，是否有效:1 可用 0不可用") @Excel(name = "删除标志，是否有效:1 可用 0不可用")
private Integer valid; private Integer valid;
@ -42,7 +42,7 @@ public class ChangePackagingBoxHistoryExcel {
private Long creatorId; private Long creatorId;
@Excel(name = "创建人姓名") @Excel(name = "创建人姓名")
private String creatorName; private String creatorName;
@Excel(name = "创建时间") @Excel(name = "操作时间")
private LocalDateTime createTime; private LocalDateTime createTime;
@Excel(name = "更新人") @Excel(name = "更新人")
private Long updaterId; private Long updaterId;

14
ym-packing/src/main/java/com/cnbm/packing/excel/WoPackagingBoxSubstrateExcel.java
View File

@ -18,9 +18,9 @@ import java.util.Date;
public class WoPackagingBoxSubstrateExcel { public class WoPackagingBoxSubstrateExcel {
@Excel(name = "ID") @Excel(name = "ID")
private Long id; private Long id;
@Excel(name = "包装箱ID，BoxId") @Excel(name = "Box_ID")
private String packagingBoxId; private String packagingBoxId;
@Excel(name = "基板ID") @Excel(name = "substrate ID")
private String woSubstrateId; private String woSubstrateId;
@Excel(name = "创建人") @Excel(name = "创建人")
private Long creatorId; private Long creatorId;
@ -36,7 +36,7 @@ public class WoPackagingBoxSubstrateExcel {
private LocalDateTime updateTime; private LocalDateTime updateTime;
@Excel(name = "版本号") @Excel(name = "版本号")
private Integer version; private Integer version;
@Excel(name = "箱中位置") @Excel(name = "BOX_SLOT")
private Integer slot; private Integer slot;
@Excel(name = "进入时间") @Excel(name = "进入时间")
private LocalDateTime inputTime; private LocalDateTime inputTime;
@ -44,15 +44,15 @@ public class WoPackagingBoxSubstrateExcel {
private Integer valid; private Integer valid;
@Excel(name = "SAP MATERIAL,从t_wo_power_level 对应过来的") @Excel(name = "SAP MATERIAL,从t_wo_power_level 对应过来的")
private String sapMaterial; private String sapMaterial;
@Excel(name = "线体,从t_wo_power_level 对应过来的，1=F ; 2=S") @Excel(name = "线体")
private Integer lineBody; private Integer lineBody;
@Excel(name = "功率等级") @Excel(name = "功率等级")
private String powerLevel; private String powerLevel;
@Excel(name = "") @Excel(name = "")
private LocalDateTime lastUpdateTime; private LocalDateTime lastUpdateTime;
@Excel(name = "补偿pmpp") @Excel(name = "补偿后的功率，pmpp")
private Float pmpp; private Float pmpp;
@Excel(name = "订单名") @Excel(name = "订单")
private String orderName; private String orderName;
@Excel(name = "") @Excel(name = "")
private Long binclassFl1; private Long binclassFl1;
@ -114,6 +114,8 @@ public class WoPackagingBoxSubstrateExcel {
private Float uocFl1; private Float uocFl1;
@Excel(name = "") @Excel(name = "")
private Float uocFl2; private Float uocFl2;
@Excel(name = "真实PMPP")
private Float actualPmpp;
} }

3
ym-packing/src/main/java/com/cnbm/packing/mapper/ChangePackagingBoxHistoryMapper.java
View File

@ -6,6 +6,7 @@ import com.cnbm.packing.entity.ChangePackagingBoxHistory;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* 包装箱拆合箱历史表 * 包装箱拆合箱历史表
@ -16,6 +17,6 @@ import java.util.List;
@Mapper @Mapper
public interface ChangePackagingBoxHistoryMapper extends BaseDao<ChangePackagingBoxHistory> { public interface ChangePackagingBoxHistoryMapper extends BaseDao<ChangePackagingBoxHistory> {
List<ChangePackagingBoxHistoryDTO> list(); List<ChangePackagingBoxHistoryDTO> list(Map<String, Object> params);
} }

6
ym-packing/src/main/java/com/cnbm/packing/service/ChangePackagingBoxHistoryServiceBiz.java
View File

@ -3,9 +3,9 @@ package com.cnbm.packing.service;
import com.cnbm.common.page.PageData; import com.cnbm.common.page.PageData;
import com.cnbm.common.service.CrudService; import com.cnbm.common.service.CrudService;
import com.cnbm.packing.dto.ChangePackagingBoxHistoryDTO; import com.cnbm.packing.dto.ChangePackagingBoxHistoryDTO;
import com.cnbm.packing.dto.ChangePackagingBoxHistoryDTO;
import com.cnbm.packing.entity.ChangePackagingBoxHistory; import com.cnbm.packing.entity.ChangePackagingBoxHistory;
import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
@ -25,5 +25,7 @@ public interface ChangePackagingBoxHistoryServiceBiz extends CrudService<ChangeP
void update(ChangePackagingBoxHistoryDTO dto); void update(ChangePackagingBoxHistoryDTO dto);
void delete(Long[] ids); void delete(Long[] ids);
List<ChangePackagingBoxHistoryDTO> list(Map<String, Object> params);
} }

1
ym-packing/src/main/java/com/cnbm/packing/service/PrintModelServiceBiz.java
View File

@ -3,7 +3,6 @@ package com.cnbm.packing.service;
import com.cnbm.common.page.PageData; import com.cnbm.common.page.PageData;
import com.cnbm.common.service.CrudService; import com.cnbm.common.service.CrudService;
import com.cnbm.packing.dto.PrintModelDTO; import com.cnbm.packing.dto.PrintModelDTO;
import com.cnbm.packing.dto.PrintModelDTO;
import com.cnbm.packing.entity.PrintModel; import com.cnbm.packing.entity.PrintModel;
import java.util.List; import java.util.List;

1
ym-packing/src/main/java/com/cnbm/packing/service/WoCompensationPowerServiceBiz.java
View File

@ -2,7 +2,6 @@ package com.cnbm.packing.service;
import com.cnbm.common.page.PageData; import com.cnbm.common.page.PageData;
import com.cnbm.common.service.CrudService; import com.cnbm.common.service.CrudService;
import com.cnbm.packing.dto.CompensationPowerXSDTO;
import com.cnbm.packing.dto.WoCompensationPowerDTO; import com.cnbm.packing.dto.WoCompensationPowerDTO;
import com.cnbm.packing.entity.WoCompensationPower; import com.cnbm.packing.entity.WoCompensationPower;

21
ym-packing/src/main/java/com/cnbm/packing/service/impl/ChangePackagingBoxHistoryServiceBizImpl.java
View File

@ -3,8 +3,6 @@ package com.cnbm.packing.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.cnbm.admin.base.BaseSupport;
import com.cnbm.admin.base.BaseSupport;
import com.cnbm.admin.utils.BaseSupportUtils; import com.cnbm.admin.utils.BaseSupportUtils;
import com.cnbm.common.page.PageData; import com.cnbm.common.page.PageData;
import com.cnbm.common.service.impl.CrudServiceImpl; import com.cnbm.common.service.impl.CrudServiceImpl;
@ -12,17 +10,15 @@ import com.cnbm.common.utils.ConvertUtils;
import com.cnbm.packing.dto.ChangePackagingBoxHistoryDTO; import com.cnbm.packing.dto.ChangePackagingBoxHistoryDTO;
import com.cnbm.packing.dto.ChangePackagingBoxHistoryDTO; import com.cnbm.packing.dto.ChangePackagingBoxHistoryDTO;
import com.cnbm.packing.entity.ChangePackagingBoxHistory; import com.cnbm.packing.entity.ChangePackagingBoxHistory;
import com.cnbm.packing.entity.ChangePackagingBoxHistory;
import com.cnbm.packing.entity.WoPowerLevel;
import com.cnbm.packing.mapper.ChangePackagingBoxHistoryMapper; import com.cnbm.packing.mapper.ChangePackagingBoxHistoryMapper;
import com.cnbm.packing.service.ChangePackagingBoxHistoryServiceBiz; import com.cnbm.packing.service.ChangePackagingBoxHistoryServiceBiz;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Arrays; import java.util.Arrays;
import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
@ -34,8 +30,8 @@ import java.util.Map;
@Service @Service
public class ChangePackagingBoxHistoryServiceBizImpl extends CrudServiceImpl<ChangePackagingBoxHistoryMapper, ChangePackagingBoxHistory, ChangePackagingBoxHistoryDTO> implements ChangePackagingBoxHistoryServiceBiz { public class ChangePackagingBoxHistoryServiceBizImpl extends CrudServiceImpl<ChangePackagingBoxHistoryMapper, ChangePackagingBoxHistory, ChangePackagingBoxHistoryDTO> implements ChangePackagingBoxHistoryServiceBiz {
// @Autowired @Autowired
// private BaseSupport baseSupport; private ChangePackagingBoxHistoryMapper mapper;
@Override @Override
public QueryWrapper<ChangePackagingBoxHistory> getWrapper(Map<String, Object> params){ public QueryWrapper<ChangePackagingBoxHistory> getWrapper(Map<String, Object> params){
@ -43,8 +39,8 @@ public class ChangePackagingBoxHistoryServiceBizImpl extends CrudServiceImpl<Cha
LocalDateTime endTime = (LocalDateTime) params.get("endTime"); LocalDateTime endTime = (LocalDateTime) params.get("endTime");
QueryWrapper<ChangePackagingBoxHistory> wrapper = new QueryWrapper<>(); QueryWrapper<ChangePackagingBoxHistory> wrapper = new QueryWrapper<>();
wrapper.between(startTime!=null && endTime!=null,ChangePackagingBoxHistory.INPUT_TIME, startTime, endTime); wrapper.between(startTime!=null && endTime!=null,ChangePackagingBoxHistory.CREATE_TIME, startTime, endTime);
wrapper.between(startTime!=null && endTime!=null,ChangePackagingBoxHistory.LEAVE_TIME, startTime, endTime); wrapper.between(startTime!=null && endTime!=null,ChangePackagingBoxHistory.CREATE_TIME, startTime, endTime);
if(params.get("type")!=null) { if(params.get("type")!=null) {
Integer type = Integer.parseInt( params.get("type").toString()); Integer type = Integer.parseInt( params.get("type").toString());
wrapper.eq(ObjectUtils.isNotNull(type), ChangePackagingBoxHistory.TYPE, type); wrapper.eq(ObjectUtils.isNotNull(type), ChangePackagingBoxHistory.TYPE, type);
@ -91,4 +87,11 @@ public class ChangePackagingBoxHistoryServiceBizImpl extends CrudServiceImpl<Cha
deleteBatchIds(Arrays.asList(ids)); deleteBatchIds(Arrays.asList(ids));
} }
@Override
@Transactional(rollbackFor = Exception.class)
public List<ChangePackagingBoxHistoryDTO> list(Map<String, Object> params) {
List<ChangePackagingBoxHistoryDTO> list = mapper.list(params);
return list;
}
} }

3
ym-packing/src/main/java/com/cnbm/packing/service/impl/PrintModelServiceBizImpl.java
View File

@ -3,7 +3,6 @@ package com.cnbm.packing.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.cnbm.admin.base.BaseSupport;
import com.cnbm.admin.utils.BaseSupportUtils; import com.cnbm.admin.utils.BaseSupportUtils;
import com.cnbm.admin.utils.CodeGeneratorHelper; import com.cnbm.admin.utils.CodeGeneratorHelper;
import com.cnbm.common.page.PageData; import com.cnbm.common.page.PageData;
@ -33,8 +32,6 @@ public class PrintModelServiceBizImpl extends CrudServiceImpl<PrintModelMapper,
@Autowired @Autowired
private PrintModelMapper mapper; private PrintModelMapper mapper;
// @Autowired
// private BaseSupport baseSupport;
@Override @Override
public QueryWrapper<PrintModel> getWrapper(Map<String, Object> params){ public QueryWrapper<PrintModel> getWrapper(Map<String, Object> params){

6
ym-packing/src/main/java/com/cnbm/packing/service/impl/WoCompensationPowerServiceBizImpl.java
View File

@ -3,7 +3,6 @@ package com.cnbm.packing.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.cnbm.admin.base.BaseSupport;
import com.cnbm.admin.utils.BaseSupportUtils; import com.cnbm.admin.utils.BaseSupportUtils;
import com.cnbm.common.page.PageData; import com.cnbm.common.page.PageData;
import com.cnbm.common.service.impl.CrudServiceImpl; import com.cnbm.common.service.impl.CrudServiceImpl;
@ -11,12 +10,9 @@ import com.cnbm.common.utils.ConvertUtils;
import com.cnbm.packing.dto.CompensationPowerXSDTO; import com.cnbm.packing.dto.CompensationPowerXSDTO;
import com.cnbm.packing.dto.WoCompensationPowerDTO; import com.cnbm.packing.dto.WoCompensationPowerDTO;
import com.cnbm.packing.entity.WoCompensationPower; import com.cnbm.packing.entity.WoCompensationPower;
import com.cnbm.packing.entity.WoPowerLevel;
import com.cnbm.packing.mapper.WoCompensationPowerMapper; import com.cnbm.packing.mapper.WoCompensationPowerMapper;
import com.cnbm.packing.param.CompensationQueryParam; import com.cnbm.packing.param.CompensationQueryParam;
import com.cnbm.packing.service.WoCompensationPowerServiceBiz; import com.cnbm.packing.service.WoCompensationPowerServiceBiz;
import lombok.var;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -36,8 +32,6 @@ public class WoCompensationPowerServiceBizImpl extends CrudServiceImpl<WoCompens
@Autowired @Autowired
private WoCompensationPowerMapper mapper; private WoCompensationPowerMapper mapper;
// @Autowired
// private BaseSupport baseSupport;
@Override @Override
public QueryWrapper<WoCompensationPower> getWrapper(Map<String, Object> params){ public QueryWrapper<WoCompensationPower> getWrapper(Map<String, Object> params){

5
ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java
View File

@ -3,7 +3,6 @@ package com.cnbm.packing.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.cnbm.admin.base.BaseSupport;
import com.cnbm.admin.utils.BaseSupportUtils; import com.cnbm.admin.utils.BaseSupportUtils;
import com.cnbm.common.page.PageData; import com.cnbm.common.page.PageData;
import com.cnbm.common.service.impl.CrudServiceImpl; import com.cnbm.common.service.impl.CrudServiceImpl;
@ -38,8 +37,6 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBox
private WoPackagingBoxMapper mapper; private WoPackagingBoxMapper mapper;
@Autowired @Autowired
private WoPackagingBoxSubstrateMapper substrateMapper; private WoPackagingBoxSubstrateMapper substrateMapper;
// @Autowired
// private BaseSupport baseSupport;
@Override @Override
public QueryWrapper<WoPackagingBox> getWrapper(Map<String, Object> params){ public QueryWrapper<WoPackagingBox> getWrapper(Map<String, Object> params){
@ -49,7 +46,7 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBox
String boxNo = (String) params.get("boxNo"); String boxNo = (String) params.get("boxNo");
QueryWrapper<WoPackagingBox> wrapper = new QueryWrapper<>(); QueryWrapper<WoPackagingBox> wrapper = new QueryWrapper<>();
wrapper.between(startTime!=null && endTime!=null,WoPackagingBox.PACKAGING_TIME, startTime, endTime); wrapper.between(startTime!=null && endTime!=null,WoPackagingBox.CREATE_TIME, startTime, endTime);
wrapper.like(StringUtils.isNotBlank(boxNo), WoPackagingBox.BOX_NO, boxNo); wrapper.like(StringUtils.isNotBlank(boxNo), WoPackagingBox.BOX_NO, boxNo);
if(params.get("lineBody")!=null) { if(params.get("lineBody")!=null) {
Integer lineBody = Integer.parseInt(params.get("lineBody").toString()); Integer lineBody = Integer.parseInt(params.get("lineBody").toString());

3
ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxSubstrateServiceBizImpl.java
View File

@ -3,7 +3,6 @@ package com.cnbm.packing.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.cnbm.admin.base.BaseSupport;
import com.cnbm.admin.utils.BaseSupportUtils; import com.cnbm.admin.utils.BaseSupportUtils;
import com.cnbm.common.page.PageData; import com.cnbm.common.page.PageData;
import com.cnbm.common.service.impl.CrudServiceImpl; import com.cnbm.common.service.impl.CrudServiceImpl;
@ -43,8 +42,6 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl<WoPac
private ChangePackagingBoxHistoryServiceBiz changePackagingBoxHistoryService; private ChangePackagingBoxHistoryServiceBiz changePackagingBoxHistoryService;
@Autowired @Autowired
private WoPackagingBoxSubstrateMapper mapper; private WoPackagingBoxSubstrateMapper mapper;
// @Autowired
// private BaseSupport baseSupport;
@Override @Override
public QueryWrapper<WoPackagingBoxSubstrate> getWrapper(Map<String, Object> params){ public QueryWrapper<WoPackagingBoxSubstrate> getWrapper(Map<String, Object> params){

12
ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingPrintHistoryServiceBizImpl.java
View File

@ -2,23 +2,13 @@ package com.cnbm.packing.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.cnbm.admin.base.BaseSupport;
import com.cnbm.admin.enums.WhetherEnum;
import com.cnbm.admin.utils.BaseSupportUtils; import com.cnbm.admin.utils.BaseSupportUtils;
import com.cnbm.common.page.PageData; import com.cnbm.common.page.PageData;
import com.cnbm.common.service.impl.CrudServiceImpl; import com.cnbm.common.service.impl.CrudServiceImpl;
import com.cnbm.common.utils.ConvertUtils; import com.cnbm.common.utils.ConvertUtils;
import com.cnbm.common.validator.ValidatorUtils;
import com.cnbm.common.validator.group.AddGroup;
import com.cnbm.common.validator.group.DefaultGroup;
import com.cnbm.packing.dto.WoPackagingBoxDTO; import com.cnbm.packing.dto.WoPackagingBoxDTO;
import com.cnbm.packing.dto.WoPackagingPrintHistoryDTO; import com.cnbm.packing.dto.WoPackagingPrintHistoryDTO;
import com.cnbm.packing.dto.WoPackagingPrintHistoryDTO;
import com.cnbm.packing.entity.WoPackagingBox;
import com.cnbm.packing.entity.WoPackagingPrintHistory; import com.cnbm.packing.entity.WoPackagingPrintHistory;
import com.cnbm.packing.entity.WoPackagingPrintHistory;
import com.cnbm.packing.mapper.WoPackagingPrintHistoryMapper;
import com.cnbm.packing.mapper.WoPackagingPrintHistoryMapper; import com.cnbm.packing.mapper.WoPackagingPrintHistoryMapper;
import com.cnbm.packing.service.WoPackagingBoxServiceBiz; import com.cnbm.packing.service.WoPackagingBoxServiceBiz;
import com.cnbm.packing.service.WoPackagingPrintHistoryServiceBiz; import com.cnbm.packing.service.WoPackagingPrintHistoryServiceBiz;
@ -44,8 +34,6 @@ public class WoPackagingPrintHistoryServiceBizImpl extends CrudServiceImpl<WoPac
@Autowired @Autowired
private WoPackagingPrintHistoryMapper mapper; private WoPackagingPrintHistoryMapper mapper;
// @Autowired
// private BaseSupport baseSupport;
@Autowired @Autowired
private WoPackagingBoxServiceBiz woPackagingBoxServiceBiz; private WoPackagingBoxServiceBiz woPackagingBoxServiceBiz;

4
ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPowerLevelServiceBizImpl.java
View File

@ -3,7 +3,6 @@ package com.cnbm.packing.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.cnbm.admin.base.BaseSupport;
import com.cnbm.admin.utils.BaseSupportUtils; import com.cnbm.admin.utils.BaseSupportUtils;
import com.cnbm.common.page.PageData; import com.cnbm.common.page.PageData;
import com.cnbm.common.service.impl.CrudServiceImpl; import com.cnbm.common.service.impl.CrudServiceImpl;
@ -13,7 +12,6 @@ import com.cnbm.packing.entity.WoPowerLevel;
import com.cnbm.packing.mapper.WoPowerLevelMapper; import com.cnbm.packing.mapper.WoPowerLevelMapper;
import com.cnbm.packing.param.CompensationQueryParam; import com.cnbm.packing.param.CompensationQueryParam;
import com.cnbm.packing.service.WoPowerLevelServiceBiz; import com.cnbm.packing.service.WoPowerLevelServiceBiz;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -33,8 +31,6 @@ public class WoPowerLevelServiceBizImpl extends CrudServiceImpl<WoPowerLevelMapp
@Autowired @Autowired
private WoPowerLevelMapper mapper; private WoPowerLevelMapper mapper;
// @Autowired
// private BaseSupport baseSupport;
@Override @Override
public QueryWrapper<WoPowerLevel> getWrapper(Map<String, Object> params){ public QueryWrapper<WoPowerLevel> getWrapper(Map<String, Object> params){

8
ym-packing/src/main/resources/mapper/ChangePackagingBoxHistoryMapper.xml
View File

@ -24,6 +24,14 @@
<select id="list" resultType="com.cnbm.packing.dto.ChangePackagingBoxHistoryDTO"> <select id="list" resultType="com.cnbm.packing.dto.ChangePackagingBoxHistoryDTO">
select * from t_change_packaging_box_history select * from t_change_packaging_box_history
<where>
<if test="startTime != null and endTime != null">
and create_time BETWEEN #{startTime} AND #{endTime}
</if>
<if test="type != null">
and type = #{type}
</if>
</where>
order by id asc order by id asc
</select> </select>