11

src/main/java/com/heai/modules/production/controller/DailyPlanController.java

@@ -795,4 +795,19 @@ public class DailyPlanController {
         dailyPlanService.cancelSfdc(inData);
         return R.ok();
     }
+
+    /**
+     * @Description 混炼大卡打印
+     * @Title getHunLianPrintData
+     * @param inData
+     * @author rq
+     * @date 2022/10/25 18:16
+     * @return R
+     * @throw
+     */
+    @PostMapping("/getHunLianPrintData")
+    public R getHunLianPrintData(@RequestBody CardPrintData inData){
+        List<Map<String, Object>> result= dailyPlanService.getHunLianPrintData(inData);
+        return R.ok().put("rows",result);
+    }
 }

src/main/java/com/heai/modules/production/entity/CardPrintData.java

@@ -0,0 +1,11 @@
+package com.heai.modules.production.entity;
+
+import lombok.Data;
+
+@Data
+public class CardPrintData {
+    private String site;
+    private String taskNo;
+    private String partNo;
+    private String createDate;
+}

src/main/java/com/heai/modules/production/service/DailyPlanService.java

@@ -595,4 +595,15 @@ public interface DailyPlanService  {
      * @throw
      */
     void cancelSfdc(SfdcCancel inData);
+
+    /**
+     * @Description 取消报工信息
+     * @Title CardPrintData
+     * @param inData
+     * @author rq
+     * @date 2022/10/31 17:43
+     * @return void
+     * @throw
+     */
+    List<Map<String, Object>> getHunLianPrintData(CardPrintData inData);
 }

src/main/java/com/heai/modules/production/service/impl/DailyPlanServiceImpl.java

@@ -1124,4 +1124,19 @@ public class DailyPlanServiceImpl implements DailyPlanService {
             throw new RuntimeException(String.valueOf(map.get("resultMsg")));
         }
     }
+
+    @Override
+    public List<Map<String, Object>> getHunLianPrintData(CardPrintData inData){
+        List<Object> params = new ArrayList<>();
+
+        params.add(inData.getSite());
+
+        params.add(inData.getTaskNo());
+
+        params.add(inData.getPartNo());
+
+        params.add(inData.getCreateDate());
+        List<Map<String, Object>> resultList = functionMapper.getProcedureData("sfdc_cancelsfdc", params);
+        return resultList;
+    }
 }

src/main/resources/mapper/functionUtils/Function.xml

@@ -55,6 +55,6 @@
     </insert>
 
     <update id="updateHunlianHouseWareFlag">
-        update Hunlian_TaskHeader set WareHouseFlag='Y' ,WareHouseQty=#{reportQty} where site=#{site} and taskNo=#{transNo}
+        update Hunlian_TaskHeader set WareHouseFlag='Y' ,WareHouseQty=#{reportQty} where site=#{site} and taskNo=#{taskNo}
     </update>
 </mapper>

src/main/resources/templates/pda/transferWarehousing2.ftl

@@ -133,8 +133,8 @@
     </div>
 
     <div autocomplete="off" style="margin-top: 20px;width: 130px;margin-left: 90px;">
-        <button class="btn btn-primary" style="padding: 1px 8px;font-size: 12px;height: 24px;width: 68px;" data-toggle="modal" onclick="pdaBaseJump()">上一步</button>
-        <button class="btn btn-primary" style="padding: 1px 8px;font-size: 12px;height: 24px;width: 68px;margin-left: 10%" data-toggle="modal" onclick="receiveFlag()">确认入库</button>
+        <button class="btn btn-primary" style="padding: 1px 8px;font-size: 12px;height: 24px;width: 54px;" data-toggle="modal" onclick="pdaBaseJump()">上一步</button>
+        <button class="btn btn-primary" style="padding: 1px 8px;font-size: 12px;height: 24px;width: 68px;margin-left: 0%" data-toggle="modal" onclick="receiveFlag()">确认入库</button>
     </div>
 
 </div>

src/main/resources/templates/pda/transferWarehousing2ForHunlian.ftl

@@ -135,8 +135,8 @@
     </div>
 
     <div autocomplete="off" style="margin-top: 20px;width: 130px;margin-left: 90px;">
-        <button class="btn btn-primary" style="padding: 1px 8px;font-size: 12px;height: 24px;width: 68px;" data-toggle="modal" onclick="pdaBaseJump()">上一步</button>
-        <button class="btn btn-primary" style="padding: 1px 8px;font-size: 12px;height: 24px;width: 68px;margin-left: 10%" data-toggle="modal" onclick="receiveFlag()">确认入库</button>
+        <button class="btn btn-primary" style="padding: 1px 8px;font-size: 12px;height: 24px;width: 54px;" data-toggle="modal" onclick="pdaBaseJump()">上一步</button>
+        <button class="btn btn-primary" style="padding: 1px 8px;font-size: 12px;height: 24px;width: 68px;margin-left: 0%" data-toggle="modal" onclick="receiveFlag()">确认入库</button>
 <#--        <button class="btn btn-primary" style="padding: 1px 8px;font-size: 12px;height: 24px;width: 68px;margin-left: 10%" data-toggle="modal" onclick="receiveModal()">确认入库</button>-->
     </div>
     <div class="modal fade" id="receiveModal" aria-labelledby="myModalLabel" aria-hidden="true">