From 5f1edfec21b921ec885b40b0a86c7ffe4aa5a7de Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期一, 15 九月 2025 11:52:06 +0800
Subject: [PATCH] 齐套性检查排除已检查过且齐套的物料
---
src/main/java/org/jeecg/modules/mes/service/impl/MesProductionWorkOrderServiceImpl.java | 102 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 97 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/mes/service/impl/MesProductionWorkOrderServiceImpl.java b/src/main/java/org/jeecg/modules/mes/service/impl/MesProductionWorkOrderServiceImpl.java
index 2b407ff..62f19b8 100644
--- a/src/main/java/org/jeecg/modules/mes/service/impl/MesProductionWorkOrderServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/mes/service/impl/MesProductionWorkOrderServiceImpl.java
@@ -7,8 +7,10 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang.StringUtils;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.base.entity.Factory;
import org.jeecg.modules.base.entity.LineSideWarehouse;
import org.jeecg.modules.base.entity.Shift;
@@ -17,17 +19,22 @@
import org.jeecg.modules.base.service.ILineSideWarehouseService;
import org.jeecg.modules.base.service.IShiftGroupService;
import org.jeecg.modules.base.service.IShiftService;
+import org.jeecg.modules.lsw.entity.LswMaterial;
import org.jeecg.modules.lsw.entity.LswMaterialInventory;
+import org.jeecg.modules.lsw.enums.MaterialCategoryEnum;
import org.jeecg.modules.lsw.service.ILswMaterialInventoryService;
+import org.jeecg.modules.lsw.service.ILswMaterialService;
import org.jeecg.modules.lsw.vo.LswMaterialInventoryVo;
import org.jeecg.modules.mes.dto.MesProductionWorkScheduleRequest;
import org.jeecg.modules.mes.entity.MesKittingCompletenessCheck;
import org.jeecg.modules.mes.entity.MesProductionOrder;
import org.jeecg.modules.mes.enums.ProductionOrderStatus;
+import org.jeecg.modules.mes.service.IMesKittingCompletenessCheckService;
import org.jeecg.modules.mes.service.IMesProductionOrderService;
import org.jeecg.modules.mes.service.IMesProductionWorkOrderService;
import org.jeecg.modules.mes.entity.MesProductionWorkOrder;
import org.jeecg.modules.mes.mapper.MesProductionWorkOrderMapper;
+import org.jeecg.modules.mes.utils.CommonUtils;
import org.jeecg.modules.pms.entity.PmsProcessBillMaterials;
import org.jeecg.modules.pms.entity.PmsProcessBillMaterialsDetail;
import org.jeecg.modules.pms.service.IPmsProcessBillMaterialsDetailService;
@@ -65,9 +72,13 @@
@Autowired
private IPmsProcessBillMaterialsDetailService pmsProcessBillMaterialsDetailService;
@Autowired
+ private ILswMaterialService lswMaterialService;
+ @Autowired
private ILswMaterialInventoryService lswMaterialInventoryService;
@Autowired
private ILineSideWarehouseService lineSideWarehouseService;
+ @Autowired
+ private IMesKittingCompletenessCheckService mesKittingCompletenessCheckService;
@Override
public List<MesProductionWorkOrder> schedule(MesProductionWorkScheduleRequest request) {
@@ -77,6 +88,9 @@
.eq(ShiftGroup::getFactoryId, request.getFactoryId())
.eq(ShiftGroup::getDelFlag, CommonConstant.DEL_FLAG_0))
.stream().collect(Collectors.toMap(ShiftGroup::getShiftId, v1 -> v1, (v1, v2) -> v1));
+ if (shiftGroupMap.isEmpty()) {
+ throw new JeecgBootException("璇ヤ骇绾夸笅鏈缃彮缁勶紝鏃犳硶鎺掍骇锛�");
+ }
Factory factory = factoryService.getById(request.getFactoryId());
Map<String, Shift> shiftNameMap = new HashMap<>();
List<Shift> shifts = shiftService.list(new LambdaQueryWrapper<Shift>()
@@ -90,6 +104,16 @@
.limit(ChronoUnit.DAYS.between(startDate, endDate) + 1)
.collect(Collectors.toList());
List<MesProductionWorkOrder> newProductionWorkOrderList = CollectionUtil.newArrayList();
+ String materialNumber = request.getMaterialNumber();
+ BigDecimal planQuantity = request.getPlanQuantity();
+ if (StringUtils.isNotBlank(materialNumber)) {
+ LswMaterial material = lswMaterialService.list(new LambdaQueryWrapper<LswMaterial>()
+ .eq(LswMaterial::getMaterialNumber, materialNumber)
+ .eq(LswMaterial::getDelFlag, CommonConstant.DEL_FLAG_0)
+ .eq(LswMaterial::getMaterialStatus, CommonConstant.STATUS_1))
+ .stream().findFirst().orElse(null);
+ request.setMaterialName(Objects.requireNonNull(material).getMaterialName());
+ }
for (LocalDate date : dateRange) {
for (String shiftId : shiftGroupMap.keySet()) {
@@ -112,7 +136,10 @@
.setShiftName(shiftNameMap.get(shiftId).getShiftName())
.setGroupId(shiftGroup.getId())
.setGroupName(shiftGroup.getGroupName())
- .setWorkOrderDate(workOrderDate);
+ .setWorkOrderDate(workOrderDate)
+ .setMaterialNumber(StringUtils.isNotBlank(materialNumber) ? materialNumber : "")
+ .setMaterialName(StringUtils.isNotBlank(materialNumber) ? request.getMaterialName() : "")
+ .setPlanQuantity(Objects.nonNull(planQuantity) ? planQuantity : null);
newProductionWorkOrderList.add(mesProductionWorkOrder);
}
@@ -123,7 +150,10 @@
MesProductionWorkOrder mesProductionWorkOrder = new MesProductionWorkOrder()
.setFactoryId(factory.getId())
.setFactoryCode(factory.getFactoryCode())
- .setFactoryName(factory.getFactoryName());
+ .setFactoryName(factory.getFactoryName())
+ .setMaterialNumber(StringUtils.isNotBlank(materialNumber) ? materialNumber : "")
+ .setMaterialName(StringUtils.isNotBlank(materialNumber) ? request.getMaterialName() : "")
+ .setPlanQuantity(Objects.nonNull(planQuantity) ? planQuantity : null);;
newProductionWorkOrderList.add(mesProductionWorkOrder);
}
return newProductionWorkOrderList;
@@ -132,9 +162,27 @@
@Override
public IPage<MesProductionWorkOrder> queryPageList(Page<MesProductionWorkOrder> page, Map<String, String[]> parameterMap) {
QueryWrapper<MesProductionWorkOrder> queryWrapper = Wrappers.query();
+
+ LoginUser loginUser = CommonUtils.getCurrentUser();
+ if (loginUser == null) {
+ return page;
+ }
+ queryWrapper.exists("select 1 from base_user_factory t where t.user_id = {0} and t.factory_id = t1.factory_id", loginUser.getId());
String[] factoryIds = parameterMap.get("factoryId");
if (factoryIds != null && factoryIds.length > 0) {
queryWrapper.eq("t1.factory_id", factoryIds[0]);
+ }
+ String[] materialNumbers = parameterMap.get("materialNumber");
+ if (materialNumbers != null && materialNumbers.length > 0) {
+ queryWrapper.like("t1.material_number", materialNumbers[0]);
+ }
+ String[] materialNames = parameterMap.get("materialName");
+ if (materialNames != null && materialNames.length > 0) {
+ queryWrapper.like("t1.material_name", materialNames[0]);
+ }
+ String[] workOrderCodes = parameterMap.get("workOrderCode");
+ if (workOrderCodes != null && workOrderCodes.length > 0) {
+ queryWrapper.like("t1.work_order_code", workOrderCodes[0]);
}
String[] startDates = parameterMap.get("startDate");
String[] endDates = parameterMap.get("endDate");
@@ -189,14 +237,25 @@
List<String> bomMaterialNumberList = processBillMaterialsDetails.stream()
.map(PmsProcessBillMaterialsDetail::getMaterialNumber).collect(Collectors.toList());
Map<String, LswMaterialInventoryVo> lswMaterialInventoryMap = lswMaterialInventoryService
- .selectLineSideMaterialInventoryByMaterialNumber(bomMaterialNumberList, lineSideWarehouse.getId()).stream()
+ .selectLineSideMaterialInventoryByMaterialNumber(bomMaterialNumberList, lineSideWarehouse.getId(), null).stream()
.collect(Collectors.toMap(LswMaterialInventoryVo::getMaterialNumber, v1 -> v1, (v1, v2) -> v1));
List<MesKittingCompletenessCheck> completenessCheckResultList = CollectionUtil.newArrayList();
+ //鏌ヨ鏄惁鏈夐綈濂楁鏌ヨ褰曪紙宸查綈澶囩殑锛�
+ List<String> checkedMaterialNumberList = mesKittingCompletenessCheckService.list(new LambdaQueryWrapper<MesKittingCompletenessCheck>()
+ .eq(MesKittingCompletenessCheck::getWorkOrderId, workOrder.getId())
+ .in(MesKittingCompletenessCheck::getMaterialNumber, bomMaterialNumberList)
+ .eq(MesKittingCompletenessCheck::getCheckFlag, CommonConstant.DEFAULT_1))
+ .stream().map(MesKittingCompletenessCheck::getMaterialNumber).collect(Collectors.toList());
//鏍规嵁璁㈠崟BOM鏄庣粏鍒楀嚭榻愬妫�鏌ョ粨鏋�
for (PmsProcessBillMaterialsDetail processBillMaterialsDetail : processBillMaterialsDetails) {
- LswMaterialInventoryVo materialInventoryVo = lswMaterialInventoryMap.get(processBillMaterialsDetail.getMaterialNumber());
+ String materialNumber = processBillMaterialsDetail.getMaterialNumber();
+ if (checkedMaterialNumberList.contains(materialNumber)) {
+ //濡傛灉宸茬粡鍋氳繃榻愬鎬ф鏌ワ紝骞朵笖榻愬锛屽氨蹇界暐鎺�
+ continue;
+ }
+ LswMaterialInventoryVo materialInventoryVo = lswMaterialInventoryMap.get(materialNumber);
MesKittingCompletenessCheck completenessCheckItem = new MesKittingCompletenessCheck()
- .setMaterialNumber(processBillMaterialsDetail.getMaterialNumber())
+ .setMaterialNumber(materialNumber)
.setMaterialName(processBillMaterialsDetail.getMaterialName())
//闇�姹傛暟閲� = (bom鏄庣粏鐨勯渶姹傛暟閲� / bom璁㈠崟鐨勬暟閲�) * 鎺掍骇宸ュ崟璁″垝鐢熶骇鏁伴噺
.setRequiredQuantity(processBillMaterialsDetail.getUsageQuantity()
@@ -215,4 +274,37 @@
});
return completenessCheckResultList;
}
+
+ @Override
+ public List<MesKittingCompletenessCheck> workOrderCompletenessCheckOnHeatTreatment(MesProductionWorkOrder workOrder) {
+ //鏌ヨ宸ュ崟鎵�灞炰骇绾垮搴旂殑绾胯竟浠�
+ LineSideWarehouse lineSideWarehouse = lineSideWarehouseService.list(new LambdaQueryWrapper<LineSideWarehouse>()
+ .eq(LineSideWarehouse::getFactoryId, workOrder.getFactoryId())
+ .eq(LineSideWarehouse::getDelFlag, CommonConstant.DEL_FLAG_0)
+ .eq(LineSideWarehouse::getWarehouseStatus, CommonConstant.DEFAULT_1))
+ .stream().findFirst().orElse(null);
+ if (lineSideWarehouse == null) {
+ throw new JeecgBootException("璇ヤ骇绾挎湭閰嶇疆绾胯竟浠擄紒");
+ }
+ //鏌ヨ宸ュ崟鐑鐞嗙墿鏂欏搴旀瘺鍧湪绾胯竟浠撶殑搴撳瓨
+ LswMaterialInventoryVo materialInventoryVo = lswMaterialInventoryService.selectLineSideMaterialInventoryByMaterialNumber(Collections
+ .singletonList(workOrder.getMaterialNumber()), lineSideWarehouse.getId(), CommonConstant.DEFAULT_0)
+ .stream().findFirst().orElse(null);
+ if (materialInventoryVo == null) {
+ throw new JeecgBootException("绾胯竟搴撶墿鏂欎笉瀛樺湪锛�");
+ }
+ MesKittingCompletenessCheck completenessCheck = new MesKittingCompletenessCheck()
+ .setMaterialNumber(materialInventoryVo.getMaterialNumber())
+ .setMaterialName(materialInventoryVo.getMaterialName())
+ .setRequiredQuantity(workOrder.getPlanQuantity())
+ .setActualQuantity(materialInventoryVo.getStockQuantity())
+ .setProductionUnit("PC")
+ .setCheckFlag(materialInventoryVo.getStockQuantity().compareTo(workOrder.getPlanQuantity()) > 0 ? CommonConstant.DEFAULT_1 : CommonConstant.DEFAULT_0);
+ return Collections.singletonList(completenessCheck);
+ }
+
+ @Override
+ public IPage<MesProductionWorkOrder> queryWorkOrderByTransfer(Page<MesProductionWorkOrder> page) {
+ return this.getBaseMapper().queryWorkOrderByTransfer(page);
+ }
}
--
Gitblit v1.9.3