From 362ed8737cdd0315dd85f6a3b27e93d8e645ff0e Mon Sep 17 00:00:00 2001
From: rq <rq>
Date: Wed, 28 Dec 2022 12:12:33 +0800
Subject: [PATCH] 11

---
 .../controller/DailyPlanController.java           | 15 +++++++++++++++
 .../modules/production/entity/CardPrintData.java  |  2 ++
 .../production/service/DailyPlanService.java      | 14 ++++++++++++--
 .../service/impl/DailyPlanServiceImpl.java        | 15 +++++++++++++++
 src/main/resources/static/js/pda/IssueReturn.js   |  2 +-
 .../resources/static/js/pda/productionIssue.js    |  2 +-
 6 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/heai/modules/production/controller/DailyPlanController.java b/src/main/java/com/heai/modules/production/controller/DailyPlanController.java
index b706d06..57b1894 100644
--- a/src/main/java/com/heai/modules/production/controller/DailyPlanController.java
+++ b/src/main/java/com/heai/modules/production/controller/DailyPlanController.java
@@ -810,4 +810,19 @@ public class DailyPlanController {
         List<Map<String, Object>> result= dailyPlanService.getHunLianPrintData(inData);
         return R.ok().put("rows",result);
     }
+
+    /**
+     * @Description 生产大卡打印
+     * @Title getLiuHuaPrintData
+     * @param inData
+     * @author rq
+     * @date 2022/10/25 18:16
+     * @return R
+     * @throw
+     */
+    @PostMapping("/getLiuHuaPrintData")
+    public R getLiuHuaPrintData(@RequestBody CardPrintData inData){
+        List<Map<String, Object>> result= dailyPlanService.getLiuHuaPrintData(inData);
+        return R.ok().put("rows",result);
+    }
 }
diff --git a/src/main/java/com/heai/modules/production/entity/CardPrintData.java b/src/main/java/com/heai/modules/production/entity/CardPrintData.java
index 6d4b669..4998241 100644
--- a/src/main/java/com/heai/modules/production/entity/CardPrintData.java
+++ b/src/main/java/com/heai/modules/production/entity/CardPrintData.java
@@ -8,4 +8,6 @@ public class CardPrintData {
     private String taskNo;
     private String partNo;
     private String createDate;
+    private Integer seqNo;
+    private String sScheduledDate;
 }
diff --git a/src/main/java/com/heai/modules/production/service/DailyPlanService.java b/src/main/java/com/heai/modules/production/service/DailyPlanService.java
index a09b5f1..64be07b 100644
--- a/src/main/java/com/heai/modules/production/service/DailyPlanService.java
+++ b/src/main/java/com/heai/modules/production/service/DailyPlanService.java
@@ -597,8 +597,8 @@ public interface DailyPlanService  {
     void cancelSfdc(SfdcCancel inData);
 
     /**
-     * @Description 取消报工信息
-     * @Title CardPrintData
+     * @Description 混炼大卡打印
+     * @Title getHunLianPrintData
      * @param inData
      * @author rq
      * @date 2022/10/31 17:43
@@ -606,4 +606,14 @@ public interface DailyPlanService  {
      * @throw
      */
     List<Map<String, Object>> getHunLianPrintData(CardPrintData inData);
+    /**
+     * @Description 硫化大卡打印
+     * @Title getLiuHuaPrintData
+     * @param inData
+     * @author rq
+     * @date 2022/10/31 17:43
+     * @return void
+     * @throw
+     */
+    List<Map<String, Object>> getLiuHuaPrintData(CardPrintData inData);
 }
diff --git a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java
index b57417a..60c4260 100644
--- a/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java
+++ b/src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java
@@ -1139,4 +1139,19 @@ public class DailyPlanServiceImpl implements DailyPlanService {
         List<Map<String, Object>> resultList = functionMapper.getProcedureData("get_Hunlian_printData", params);
         return resultList;
     }
+
+    @Override
+    public List<Map<String, Object>> getLiuHuaPrintData(CardPrintData inData){
+        List<Object> params = new ArrayList<>();
+
+        params.add(inData.getSite());
+
+        params.add(inData.getSeqNo());
+
+        params.add(inData.getPartNo());
+
+        params.add(inData.getSScheduledDate());
+        List<Map<String, Object>> resultList = functionMapper.getProcedureData("get_LiuHua_printData", params);
+        return resultList;
+    }
 }
diff --git a/src/main/resources/static/js/pda/IssueReturn.js b/src/main/resources/static/js/pda/IssueReturn.js
index 4977cb3..9cfe285 100644
--- a/src/main/resources/static/js/pda/IssueReturn.js
+++ b/src/main/resources/static/js/pda/IssueReturn.js
@@ -59,7 +59,7 @@ function getOrderNoData(){
 					site=data.row.site;
 					if (currentData.status != null && currentData.status != "") {
 						if (currentData.status == "已计划" || currentData.status == "已取消" || currentData.status == "已关闭") {
-							layer.msg("该生产订单不允许发料！");
+							layer.msg("该生产订单状态不允许退料！请检查生产订单状态");
 							return false;
 						}
 					}
diff --git a/src/main/resources/static/js/pda/productionIssue.js b/src/main/resources/static/js/pda/productionIssue.js
index 8091286..61e6803 100644
--- a/src/main/resources/static/js/pda/productionIssue.js
+++ b/src/main/resources/static/js/pda/productionIssue.js
@@ -59,7 +59,7 @@ function getOrderNoData(){
 					site=data.row.site;
 					if (currentData.status != null && currentData.status != "") {
 						if (currentData.status == "已计划" || currentData.status == "已取消" || currentData.status == "已关闭") {
-							layer.msg("该生产订单不允许发料！");
+							layer.msg("该生产订单状态不允许发料！请检查生产订单状态");
 							return false;
 						}
 					}