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

Merge branch 'master' of http://git.picaiba.com/CaiXiang/cigs4

Browse Source
This commit is contained in:
caixiang
2023-03-03 15:04:06 +08:00
parent e04a4d184e b80aaee82c
commit ec1e5097f7
26 changed files with 85 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -110,11 +110,16 @@ public class ChangePackagingBoxHistoryController {
@GetMapping("export")
@ApiOperation("导出")
@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')")
public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
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 = "")
private LocalDateTime lastUpdateTime;
@ApiModelProperty(value = "补偿pmpp")
@ApiModelProperty(value = "补偿后的功率，pmpp")
private Float pmpp;
@ApiModelProperty(value = "订单名")
@@ -170,4 +170,7 @@ public class WoPackagingBoxSubstrateDTO implements Serializable {
@ApiModelProperty(value = "")
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;
@ApiModelProperty("补偿pmpp")
@ApiModelProperty("补偿后的功率，pmpp")
private Float pmpp;
@ApiModelProperty("订单名")
private String orderName;
@ApiModelProperty("真实PMPP")
private Float actualPmpp;
private Long binclassFl1;
private Long binclassFl2;
@@ -239,5 +243,6 @@ public class WoPackagingBoxSubstrate implements Serializable {
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 {
@Excel(name = "ID")
private Long id;
@Excel(name = "基板ID或模组id")
@Excel(name = "基板ID")
private String substrateId;
@Excel(name = "源包装箱box no, 关联t_wo_packaging_box.box_no 字段")
@Excel(name = "源包装箱")
private String sourceBoxNo;
@Excel(name = "源箱slot")
@Excel(name = "源位置")
private Integer sourceSlot;
@Excel(name = "离开时间")
private LocalDateTime leaveTime;
@Excel(name = "目标箱box no, 关联t_wo_packaging_box.box_no 字段")
@Excel(name = "目的包装箱")
private String targetBoxNo;
@Excel(name = "目标箱slot")
@Excel(name = "目的位置")
private Integer targetSlot;
@Excel(name = "进入时间")
private LocalDateTime inputTime;
@Excel(name = "等级")
private String grade;
@Excel(name = "类型，1=加入包装箱；2=移除包装箱；3=换箱")
@Excel(name = "操作类型")
private Integer type;
@Excel(name = "删除标志，是否有效:1 可用 0不可用")
private Integer valid;
@@ -42,7 +42,7 @@ public class ChangePackagingBoxHistoryExcel {
private Long creatorId;
@Excel(name = "创建人姓名")
private String creatorName;
@Excel(name = "创建时间")
@Excel(name = "操作时间")
private LocalDateTime createTime;
@Excel(name = "更新人")
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 {
@Excel(name = "ID")
private Long id;
@Excel(name = "包装箱ID，BoxId")
@Excel(name = "Box_ID")
private String packagingBoxId;
@Excel(name = "基板ID")
@Excel(name = "substrate ID")
private String woSubstrateId;
@Excel(name = "创建人")
private Long creatorId;
@@ -36,7 +36,7 @@ public class WoPackagingBoxSubstrateExcel {
private LocalDateTime updateTime;
@Excel(name = "版本号")
private Integer version;
@Excel(name = "箱中位置")
@Excel(name = "BOX_SLOT")
private Integer slot;
@Excel(name = "进入时间")
private LocalDateTime inputTime;
@@ -44,15 +44,15 @@ public class WoPackagingBoxSubstrateExcel {
private Integer valid;
@Excel(name = "SAP MATERIAL,从t_wo_power_level 对应过来的")
private String sapMaterial;
@Excel(name = "线体,从t_wo_power_level 对应过来的，1=F ; 2=S")
@Excel(name = "线体")
private Integer lineBody;
@Excel(name = "功率等级")
private String powerLevel;
@Excel(name = "")
private LocalDateTime lastUpdateTime;
@Excel(name = "补偿pmpp")
@Excel(name = "补偿后的功率，pmpp")
private Float pmpp;
@Excel(name = "订单名")
@Excel(name = "订单")
private String orderName;
@Excel(name = "")
private Long binclassFl1;
@@ -114,6 +114,8 @@ public class WoPackagingBoxSubstrateExcel {
private Float uocFl1;
@Excel(name = "")
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 java.util.List;
import java.util.Map;
/**
* 包装箱拆合箱历史表
@@ -16,6 +17,6 @@ import java.util.List;
@Mapper
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.service.CrudService;
import com.cnbm.packing.dto.ChangePackagingBoxHistoryDTO;
import com.cnbm.packing.dto.ChangePackagingBoxHistoryDTO;
import com.cnbm.packing.entity.ChangePackagingBoxHistory;
import java.util.List;
import java.util.Map;
/**
@@ -25,5 +25,7 @@ public interface ChangePackagingBoxHistoryServiceBiz extends CrudService<ChangeP
void update(ChangePackagingBoxHistoryDTO dto);
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.service.CrudService;
import com.cnbm.packing.dto.PrintModelDTO;
import com.cnbm.packing.dto.PrintModelDTO;
import com.cnbm.packing.entity.PrintModel;
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.service.CrudService;
import com.cnbm.packing.dto.CompensationPowerXSDTO;
import com.cnbm.packing.dto.WoCompensationPowerDTO;
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.metadata.IPage;
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.common.page.PageData;
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.entity.ChangePackagingBoxHistory;
import com.cnbm.packing.entity.ChangePackagingBoxHistory;
import com.cnbm.packing.entity.WoPowerLevel;
import com.cnbm.packing.mapper.ChangePackagingBoxHistoryMapper;
import com.cnbm.packing.service.ChangePackagingBoxHistoryServiceBiz;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
@@ -34,8 +30,8 @@ import java.util.Map;
@Service
public class ChangePackagingBoxHistoryServiceBizImpl extends CrudServiceImpl<ChangePackagingBoxHistoryMapper, ChangePackagingBoxHistory, ChangePackagingBoxHistoryDTO> implements ChangePackagingBoxHistoryServiceBiz {
// @Autowired
// private BaseSupport baseSupport;
@Autowired
private ChangePackagingBoxHistoryMapper mapper;
@Override
public QueryWrapper<ChangePackagingBoxHistory> getWrapper(Map<String, Object> params){
@@ -43,8 +39,8 @@ public class ChangePackagingBoxHistoryServiceBizImpl extends CrudServiceImpl<Cha
LocalDateTime endTime = (LocalDateTime) params.get("endTime");
QueryWrapper<ChangePackagingBoxHistory> wrapper = new QueryWrapper<>();
wrapper.between(startTime!=null && endTime!=null,ChangePackagingBoxHistory.INPUT_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);
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);
@@ -91,4 +87,11 @@ public class ChangePackagingBoxHistoryServiceBizImpl extends CrudServiceImpl<Cha
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.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.cnbm.admin.base.BaseSupport;
import com.cnbm.admin.utils.BaseSupportUtils;
import com.cnbm.admin.utils.CodeGeneratorHelper;
import com.cnbm.common.page.PageData;
@@ -33,8 +32,6 @@ public class PrintModelServiceBizImpl extends CrudServiceImpl<PrintModelMapper,
@Autowired
private PrintModelMapper mapper;
// @Autowired
// private BaseSupport baseSupport;
@Override
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.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.cnbm.admin.base.BaseSupport;
import com.cnbm.admin.utils.BaseSupportUtils;
import com.cnbm.common.page.PageData;
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.WoCompensationPowerDTO;
import com.cnbm.packing.entity.WoCompensationPower;
import com.cnbm.packing.entity.WoPowerLevel;
import com.cnbm.packing.mapper.WoCompensationPowerMapper;
import com.cnbm.packing.param.CompensationQueryParam;
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.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -36,8 +32,6 @@ public class WoCompensationPowerServiceBizImpl extends CrudServiceImpl<WoCompens
@Autowired
private WoCompensationPowerMapper mapper;
// @Autowired
// private BaseSupport baseSupport;
@Override
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.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.cnbm.admin.base.BaseSupport;
import com.cnbm.admin.utils.BaseSupportUtils;
import com.cnbm.common.page.PageData;
import com.cnbm.common.service.impl.CrudServiceImpl;
@@ -38,8 +37,6 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBox
private WoPackagingBoxMapper mapper;
@Autowired
private WoPackagingBoxSubstrateMapper substrateMapper;
// @Autowired
// private BaseSupport baseSupport;
@Override
public QueryWrapper<WoPackagingBox> getWrapper(Map<String, Object> params){
@@ -49,7 +46,7 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBox
String boxNo = (String) params.get("boxNo");
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);
if(params.get("lineBody")!=null) {
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.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.cnbm.admin.base.BaseSupport;
import com.cnbm.admin.utils.BaseSupportUtils;
import com.cnbm.common.page.PageData;
import com.cnbm.common.service.impl.CrudServiceImpl;
@@ -43,8 +42,6 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl<WoPac
private ChangePackagingBoxHistoryServiceBiz changePackagingBoxHistoryService;
@Autowired
private WoPackagingBoxSubstrateMapper mapper;
// @Autowired
// private BaseSupport baseSupport;
@Override
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.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.common.page.PageData;
import com.cnbm.common.service.impl.CrudServiceImpl;
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.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.mapper.WoPackagingPrintHistoryMapper;
import com.cnbm.packing.mapper.WoPackagingPrintHistoryMapper;
import com.cnbm.packing.service.WoPackagingBoxServiceBiz;
import com.cnbm.packing.service.WoPackagingPrintHistoryServiceBiz;
@@ -44,8 +34,6 @@ public class WoPackagingPrintHistoryServiceBizImpl extends CrudServiceImpl<WoPac
@Autowired
private WoPackagingPrintHistoryMapper mapper;
// @Autowired
// private BaseSupport baseSupport;
@Autowired
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.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.cnbm.admin.base.BaseSupport;
import com.cnbm.admin.utils.BaseSupportUtils;
import com.cnbm.common.page.PageData;
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.param.CompensationQueryParam;
import com.cnbm.packing.service.WoPowerLevelServiceBiz;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -33,8 +31,6 @@ public class WoPowerLevelServiceBizImpl extends CrudServiceImpl<WoPowerLevelMapp
@Autowired
private WoPowerLevelMapper mapper;
// @Autowired
// private BaseSupport baseSupport;
@Override
public QueryWrapper<WoPowerLevel> getWrapper(Map<String, Object> params){