2025-12-03

下料打印优化

src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java

@@ -1164,10 +1164,10 @@ public class ScheduleController extends AbstractController {
     @RequestMapping(value = "processCuttingMaterialRoll")
     @RepeatSubmit
     public R processCuttingMaterialRoll(@RequestBody SearchScheduleData inData) {
-        List<Map<String, Object>> printList = scheduleService.processCuttingMaterialRoll(inData);
+        Map<String, Object> result = scheduleService.processCuttingMaterialRoll(inData);
         return R.ok()
                 .put("code", 200)
-                .put("printList", printList)
+                .put("printRollNo", result.get("printRollNo"))
                 .put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000));
     }
 

src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java

@@ -675,8 +675,9 @@ public interface ScheduleService {
      * @Description 处理材料下料功能
      * @DateTime 2022/2/15 17:13
      * @Param [inData]
+     * @return 包含打印卷号的Map
      **/
-    List<Map<String, Object>> processCuttingMaterialRoll(SearchScheduleData inData);
+    Map<String, Object> processCuttingMaterialRoll(SearchScheduleData inData);
 
     /**
      * TODO 重新打开当前下架卷的数据

src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -3060,7 +3060,7 @@ public class ScheduleServiceImpl implements ScheduleService {
 
     @Override
     @Transactional
-    public List<Map<String, Object>> processCuttingMaterialRoll(SearchScheduleData inData) {
+    public Map<String, Object> processCuttingMaterialRoll(SearchScheduleData inData) {
         //公共参数
         String site = inData.getSite();
         String orderNo = inData.getOrderNo();
@@ -3083,9 +3083,11 @@ public class ScheduleServiceImpl implements ScheduleService {
         Map<String, Object> rollMap = this.getProcessCuttingMaterialRoll(site, orderNo, itemNo, seqNo, rollNo, rmRollNo, rmPartNo, transQty, histSeqNo, operatorId, currentTime);
         //获取打印的卷号
         String printRollNo = String.valueOf(rollMap.get("rollNo"));
-        //调用存储过程获取打印的数据
-        List<Map<String, Object>> printList = this.getMaterialRollReturnPrintData(site, orderNo, printRollNo);
-        return printList;
+        
+        //返回打印卷号
+        Map<String, Object> result = new HashMap<>();
+        result.put("printRollNo", printRollNo);
+        return result;
     }
 
     /**