0412更新

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

@@ -438,6 +438,18 @@ public class DailyPlanController {
         return R.ok();
     }
 
+
+    /**
+     * 取消派工单
+     * @param inData
+     * @return
+     */
+    @PostMapping("/updatePrintStock")
+    public R updatePrintStock(@RequestBody StockPrintData inData){
+        dailyPlanService.updatePrintStock(inData);
+        return R.ok();
+    }
+
     /**
      * @Description TODO
      * @Title getSOScheduleRoutingData

src/main/java/com/heai/modules/production/dao/DailyPlanMapper.java

@@ -9,7 +9,7 @@ import java.util.List;
 @Mapper
 @Repository
 public interface DailyPlanMapper {
-    /*
+    /**
      * @Description 获取shoporder数据
      * @Title getShopOrderData
      * @param dailyPlanInData
@@ -252,4 +252,15 @@ public interface DailyPlanMapper {
      * @throw
      */
     List<StockPrintData> getStockPrint(StockPrintInData inData);
+
+    /**
+     * @Description 取消派工单
+     * @Title cancelJob
+     * @param inData
+     * @author rq
+     * @date 2022/8/3 15:19
+     * @return List<SOScheduledRoutingOutData>
+     * @throw
+     */
+    void updatePrintStock(StockPrintData inData);
 }

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

@@ -350,6 +350,17 @@ public interface DailyPlanService  {
      */
     void cancelJob(SOScheduledRoutingOutData inData);
 
+    /**
+     * @Description 取消派工单
+     * @Title cancelJob
+     * @param inData
+     * @author rq
+     * @date 2022/8/3 15:19
+     * @return List<SOScheduledRoutingOutData>
+     * @throw
+     */
+    void updatePrintStock(StockPrintData inData);
+
     /**
      * @Description TODO
      * @Title getStockPrint

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

@@ -673,7 +673,7 @@ public class DailyPlanServiceImpl implements DailyPlanService {
     public void cancelJob(SOScheduledRoutingOutData inData){
         List<Object> params = new ArrayList<>();
         params.add(inData.getSite());
-        params.add(inData.getOrderRef1());
+        params.add(inData.getOrderNo());
         params.add(inData.getItemNo());
         params.add(inData.getSeqNo());
         params.add(inData.getsWorkCenterNo());
@@ -688,7 +688,10 @@ public class DailyPlanServiceImpl implements DailyPlanService {
             throw new RuntimeException(String.valueOf(map.get("resultMsg")));
         }
     }
-
+    @Override
+    public void updatePrintStock(StockPrintData inData){
+        dailyPlanMapper.updatePrintStock(inData);
+    }
     @Override
     public List<StockPrintData> getStockPrint(StockPrintInData inData){
         return dailyPlanMapper.getStockPrint(inData);

src/main/resources/mapper/production/DailyPlanMapper.xml

@@ -324,7 +324,7 @@
         update ScheduleList set scheduledQty=scheduledQty+#{sumQty} where Site=#{site} and OrderNo=#{orderNo} and itemNo=#{itemNo} and type=#{scheduleType}
     </update>
     <select id="searchReportedQty" resultType="SORoutingData">
-        select QtyReported,lastApproveQty from SORouting where Site=#{site} and OrderNo=#{orderRef1} and itemNo=#{itemNo}
+        select isnull(QtyReported,0),isnull(lastApproveQty,0) from SORouting where Site=#{site} and OrderNo=#{orderRef1} and itemNo=#{itemNo}
     </select>
     <select id="getSOScheduleRoutingData" resultType="SOScheduledRoutingOutData">
         select Site,OrderNo,ItemNo,SeqNo,QtyRequired,QtyReported,QtyApprove,TimeRequired,TimeReported,
@@ -402,4 +402,8 @@
       </where>
       order by TransDate desc
     </select>
+
+    <update id="updatePrintStock">
+        update StockPrint set PrintFlag='Y' where Site=#{site} and TransNo=#{transNo}
+    </update>
 </mapper>

src/main/resources/static/js/pda/hunlianWarehousing2.js

@@ -193,6 +193,7 @@ function receiveFlag(){
     var warehouseId = $("#warehouse_id").val();
     var locationId = $("#locationId").val();
     var batchNo = $("#batchNo").val();
+    var soTaskNo = $("#soTaskNo").val();
     if(warehouseDate == null || warehouseDate === ""){
         layer.msg("请选择入库日期！");
         return false
@@ -201,6 +202,10 @@ function receiveFlag(){
         layer.msg("请输入入库数量！");
         return false
     }
+    if(soTaskNo == null || soTaskNo === ""){
+        layer.msg("请选择日计划单号！");
+        return false
+    }
     if(warehouseId == null || warehouseId === ""){
         layer.msg("请选择仓库！");
         return false