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

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

Browse Source
This commit is contained in:
caixiang
2023-02-23 14:28:24 +08:00
parent 16f3cd5d30 5f409dfdf7
commit 384b1a3d54
34 changed files with 766 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,7 +70,7 @@ public class ChangePackagingBoxHistoryController {
@PostMapping
@ApiOperation("保存")
@LogOperation("保存")
// @LogOperation("保存")
// @PreAuthorize("@ex.hasAuthority('packing:changePackagingBoxHistory:save')")
public Result<Long> save(@RequestBody ChangePackagingBoxHistoryDTO dto){
//效验数据
@@ -83,7 +83,7 @@ public class ChangePackagingBoxHistoryController {
@PutMapping
@ApiOperation("修改")
@LogOperation("修改")
// @LogOperation("修改")
// @PreAuthorize("@ex.hasAuthority('packing:changePackagingBoxHistory:update')")
public Result<Long> update(@RequestBody ChangePackagingBoxHistoryDTO dto){
//效验数据
@@ -96,7 +96,7 @@ public class ChangePackagingBoxHistoryController {
@DeleteMapping
@ApiOperation("删除")
@LogOperation("删除")
// @LogOperation("删除")
// @PreAuthorize("@ex.hasAuthority('packing:changePackagingBoxHistory:delete')")
public Result delete(@RequestBody Long[] ids){
//效验数据
@@ -109,7 +109,7 @@ public class ChangePackagingBoxHistoryController {
@GetMapping("export")
@ApiOperation("导出")
@LogOperation("导出")
// @LogOperation("导出")
// @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);

6
ym-packing/src/main/java/com/cnbm/packing/controller/PrintModelController.java
View File

@@ -82,7 +82,7 @@ public class PrintModelController {
@PutMapping
@ApiOperation("修改")
@LogOperation("修改")
// @LogOperation("修改")
// @PreAuthorize("@ex.hasAuthority('packing:printModel:update')")
public Result<Long> update(@RequestBody PrintModelDTO dto){
//效验数据
@@ -95,7 +95,7 @@ public class PrintModelController {
@DeleteMapping
@ApiOperation("删除")
@LogOperation("删除")
// @LogOperation("删除")
// @PreAuthorize("@ex.hasAuthority('packing:printModel:delete')")
public Result delete(@RequestBody Long[] ids){
//效验数据
@@ -108,7 +108,7 @@ public class PrintModelController {
@GetMapping("export")
@ApiOperation("导出")
@LogOperation("导出")
// @LogOperation("导出")
// @PreAuthorize("@ex.hasAuthority('packing:printModel:export')")
public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<PrintModelDTO> list = printModelService.list(params);

10
ym-packing/src/main/java/com/cnbm/packing/controller/WoCompensationPowerController.java
View File

@@ -67,7 +67,7 @@ public class WoCompensationPowerController {
@PostMapping
@ApiOperation("保存")
@LogOperation("保存")
// @LogOperation("保存")
// @PreAuthorize("@ex.hasAuthority('packing:woCompensationPower:save')")
public Result<Long> save(@RequestBody WoCompensationPowerDTO dto){
//效验数据
@@ -80,7 +80,7 @@ public class WoCompensationPowerController {
@PutMapping
@ApiOperation("修改")
@LogOperation("修改")
// @LogOperation("修改")
// @PreAuthorize("@ex.hasAuthority('packing:woCompensationPower:update')")
public Result<Long> update(@RequestBody WoCompensationPowerDTO dto){
//效验数据
@@ -93,7 +93,7 @@ public class WoCompensationPowerController {
@DeleteMapping
@ApiOperation("删除")
@LogOperation("删除")
// @LogOperation("删除")
// @PreAuthorize("@ex.hasAuthority('packing:woCompensationPower:delete')")
public Result delete(@RequestBody Long[] ids){
//效验数据
@@ -106,7 +106,7 @@ public class WoCompensationPowerController {
@GetMapping("export")
@ApiOperation("导出")
@LogOperation("导出")
// @LogOperation("导出")
// @PreAuthorize("@ex.hasAuthority('packing:woCompensationPower:export')")
public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<WoCompensationPowerDTO> list = woCompensationPowerService.list(params);
@@ -116,7 +116,7 @@ public class WoCompensationPowerController {
@PostMapping(value = "list")
@ApiOperation(value = "获取基板补偿功率")
@LogOperation("获取基板补偿功率")
// @LogOperation("获取基板补偿功率")
public List<WoCompensationPowerDTO> list() { return woCompensationPowerService.list(); }
}

10
ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxController.java
View File

@@ -74,7 +74,7 @@ public class WoPackagingBoxController {
@PostMapping
@ApiOperation("保存")
@LogOperation("保存")
// @LogOperation("保存")
// @PreAuthorize("@ex.hasAuthority('packing:woPackagingBox:save')")
public Result<Long> save(@RequestBody WoPackagingBoxDTO dto){
//效验数据
@@ -87,7 +87,7 @@ public class WoPackagingBoxController {
@PutMapping
@ApiOperation("修改")
@LogOperation("修改")
// @LogOperation("修改")
// @PreAuthorize("@ex.hasAuthority('packing:woPackagingBox:update')")
public Result<Long> update(@RequestBody WoPackagingBoxDTO dto){
//效验数据
@@ -100,7 +100,7 @@ public class WoPackagingBoxController {
@DeleteMapping
@ApiOperation("删除")
@LogOperation("删除")
// @LogOperation("删除")
// @PreAuthorize("@ex.hasAuthority('packing:woPackagingBox:delete')")
public Result delete(@RequestBody Long[] ids){
//效验数据
@@ -113,7 +113,7 @@ public class WoPackagingBoxController {
@GetMapping("export")
@ApiOperation("导出")
@LogOperation("导出")
// @LogOperation("导出")
// @PreAuthorize("@ex.hasAuthority('packing:woPackagingBox:export')")
public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<WoPackagingBoxDTO> list = woPackagingBoxService.list(params);
@@ -123,7 +123,7 @@ public class WoPackagingBoxController {
@PostMapping(value = "list")
@ApiOperation(value = "获取列表")
@LogOperation("获取列表")
// @LogOperation("获取列表")
public List<WoPackagingBoxDTO> list() { return woPackagingBoxService.list(); }
}

22
ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxSubstrateController.java
View File

@@ -81,7 +81,7 @@ public class WoPackagingBoxSubstrateController {
@PostMapping
@ApiOperation("保存")
@LogOperation("保存")
// @LogOperation("保存")
// @PreAuthorize("@ex.hasAuthority('packing:woPackagingBoxSubstrate:save')")
public Result<Long> save(@RequestBody WoPackagingBoxSubstrateDTO dto){
//效验数据
@@ -94,7 +94,7 @@ public class WoPackagingBoxSubstrateController {
@PutMapping
@ApiOperation("修改")
@LogOperation("修改")
// @LogOperation("修改")
// @PreAuthorize("@ex.hasAuthority('packing:woPackagingBoxSubstrate:update')")
public Result<Long> update(@RequestBody WoPackagingBoxSubstrateDTO dto){
//效验数据
@@ -107,7 +107,7 @@ public class WoPackagingBoxSubstrateController {
@DeleteMapping
@ApiOperation("删除")
@LogOperation("删除")
// @LogOperation("删除")
// @PreAuthorize("@ex.hasAuthority('packing:woPackagingBoxSubstrate:delete')")
public Result delete(@RequestBody Long[] ids){
//效验数据
@@ -120,7 +120,7 @@ public class WoPackagingBoxSubstrateController {
@GetMapping("export")
@ApiOperation("导出")
@LogOperation("导出")
// @LogOperation("导出")
// @PreAuthorize("@ex.hasAuthority('packing:woPackagingBoxSubstrate:export')")
public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<WoPackagingBoxSubstrateDTO> list = woPackagingBoxSubstrateService.list(params);
@@ -128,10 +128,10 @@ public class WoPackagingBoxSubstrateController {
ExcelUtils.exportExcelToTarget(response, null, list, WoPackagingBoxSubstrateExcel.class);
}
@PostMapping("removeSubstrate")
@PostMapping("removeSubstrate/{id}")
@ApiOperation("移箱")
@LogOperation("移箱")
public Result removeSubstrate(@RequestBody Long id){
// @LogOperation("移箱")
public Result removeSubstrate(@PathVariable("id") Long id){
woPackagingBoxSubstrateService.removeSubstrate(id);
@@ -140,7 +140,7 @@ public class WoPackagingBoxSubstrateController {
@PostMapping("insertSubstrate")
@ApiOperation("合箱")
@LogOperation("合箱")
// @LogOperation("合箱")
public Result insertSubstrate(@RequestBody WoPackagingBoxSubstrateDTO dto){
String woSubstrateId = dto.getWoSubstrateId();
@@ -183,7 +183,7 @@ public class WoPackagingBoxSubstrateController {
@PostMapping("replaceSubstrate")
@ApiOperation("换箱")
@LogOperation("换箱")
// @LogOperation("换箱")
public Result replaceSubstrate(@RequestBody WoPackagingBoxSubstrateDTO[] dtos){
woPackagingBoxSubstrateService.replaceSubstrate(dtos);
@@ -193,7 +193,7 @@ public class WoPackagingBoxSubstrateController {
@PostMapping("slotValidation")
@ApiOperation("slot是否占用验证")
@LogOperation("slot是否占用验证")
// @LogOperation("slot是否占用验证")
public boolean slotValidation(@RequestBody WoPackagingBoxSubstrateDTO dto){
QueryWrapper<WoPackagingBoxSubstrate> wrapper = new QueryWrapper<>();
@@ -209,7 +209,7 @@ public class WoPackagingBoxSubstrateController {
@PostMapping("batchInsert")
@ApiOperation("手动装箱")
@LogOperation("手动装箱")
// @LogOperation("手动装箱")
public Result batchInsert(@RequestBody WoPackagingBoxSubstrateDTO[] lists){
woPackagingBoxSubstrateService.batchInsert(lists);

14
ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingPrintHistoryController.java
View File

@@ -79,7 +79,7 @@ public class WoPackagingPrintHistoryController {
@PostMapping
@ApiOperation("保存")
@LogOperation("保存")
// @LogOperation("保存")
// @PreAuthorize("@ex.hasAuthority('packing:woPackagingPrintHistory:save')")
public Result<Long> save(@RequestBody WoPackagingPrintHistoryDTO dto){
//效验数据
@@ -92,7 +92,7 @@ public class WoPackagingPrintHistoryController {
@PutMapping
@ApiOperation("修改")
@LogOperation("修改")
// @LogOperation("修改")
// @PreAuthorize("@ex.hasAuthority('packing:woPackagingPrintHistory:update')")
public Result<Long> update(@RequestBody WoPackagingPrintHistoryDTO dto){
//效验数据
@@ -105,7 +105,7 @@ public class WoPackagingPrintHistoryController {
@DeleteMapping
@ApiOperation("删除")
@LogOperation("删除")
// @LogOperation("删除")
// @PreAuthorize("@ex.hasAuthority('packing:woPackagingPrintHistory:delete')")
public Result delete(@RequestBody Long[] ids){
//效验数据
@@ -118,7 +118,7 @@ public class WoPackagingPrintHistoryController {
@GetMapping("export")
@ApiOperation("导出")
@LogOperation("导出")
// @LogOperation("导出")
// @PreAuthorize("@ex.hasAuthority('packing:woPackagingPrintHistory:export')")
public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<WoPackagingPrintHistoryDTO> list = woPackagingPrintHistoryService.list(params);
@@ -126,10 +126,10 @@ public class WoPackagingPrintHistoryController {
ExcelUtils.exportExcelToTarget(response, null, list, WoPackagingPrintHistoryExcel.class);
}
@PostMapping("print")
@PostMapping("print/{id}")
@ApiOperation("打印")
@LogOperation("打印")
public Result<Long> print(@RequestBody Long id) {
// @LogOperation("打印")
public Result<Long> print(@PathVariable("id") Long id) {
WoPackagingBoxDTO woPackagingBox = woPackagingBoxServiceBiz.get(id);

10
ym-packing/src/main/java/com/cnbm/packing/controller/WoPowerLevelController.java
View File

@@ -67,7 +67,7 @@ public class WoPowerLevelController {
@PostMapping
@ApiOperation("保存")
@LogOperation("保存")
// @LogOperation("保存")
// @PreAuthorize("@ex.hasAuthority('packing:woPowerLevel:save')")
public Result<Long> save(@RequestBody WoPowerLevelDTO dto){
//效验数据
@@ -80,7 +80,7 @@ public class WoPowerLevelController {
@PutMapping
@ApiOperation("修改")
@LogOperation("修改")
// @LogOperation("修改")
// @PreAuthorize("@ex.hasAuthority('packing:woPowerLevel:update')")
public Result<Long> update(@RequestBody WoPowerLevelDTO dto){
//效验数据
@@ -93,7 +93,7 @@ public class WoPowerLevelController {
@DeleteMapping
@ApiOperation("删除")
@LogOperation("删除")
// @LogOperation("删除")
// @PreAuthorize("@ex.hasAuthority('packing:woPowerLevel:delete')")
public Result delete(@RequestBody Long[] ids){
//效验数据
@@ -106,7 +106,7 @@ public class WoPowerLevelController {
@GetMapping("export")
@ApiOperation("导出")
@LogOperation("导出")
// @LogOperation("导出")
// @PreAuthorize("@ex.hasAuthority('packing:woPowerLevel:export')")
public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<WoPowerLevelDTO> list = woPowerLevelService.list(params);
@@ -116,7 +116,7 @@ public class WoPowerLevelController {
@PostMapping(value = "list")
@ApiOperation(value = "获取功率等级")
@LogOperation("获取功率等级")
// @LogOperation("获取功率等级")
public List<WoPowerLevelDTO> list() { return woPowerLevelService.list(); }
}

3
ym-packing/src/main/java/com/cnbm/packing/dto/WoPackagingBoxDTO.java
View File

@@ -110,4 +110,7 @@ public class WoPackagingBoxDTO implements Serializable {
@ApiModelProperty(value = "是否到达包装台，1=到达；2=未达到")
private Integer isArrived;
@ApiModelProperty(value = "订单号")
private String orderNum;
}

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

@@ -71,4 +71,103 @@ public class WoPackagingBoxSubstrateDTO implements Serializable {
@ApiModelProperty(value = "功率等级")
private String powerLevel;
@ApiModelProperty(value = "")
private LocalDateTime lastUpdateTime;
@ApiModelProperty(value = "补偿pmpp")
private Float pmpp;
@ApiModelProperty(value = "订单名")
private String orderName;
@ApiModelProperty(value = "")
private Long binclassFl1;
@ApiModelProperty(value = "")
private Long binclassFl2;
@ApiModelProperty(value = "")
private Float etaFl1;
@ApiModelProperty(value = "")
private Float etaFl2;
@ApiModelProperty(value = "")
private Float ffFl1;
@ApiModelProperty(value = "")
private Float ffFl2;
@ApiModelProperty(value = "")
private Float imppFl1;
@ApiModelProperty(value = "")
private Float imppFl2;
@ApiModelProperty(value = "")
private Float insolflashcontrolFl1;
@ApiModelProperty(value = "")
private Float insolflashcontrolFl2;
@ApiModelProperty(value = "")
private Float insolmppFl1;
@ApiModelProperty(value = "")
private Float insolmppFl2;
@ApiModelProperty(value = "")
private Float insolvocFl1;
@ApiModelProperty(value = "")
private Float insolvocFl2;
@ApiModelProperty(value = "")
private Float insolFl1;
@ApiModelProperty(value = "")
private Float insolFl2;
@ApiModelProperty(value = "")
private Float iscFl1;
@ApiModelProperty(value = "")
private Float iscFl2;
@ApiModelProperty(value = "")
private LocalDateTime measTimeFl1;
@ApiModelProperty(value = "")
private LocalDateTime measTimeFl2;
@ApiModelProperty(value = "")
private Float pmppFl1;
@ApiModelProperty(value = "")
private Float pmppFl2;
@ApiModelProperty(value = "")
private Float tcellFl1;
@ApiModelProperty(value = "")
private Float tcellFl2;
@ApiModelProperty(value = "")
private Float tmonicellFl1;
@ApiModelProperty(value = "")
private Float tmonicellFl2;
@ApiModelProperty(value = "")
private Float umppFl1;
@ApiModelProperty(value = "")
private Float umppFl2;
@ApiModelProperty(value = "")
private Float uocFl1;
@ApiModelProperty(value = "")
private Float uocFl2;
}

5
ym-packing/src/main/java/com/cnbm/packing/entity/WoPackagingBox.java
View File

@@ -111,6 +111,9 @@ public class WoPackagingBox implements Serializable {
@ApiModelProperty("是否到达包装台，1=到达；2=未达到")
private Integer isArrived;
@ApiModelProperty("订单号")
private String orderNum;
public static final String ID = "ID";
@@ -170,4 +173,6 @@ public class WoPackagingBox implements Serializable {
public static final String IS_ARRIVED = "is_arrived";
public static final String ORDER_NUM = "ORDER_NUM";
}

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

@@ -72,6 +72,74 @@ public class WoPackagingBoxSubstrate implements Serializable {
@ApiModelProperty("功率等级")
private String powerLevel;
private LocalDateTime lastUpdateTime;
@ApiModelProperty("补偿pmpp")
private Float pmpp;
@ApiModelProperty("订单名")
private String orderName;
private Long binclassFl1;
private Long binclassFl2;
private Float etaFl1;
private Float etaFl2;
private Float ffFl1;
private Float ffFl2;
private Float imppFl1;
private Float imppFl2;
private Float insolflashcontrolFl1;
private Float insolflashcontrolFl2;
private Float insolmppFl1;
private Float insolmppFl2;
private Float insolvocFl1;
private Float insolvocFl2;
private Float insolFl1;
private Float insolFl2;
private Float iscFl1;
private Float iscFl2;
private LocalDateTime measTimeFl1;
private LocalDateTime measTimeFl2;
private Float pmppFl1;
private Float pmppFl2;
private Float tcellFl1;
private Float tcellFl2;
private Float tmonicellFl1;
private Float tmonicellFl2;
private Float umppFl1;
private Float umppFl2;
private Float uocFl1;
private Float uocFl2;
public static final String ID = "ID";
@@ -105,4 +173,71 @@ public class WoPackagingBoxSubstrate implements Serializable {
public static final String POWER_LEVEL = "POWER_LEVEL";
public static final String LAST_UPDATE_TIME = "LAST_UPDATE_TIME";
public static final String PMPP = "PMPP";
public static final String ORDER_NAME = "ORDER_NAME";
public static final String BINCLASS_FL1 = "BINCLASS_FL1";
public static final String BINCLASS_FL2 = "BINCLASS_FL2";
public static final String ETA_FL1 = "ETA_FL1";
public static final String ETA_FL2 = "ETA_FL2";
public static final String FF_FL1 = "FF_FL1";
public static final String FF_FL2 = "FF_FL2";
public static final String IMPP_FL1 = "IMPP_FL1";
public static final String IMPP_FL2 = "IMPP_FL2";
public static final String INSOLFLASHCONTROL_FL1 = "InsolFlashControl_FL1";
public static final String INSOLFLASHCONTROL_FL2 = "InsolFlashControl_FL2";
public static final String INSOLMPP_FL1 = "InsolMPP_FL1";
public static final String INSOLMPP_FL2 = "InsolMPP_FL2";
public static final String INSOLVOC_FL1 = "InsolVoc_FL1";
public static final String INSOLVOC_FL2 = "InsolVoc_FL2";
public static final String INSOL_FL1 = "Insol_FL1";
public static final String INSOL_FL2 = "Insol_FL2";
public static final String ISC_FL1 = "ISC_FL1";
public static final String ISC_FL2 = "ISC_FL2";
public static final String MEAS_TIME_FL1 = "MEAS_TIME_FL1";
public static final String MEAS_TIME_FL2 = "MEAS_TIME_FL2";
public static final String PMPP_FL1 = "PMPP_FL1";
public static final String PMPP_FL2 = "PMPP_FL2";
public static final String TCELL_FL1 = "Tcell_FL1";
public static final String TCELL_FL2 = "Tcell_FL2";
public static final String TMONICELL_FL1 = "Tmonicell_FL1";
public static final String TMONICELL_FL2 = "Tmonicell_FL2";
public static final String UMPP_FL1 = "UMPP_FL1";
public static final String UMPP_FL2 = "UMPP_FL2";
public static final String UOC_FL1 = "UOC_FL1";
public static final String UOC_FL2 = "UOC_FL2";
}

2
ym-packing/src/main/java/com/cnbm/packing/excel/WoPackagingBoxExcel.java
View File

@@ -74,5 +74,7 @@ public class WoPackagingBoxExcel {
private Integer model;
@Excel(name = "是否到达包装台，1=到达；2=未达到")
private Integer isArrived;
@Excel(name = "订单号")
private String orderNum;
}

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

@@ -48,5 +48,72 @@ public class WoPackagingBoxSubstrateExcel {
private Integer lineBody;
@Excel(name = "功率等级")
private String powerLevel;
@Excel(name = "")
private LocalDateTime lastUpdateTime;
@Excel(name = "补偿pmpp")
private Float pmpp;
@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;
}

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

@@ -1,6 +1,7 @@
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.common.page.PageData;
import com.cnbm.common.service.impl.CrudServiceImpl;
@@ -36,12 +37,6 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl<WoPac
@Autowired
private ChangePackagingBoxHistoryServiceBiz changePackagingBoxHistoryService;
@Resource
private WoPackagingBoxMapper woPackagingBoxMapper;
@Resource
private WoPackagingBoxSubstrateMapper woPackagingBoxSubstrateMapper;
@Override
public QueryWrapper<WoPackagingBoxSubstrate> getWrapper(Map<String, Object> params){
@@ -104,9 +99,14 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl<WoPac
changePackagingBoxHistory.setType(2);
changePackagingBoxHistoryService.insert(changePackagingBoxHistory);
//模组从该包装箱中移出，该模组变为未绑定BoxID的模组
entity.setPackagingBoxId(null);
entity.setSlot(null);
updateById(entity);
UpdateWrapper<WoPackagingBoxSubstrate> wrapper = new UpdateWrapper<>();
wrapper.set(WoPackagingBoxSubstrate.PACKAGING_BOX_ID,null);
wrapper.set(WoPackagingBoxSubstrate.SLOT,null);
wrapper.eq(WoPackagingBoxSubstrate.ID,entity.getId());
update(entity,wrapper);
// entity.setPackagingBoxId("");
// entity.setSlot(null);
// updateById(entity);
}
@Override