From af0f58e4b39a363b73587fa1b4cce7be46e203f5 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期五, 12 九月 2025 15:07:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/pms/mapper/PmsProcessBillMaterialsDetailMapper.java | 8 ++++
src/main/java/org/jeecg/modules/pms/service/impl/PmsProcessBillMaterialsDetailServiceImpl.java | 7 +++
src/main/java/org/jeecg/modules/mes/service/impl/MesProductionWorkOrderServiceImpl.java | 5 ++
src/main/java/org/jeecg/modules/mes/controller/MesProductionWorkOrderController.java | 25 ++++++++++--
src/main/java/org/jeecg/modules/pms/mapper/xml/PmsProcessBillMaterialsDetailMapper.xml | 5 ++
src/main/java/org/jeecg/modules/mes/mapper/MesProductionWorkOrderMapper.java | 12 ++++--
src/main/java/org/jeecg/modules/mes/mapper/xml/MesProductionWorkOrderMapper.xml | 10 +++++
src/main/java/org/jeecg/modules/mes/service/IMesProductionWorkOrderService.java | 7 +++
8 files changed, 70 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/mes/controller/MesProductionWorkOrderController.java b/src/main/java/org/jeecg/modules/mes/controller/MesProductionWorkOrderController.java
index 302d513..3f248b6 100644
--- a/src/main/java/org/jeecg/modules/mes/controller/MesProductionWorkOrderController.java
+++ b/src/main/java/org/jeecg/modules/mes/controller/MesProductionWorkOrderController.java
@@ -37,6 +37,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
@@ -174,8 +175,8 @@
public Result<String> publish(@RequestParam("ids") String ids) {
List<String> idList = Arrays.asList(ids.split(","));
List<MesProductionWorkOrder> list = mesProductionWorkOrderService.list(new LambdaQueryWrapper<MesProductionWorkOrder>()
- .in(MesProductionWorkOrder::getId, idList)
- .eq(MesProductionWorkOrder::getDelFlag, CommonConstant.DEL_FLAG_0)).stream()
+ .in(MesProductionWorkOrder::getId, idList)
+ .eq(MesProductionWorkOrder::getDelFlag, CommonConstant.DEL_FLAG_0)).stream()
.filter(i -> !ProductionWorkOrderStatus.NEW.name().equals(i.getWorkOrderStatus()))
.collect(Collectors.toList());
if (!list.isEmpty()) {
@@ -195,7 +196,7 @@
}
@AutoLog(value = "鎺掍骇宸ュ崟-閲嶅彂甯冩帓浜ц鍒�")
- @ApiOperation(value="鎺掍骇宸ュ崟-閲嶅彂甯冩帓浜ц鍒�", notes="閲嶅彂甯冩帓浜ц鍒�")
+ @ApiOperation(value = "鎺掍骇宸ュ崟-閲嶅彂甯冩帓浜ц鍒�", notes = "閲嶅彂甯冩帓浜ц鍒�")
//@RequiresPermissions("org.jeecg.modules:mes_production_work_order:republish")
@PostMapping(value = "/republish")
public Result<String> republish(@RequestBody MesProductionWorkOrderRepublishRequest request) {
@@ -215,7 +216,7 @@
}
@AutoLog(value = "鎺掍骇宸ュ崟-榻愬鎬ф鏌�")
- @ApiOperation(value="鎺掍骇宸ュ崟-榻愬鎬ф鏌�", notes="榻愬鎬ф鏌�")
+ @ApiOperation(value = "鎺掍骇宸ュ崟-榻愬鎬ф鏌�", notes = "榻愬鎬ф鏌�")
//@RequiresPermissions("org.jeecg.modules:mes_production_work_order:workOrderCompletenessCheck")
@GetMapping(value = "/workOrderCompletenessCheck")
public Result<List<MesKittingCompletenessCheck>> workOrderCompletenessCheck(@RequestParam("id") String id) {
@@ -443,4 +444,20 @@
return super.importExcel(request, response, MesProductionWorkOrder.class);
}
+ /**
+ * 鐗╂枡鎷夊姩閫夋嫨鎺掍骇宸ュ崟鍒楄〃鏌ヨ
+ *
+ * @param pageNo
+ * @param pageSize
+ * @return
+ */
+ @ApiOperation(value = "鎺掍骇宸ュ崟-鐗╂枡鎷夊姩宸ュ崟鍒楄〃", notes = "鎺掍骇宸ュ崟-鐗╂枡鎷夊姩宸ュ崟鍒楄〃")
+ @GetMapping(value = "/queryWorkOrderByTransfer")
+ public Result<IPage<MesProductionWorkOrder>> queryWorkOrderByTransfer(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+ Page<MesProductionWorkOrder> page = new Page<>(pageNo, pageSize);
+ IPage<MesProductionWorkOrder> pageList = mesProductionWorkOrderService.queryWorkOrderByTransfer(page);
+ return Result.OK(pageList);
+ }
+
}
diff --git a/src/main/java/org/jeecg/modules/mes/mapper/MesProductionWorkOrderMapper.java b/src/main/java/org/jeecg/modules/mes/mapper/MesProductionWorkOrderMapper.java
index 4e24e14..33e05ea 100644
--- a/src/main/java/org/jeecg/modules/mes/mapper/MesProductionWorkOrderMapper.java
+++ b/src/main/java/org/jeecg/modules/mes/mapper/MesProductionWorkOrderMapper.java
@@ -1,15 +1,12 @@
package org.jeecg.modules.mes.mapper;
-import java.util.List;
-
import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.mes.entity.MesProductionWorkOrder;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* @Description: 鎺掍骇宸ュ崟
@@ -21,4 +18,11 @@
IPage<MesProductionWorkOrder> queryPageList(Page<MesProductionWorkOrder> page,
@Param(Constants.WRAPPER) Wrapper<MesProductionWorkOrder> queryWrapper);
+
+ /**
+ * 鐗╂枡鎷夊姩宸ュ崟鏌ヨ
+ * @param page
+ * @return
+ */
+ IPage<MesProductionWorkOrder> queryWorkOrderByTransfer(Page<MesProductionWorkOrder> page);
}
diff --git a/src/main/java/org/jeecg/modules/mes/mapper/xml/MesProductionWorkOrderMapper.xml b/src/main/java/org/jeecg/modules/mes/mapper/xml/MesProductionWorkOrderMapper.xml
index d314f2e..d0edb60 100644
--- a/src/main/java/org/jeecg/modules/mes/mapper/xml/MesProductionWorkOrderMapper.xml
+++ b/src/main/java/org/jeecg/modules/mes/mapper/xml/MesProductionWorkOrderMapper.xml
@@ -15,4 +15,14 @@
LEFT JOIN base_shift t3 ON t1.shift_id = t3.id
${ew.customSqlSegment}
</select>
+
+ <select id="queryWorkOrderByTransfer" resultType="org.jeecg.modules.mes.entity.MesProductionWorkOrder">
+ SELECT t1.*
+ FROM mes_production_work_order t1
+ LEFT JOIN base_factory t2 ON t1.factory_id = t2.id
+ where t1.work_order_status = 'PUBLISHED'
+ and t2.production_type in ('ASSEMBLE', 'HEATTREATMENT')
+ and t1.plan_quantity > 0
+ order by t1.create_time desc
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/java/org/jeecg/modules/mes/service/IMesProductionWorkOrderService.java b/src/main/java/org/jeecg/modules/mes/service/IMesProductionWorkOrderService.java
index 1c64a6e..84d3d0f 100644
--- a/src/main/java/org/jeecg/modules/mes/service/IMesProductionWorkOrderService.java
+++ b/src/main/java/org/jeecg/modules/mes/service/IMesProductionWorkOrderService.java
@@ -25,4 +25,11 @@
List<MesKittingCompletenessCheck> workOrderCompletenessCheck(MesProductionWorkOrder workOrder);
List<MesKittingCompletenessCheck> workOrderCompletenessCheckOnHeatTreatment(MesProductionWorkOrder workOrder);
+
+ /**
+ * 鐗╂枡鎷夊姩宸ュ崟鏌ヨ
+ * @param page
+ * @return
+ */
+ IPage<MesProductionWorkOrder> queryWorkOrderByTransfer(Page<MesProductionWorkOrder> page);
}
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 d41417c..6c024fc 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
@@ -288,4 +288,9 @@
.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);
+ }
}
diff --git a/src/main/java/org/jeecg/modules/pms/mapper/PmsProcessBillMaterialsDetailMapper.java b/src/main/java/org/jeecg/modules/pms/mapper/PmsProcessBillMaterialsDetailMapper.java
index 319825a..c57da93 100644
--- a/src/main/java/org/jeecg/modules/pms/mapper/PmsProcessBillMaterialsDetailMapper.java
+++ b/src/main/java/org/jeecg/modules/pms/mapper/PmsProcessBillMaterialsDetailMapper.java
@@ -24,4 +24,12 @@
* @return
*/
List<PmsProcessBillMaterialsDetail> queryByMaterialNumber(String materialNumber);
+
+ /**
+ * 鐗╂枡鎷夊姩閫夋嫨鐗╂枡浣跨敤
+ * 鏍规嵁鐑鐞嗘瘺鍧墿鏂欐煡璇�
+ * @param materialNumber 鐑鐞嗙墿鏂欑紪鐮�
+ * @return
+ */
+ List<PmsProcessBillMaterialsDetail> queryByMaterialNumberOnly(String materialNumber);
}
diff --git a/src/main/java/org/jeecg/modules/pms/mapper/xml/PmsProcessBillMaterialsDetailMapper.xml b/src/main/java/org/jeecg/modules/pms/mapper/xml/PmsProcessBillMaterialsDetailMapper.xml
index c569fbd..da3039d 100644
--- a/src/main/java/org/jeecg/modules/pms/mapper/xml/PmsProcessBillMaterialsDetailMapper.xml
+++ b/src/main/java/org/jeecg/modules/pms/mapper/xml/PmsProcessBillMaterialsDetailMapper.xml
@@ -23,4 +23,9 @@
and t1.material_id = t2.id)
</select>
+ <select id="queryByMaterialNumberOnly" resultType="org.jeecg.modules.pms.entity.PmsProcessBillMaterialsDetail">
+ select DISTINCT t1.material_number, t1.material_name, t1.production_unit
+ from pms_process_bill_materials_detail t1
+ where t1.material_number = #{materialNumber}
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/java/org/jeecg/modules/pms/service/impl/PmsProcessBillMaterialsDetailServiceImpl.java b/src/main/java/org/jeecg/modules/pms/service/impl/PmsProcessBillMaterialsDetailServiceImpl.java
index feec4a1..56b34a8 100644
--- a/src/main/java/org/jeecg/modules/pms/service/impl/PmsProcessBillMaterialsDetailServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/pms/service/impl/PmsProcessBillMaterialsDetailServiceImpl.java
@@ -54,6 +54,11 @@
if (StringUtils.isBlank(materialNumber)) {
return Collections.emptyList();
}
- return this.getBaseMapper().queryByMaterialNumber(materialNumber);
+ List<PmsProcessBillMaterialsDetail> list = this.getBaseMapper().queryByMaterialNumber(materialNumber);
+ if (CollectionUtil.isEmpty(list)) {
+ //濡傛灉鏄儹澶勭悊锛屽垯浠ｈ〃閫夋嫨鎺掍骇宸ュ崟鐢熶骇鐨勬瘺鍧�
+ return this.getBaseMapper().queryByMaterialNumberOnly(materialNumber);
+ }
+ return list;
}
}
--
Gitblit v1.9.3