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

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