From d145c704d4cdd8f6afad234d2c2914475bb4db7f Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期四, 17 八月 2023 09:23:05 +0800
Subject: [PATCH] gitignore
---
server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java | 88 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 85 insertions(+), 3 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java
index 8ec0cff..ffb5760 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java
@@ -83,6 +83,10 @@
private MaterialExtMapper materialExtMapper;
@Autowired
private SalaryParamMapper salaryParamMapper;
+ @Autowired
+ private PlansExtMapper plansExtMapper;
+ @Autowired
+ private DeviceExtMapper deviceExtMapper;
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
@Override
@@ -188,6 +192,14 @@
return mp;
}
+ private void getPlansAndValid(LoginUserInfo user, Plans mp) throws BusinessException{
+ if(mp== null){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "瀵逛笉璧凤紝璇ヨ褰曚笉瀛樺湪锛�");
+ }
+ if(Constants.equalsInteger(mp.getPaused(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝宸ュ崟宸叉殏鍋滐紒");
+ }
+ }
private QueryBomDetailExtDTO initBomParam(LoginUserInfo user, Workorder mp) throws BusinessException{
QueryBomExtDTO bb = new QueryBomExtDTO();
@@ -207,6 +219,27 @@
bom.setBomId(versionBom.getBomVersionId());
// bom.setProcedureId(mp.getProcedureId());
bom.setWorkorderId(mp.getId());
+ return bom;
+ }
+
+ private QueryBomDetailExtDTO initBomParamForPlans(LoginUserInfo user, Plans plans) throws BusinessException{
+ QueryBomExtDTO bb = new QueryBomExtDTO();
+ bb.setDepartId(plans.getDepartId());
+ bb.setDeleted(Constants.ZERO);
+ bb.setRootDepartId(user.getRootDepartment().getId());
+ bb.setMaterialId(plans.getMaterialId());
+ bb.setProcedureId(plans.getProcedureId());
+ BomExtListVO versionBom = bomExtMapper.selectByModel( bb);
+ if(versionBom == null || StringUtils.isBlank(versionBom.getVersion()) || versionBom.getBomVersionId() == null){
+ return null;
+ // throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "瀵逛笉璧凤紝璇ュ伐鍗曠墿鏂橞OM淇℃伅閰嶇疆鏈夎锛岃鑱旂郴绠＄悊鍛橈紒");
+ }
+ plans.setBomModel(versionBom);
+ QueryBomDetailExtDTO bom = new QueryBomDetailExtDTO();
+ bom.setDeleted(Constants.ZERO);
+ bom.setBomId(versionBom.getBomVersionId());
+// bom.setProcedureId(mp.getProcedureId());
+ bom.setPlansId(plans.getId());
return bom;
}
@@ -281,7 +314,6 @@
}
private void updateOrderInfo(LoginUserInfo user, Workorder mp,int status) {
-
List<WorkorderHistory> whList = new ArrayList<>();
//宸ュ崟鍘嗗彶鏁版嵁
Workorder order = new Workorder();
@@ -299,7 +331,7 @@
order.setStatus(Constants.WORKORDER_STATUS.material);
}else if(status ==Constants.WORKORDER_HISTORY_STATUS.done){
order.setStatus(Constants.WORKORDER_STATUS.done);
- }else if(status ==Constants.WORKORDER_HISTORY_STATUS.material){
+ }else if(status ==Constants.WORKORDER_HISTORY_STATUS.material ||status ==Constants.WORKORDER_HISTORY_STATUS.produce){
//鎶曟枡鎿嶄綔
if(Constants.equalsInteger(mp.getStatus(),Constants.WORKORDER_STATUS.create)
||Constants.equalsInteger(mp.getStatus(),Constants.WORKORDER_STATUS.material)){
@@ -1111,7 +1143,52 @@
return PageData.from(new PageInfo<>(result));
}
-
+ @Override
+ public PageData<WStockExtListVO> choiceStockPageForPlans(PageWrap<QueryWStockDto> pageWrap,LoginUserInfo userInfo) {
+ Plans plans =plansExtMapper.selectById(pageWrap.getModel().getPlansId());
+ if(Objects.isNull(plans)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝鏈煡璇㈠埌宸ュ簭璁″垝淇℃伅锛�");
+ }
+ Device device = deviceExtMapper.selectById(pageWrap.getModel().getDeviceId());
+ if(Objects.isNull(plans)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝鏈煡璇㈠埌璁惧淇℃伅锛�");
+ }
+ //鏌ヨ骞堕獙璇佸伐鍗曚俊鎭�
+ this.getPlansAndValid(userInfo,plans);
+ //鏌ヨ鍏ㄩ儴bom缁勬垚鏁版嵁锛屽鏋滄湁BOM閰嶇疆锛屾寜鐓OM缁勬垚杩涜鎶曟枡锛屽鏋滄病鏈塀OM閰嶇疆锛屽垯鎶曟枡鐗╂枡涓哄緟鐢熶骇搴撲綅鐨勭墿鏂欐湰韬�
+ QueryBomDetailExtDTO bdparam = initBomParamForPlans(userInfo,plans);
+ List<BomDetailExtListVO> bomDetailList = null;
+ if(bdparam!=null){
+ bomDetailList = bomDetailExtMapper.selectList(bdparam);
+ List<Integer> materialDistributeId = bomDetailList.stream().map(BomDetailExtListVO::getMaterialId).collect(Collectors.toList());
+ pageWrap.getModel().setMaterialDistributeId(materialDistributeId);
+ }else{
+ //鏌ヨ鐗╂枡BOM淇℃伅
+ Bom bom = bomExtMapper.selectOne(new QueryWrapper<Bom>().eq("MATERIAL_ID",plans.getMaterialId()).eq("DELETED",Constants.ZERO).last(" limit 1 "));
+ if(Objects.isNull(bom)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝鏈煡璇㈠埌BOM淇℃伅锛�");
+ }
+ RouteProcedure currentRouteProcedure = routeProcedureExtMapper.selectOne(new QueryWrapper<RouteProcedure>()
+ .eq("ROUTE_ID",bom.getRouteId())
+ .eq("PROCEDURE_ID",plans.getProcedureId())
+ .last(" limit 1 ")
+ );
+ if(currentRouteProcedure!=null){
+ RouteProcedure routeProcedure = routeProcedureExtMapper.selectOne(new QueryWrapper<RouteProcedure>()
+ .eq("ROUTE_ID",currentRouteProcedure.getRouteId()).apply(" SORTNUM < " + currentRouteProcedure.getSortnum() ).eq("STATUS",Constants.ONE).orderByDesc(" SORTNUM ").last(" limit 1 ")
+ );
+ if(Objects.isNull(routeProcedure)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "瀵逛笉璧凤紝鏈煡璇㈠埌鐢熶骇鐗╂枡涓婁竴姝ュ伐搴忎俊鎭紒");
+ }
+ pageWrap.getModel().setProcedureId(routeProcedure.getProcedureId());
+ pageWrap.getModel().setMaterialId(plans.getMaterialId());
+ }
+ }
+ pageWrap.getModel().setLocationId(device.getProduceWarehouseLocationId());
+ PageHelper.startPage(pageWrap.getPage(), pageWrap.getCapacity());
+ List<WStockExtListVO> result = wStockExtMapper.choiceStockList(pageWrap.getModel());
+ return PageData.from(new PageInfo<>(result));
+ }
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
@@ -1180,8 +1257,13 @@
workorderRecord.setSalary(BigDecimal.valueOf(createWorkorderRecordDTO.getDuration()).multiply(salaryParam.getSalary()).divide(new BigDecimal(3600)));
}
+ //鎻掑叆宸ュ崟鎿嶄綔璁板綍锛屽苟涓斿垽鏂槸鍚︽洿鏀逛负宸ュ崟鐨勭姸鎬併�愮敓浜т腑銆�
+ updateOrderInfo(loginUserInfo,workorder,Constants.WORKORDER_HISTORY_STATUS.produce);
workorderRecordExtMapper.insert(workorderRecord);
return workorderRecord;
}
+
+
+
}
--
Gitblit v1.9.3