From add6c23106f4ebc5035742d68f9a5adfbf399c38 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 12 九月 2025 14:34:19 +0800
Subject: [PATCH] art: 物料拉动 查询可选择工单信息
---
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/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 +++++++
5 files changed, 51 insertions(+), 8 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 9731f87..d222786 100644
--- a/src/main/java/org/jeecg/modules/mes/controller/MesProductionWorkOrderController.java
+++ b/src/main/java/org/jeecg/modules/mes/controller/MesProductionWorkOrderController.java
@@ -34,6 +34,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;
@@ -169,8 +170,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()) {
@@ -190,7 +191,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) {
@@ -210,7 +211,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) {
@@ -430,4 +431,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 d643686..a301a9d 100644
--- a/src/main/java/org/jeecg/modules/mes/service/IMesProductionWorkOrderService.java
+++ b/src/main/java/org/jeecg/modules/mes/service/IMesProductionWorkOrderService.java
@@ -23,4 +23,11 @@
IPage<MesProductionWorkOrder> queryPageList(Page<MesProductionWorkOrder> page, Map<String, String[]> parameterMap);
List<MesKittingCompletenessCheck> workOrderCompletenessCheck(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 83314ea..ee2a4cc 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
@@ -260,4 +260,9 @@
});
return completenessCheckResultList;
}
+
+ @Override
+ public IPage<MesProductionWorkOrder> queryWorkOrderByTransfer(Page<MesProductionWorkOrder> page) {
+ return this.getBaseMapper().queryWorkOrderByTransfer(page);
+ }
}
--
Gitblit v1.9.3