opt:提交修改bom木箱类型功能
This commit is contained in:
@@ -80,5 +80,11 @@ public class BstIvtStockingivtController {
|
||||
return new ResponseEntity<>(bstIvtStockingivtService.showDetail2(param), HttpStatus.OK);
|
||||
}
|
||||
|
||||
@Log("查询bom记录")
|
||||
@GetMapping("/showBom2")
|
||||
public ResponseEntity<Object> showBom2(@RequestParam Map param) {
|
||||
return new ResponseEntity<>(bstIvtStockingivtService.showBom2(param), HttpStatus.OK);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import org.nl.b_lms.bst.ivt.papervehicle.service.dao.MdPbPapervehicle;
|
||||
import org.nl.b_lms.bst.ivt.stockingivt.service.dao.BstIvtStockingivt;
|
||||
import org.nl.b_lms.bst.ivt.stockingivt.service.dto.ShowStockVo;
|
||||
import org.nl.b_lms.pdm.info.dao.PdmBiOrderbominfo;
|
||||
import org.nl.b_lms.sch.tasks.slitter.mapper.dto.BhTubeMovePointDto;
|
||||
import org.nl.b_lms.sch.tasks.slitter.mapper.dto.BhTubePointDto;
|
||||
import org.nl.common.domain.query.PageQuery;
|
||||
@@ -103,4 +104,6 @@ public interface IBstIvtStockingivtService extends IService<BstIvtStockingivt> {
|
||||
List<List<ShowStockVo>> showDetail(JSONObject param);
|
||||
|
||||
List<MdPbPapervehicle> showDetail2(Map param);
|
||||
|
||||
PdmBiOrderbominfo showBom2(Map param);
|
||||
}
|
||||
|
||||
@@ -15,6 +15,8 @@ import org.nl.b_lms.bst.ivt.stockingivt.service.IBstIvtStockingivtService;
|
||||
import org.nl.b_lms.bst.ivt.stockingivt.service.dao.BstIvtStockingivt;
|
||||
import org.nl.b_lms.bst.ivt.stockingivt.service.dao.mapper.BstIvtStockingivtMapper;
|
||||
import org.nl.b_lms.bst.ivt.stockingivt.service.dto.ShowStockVo;
|
||||
import org.nl.b_lms.pdm.info.dao.PdmBiOrderbominfo;
|
||||
import org.nl.b_lms.pdm.info.service.IPdmBiOrderbominfoService;
|
||||
import org.nl.b_lms.sch.tasks.slitter.constant.SlitterConstant;
|
||||
import org.nl.b_lms.sch.tasks.slitter.mapper.dto.BhTubeMovePointDto;
|
||||
import org.nl.b_lms.sch.tasks.slitter.mapper.dto.BhTubePointDto;
|
||||
@@ -52,6 +54,8 @@ public class BstIvtStockingivtServiceImpl extends ServiceImpl<BstIvtStockingivtM
|
||||
private WmsToAcsService wmsToAcsService;
|
||||
@Autowired
|
||||
private MaterialbaseService materialbaseService;
|
||||
@Autowired
|
||||
private IPdmBiOrderbominfoService pdmBiOrderbominfoService;
|
||||
|
||||
@Override
|
||||
public IPage<BstIvtStockingivt> queryAll(Map whereJson, PageQuery page) {
|
||||
@@ -351,4 +355,12 @@ public class BstIvtStockingivtServiceImpl extends ServiceImpl<BstIvtStockingivtM
|
||||
.orderByAsc(MdPbPapervehicle::getRow_num));
|
||||
return papers;
|
||||
}
|
||||
@Override
|
||||
public PdmBiOrderbominfo showBom2(Map param){
|
||||
String mfg_order_name = String.valueOf(param.get("mfg_order_name"));
|
||||
LambdaQueryWrapper<PdmBiOrderbominfo> lam = new LambdaQueryWrapper<>();
|
||||
lam.eq(PdmBiOrderbominfo::getMfgOrder,mfg_order_name);
|
||||
PdmBiOrderbominfo order = pdmBiOrderbominfoService.getOne(lam);
|
||||
return order;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -67,4 +67,18 @@ public class MdpbBoxtypeController {
|
||||
return new ResponseEntity<>(HttpStatus.OK);
|
||||
}
|
||||
|
||||
@PostMapping("/confirmBox")
|
||||
@Log("保存bom")
|
||||
public ResponseEntity<Object> confirmBox(@RequestBody JSONObject whereJson) {
|
||||
iMdpbBoxtypeService.confirmBox(whereJson);
|
||||
return new ResponseEntity<>(HttpStatus.OK);
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("/getBoxTypes")
|
||||
@Log("查询木箱类型")
|
||||
public ResponseEntity<Object> query(@RequestParam Map whereJson) {
|
||||
return new ResponseEntity<>(iMdpbBoxtypeService.list(), HttpStatus.OK);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -50,4 +50,10 @@ public interface IMdpbBoxtypeService extends IService<MdpbBoxtype> {
|
||||
* @param whereJson: {需要修改的参数}
|
||||
*/
|
||||
void confirmUpdate(JSONObject whereJson);
|
||||
|
||||
/**
|
||||
* 一键修改
|
||||
* @param whereJson: {需要修改的参数}
|
||||
*/
|
||||
void confirmBox(JSONObject whereJson);
|
||||
}
|
||||
|
||||
@@ -9,11 +9,14 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import org.nl.b_lms.pdm.info.dao.PdmBiOrderbominfo;
|
||||
import org.nl.b_lms.pdm.info.service.IPdmBiOrderbominfoService;
|
||||
import org.nl.b_lms.storage_manage.database.service.IMdpbBoxtypeService;
|
||||
import org.nl.b_lms.storage_manage.database.service.dao.MdpbBoxtype;
|
||||
import org.nl.b_lms.storage_manage.database.service.dao.mapper.MdpbBoxtypeMapper;
|
||||
import org.nl.common.domain.query.PageQuery;
|
||||
import org.nl.modules.common.exception.BadRequestException;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
@@ -31,6 +34,8 @@ import java.util.Set;
|
||||
@Service
|
||||
public class MdpbBoxtypeServiceImpl extends ServiceImpl<MdpbBoxtypeMapper, MdpbBoxtype> implements IMdpbBoxtypeService {
|
||||
|
||||
@Autowired
|
||||
private IPdmBiOrderbominfoService pdmBiOrderbominfoService;
|
||||
@Override
|
||||
public IPage<MdpbBoxtype> queryAll(Map whereJson, PageQuery page) {
|
||||
// 查询条件
|
||||
@@ -81,4 +86,23 @@ public class MdpbBoxtypeServiceImpl extends ServiceImpl<MdpbBoxtypeMapper, MdpbB
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void confirmBox(JSONObject whereJson) {
|
||||
if (ObjectUtil.isEmpty(whereJson.getString("mfgOrder"))) {
|
||||
throw new BadRequestException("bom 订单号不能为空!");
|
||||
}
|
||||
if (ObjectUtil.isEmpty(whereJson.getString("productName"))) {
|
||||
throw new BadRequestException("bom 木箱编码不能为空!");
|
||||
}
|
||||
MdpbBoxtype boxtype = this.getById(whereJson.getString("productName"));
|
||||
if (ObjectUtil.isEmpty(boxtype)) {
|
||||
throw new BadRequestException("木箱编码:"+whereJson.getString("productName")+"查询木箱类型失败!");
|
||||
}
|
||||
pdmBiOrderbominfoService.update(new UpdateWrapper<PdmBiOrderbominfo>().lambda()
|
||||
.eq(PdmBiOrderbominfo::getMfgOrder,whereJson.getString("mfgOrder"))
|
||||
.set(PdmBiOrderbominfo::getProductName, whereJson.getString("productName"))
|
||||
.set(PdmBiOrderbominfo::getDescription, boxtype.getBox_name())
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user