24-03-12 出库检验

src/main/java/com/heai/modules/board/controller/BoardController.java

@@ -446,6 +446,11 @@ public class BoardController {
         return R.ok().put("data",boardService.getPartValue(site,partNo));
     }
 
+    @GetMapping("/checkIsPacking")
+    public R checkIsPacking(String site,String workCenterNo){
+        return R.ok().put("data",boardService.isPackingWorkCenter(site,workCenterNo));
+    }
+
     /**
      * 保存扫描记录
      * @param outboundLabelScan

src/main/java/com/heai/modules/board/service/BoardService.java

@@ -261,4 +261,6 @@ public interface BoardService {
     List<PackagePrintData> getPackagePrintDataList(Integer previousSeqNo, BigDecimal number,String site,String orderNo);
 
     BigDecimal getPartValue(String site,String partNo);
+
+    boolean isPackingWorkCenter(String site,String workCenterNo);
 }

src/main/java/com/heai/modules/board/service/impl/BoardServiceImpl.java

@@ -579,15 +579,14 @@ public class BoardServiceImpl implements BoardService {
             throw new RuntimeException("派工单未查询到标签信息");
         }
         PackagePrintData packagePrintData = list.get(0);
-        String workCenterProLine = boardMapper.getWorkCenterProLineNo(packagePrintData.getSite(),packagePrintData.getWorkCenterNo());
-        if (!"PACKING".equals(workCenterProLine)){
-            throw new RuntimeException("该派工单工序不是包装工序");
-        }
+//        String workCenterProLine = boardMapper.getWorkCenterProLineNo(packagePrintData.getSite(),packagePrintData.getWorkCenterNo());
+//        if (!"PACKING".equals(workCenterProLine)){
+//            throw new RuntimeException("该派工单工序不是包装工序");
+//        }
         if (Objects.nonNull(number)){
             packagePrintData.setUnitQty(number.doubleValue());
         }
         Map<String,String> map = boardMapper.getCustomerInfo(site,orderNo);
-        System.out.println(map);
         if ("TBC".equals(map.get("CustomerGroup"))){
             packagePrintData.setKeyInfoStr1(map.get("LogoFileName"));
             packagePrintData.setKeyInfoStr1(map.get("CustomerDesc"));
@@ -624,4 +623,14 @@ public class BoardServiceImpl implements BoardService {
         }
         return boardMapper.getPartValue(site,partNo);
     }
+
+
+    @Override
+    public boolean isPackingWorkCenter(String site, String workCenterNo) {
+        String workCenterProLine = boardMapper.getWorkCenterProLineNo(site,workCenterNo);
+        if (!"PACKING".equals(workCenterProLine)){
+            throw new RuntimeException("该派工单工序不是包装工序");
+        }
+        return true;
+    }
 }

src/main/java/com/heai/modules/pad/vo/DelNotifyDetailVo.java

@@ -4,6 +4,8 @@ import com.heai.modules.pad.entity.DelNotifyDetail;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
+
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class DelNotifyDetailVo extends DelNotifyDetail {
@@ -18,4 +20,6 @@ public class DelNotifyDetailVo extends DelNotifyDetail {
     private String orderType;
     private String subOrderType;
     private String contractNo;
+
+    private BigDecimal allNum;
 }

src/main/resources/mapper/board/BoardMapper.xml

@@ -333,7 +333,7 @@
         On P.Site=V.Site and P.PartNo=V.PartNo and P.CodeNo=V.CodeNo and V.SubCodeSeqNo=1 and V.RecordType='P' and V.PropertiesItemNo='BILNOTE'
         ,Site as S
         Where T.Site=S.SiteID and T.Site=SO.Site and T.OrderNo=SO.OrderNo
-        and SO.Site=P.Site and SO.PartNo=P.PartNo and t.SeqNo = #{seqNo,jdbcType=INTEGER}
+        and SO.Site=P.Site and SO.PartNo=P.PartNo and t.AssJobSeqNo = #{seqNo,jdbcType=INTEGER}
     </select>
 
     <select id="getCustomerInfo" resultType="java.util.HashMap">

src/main/resources/mapper/pad/DelNotifyDetailMapper.xml

@@ -29,6 +29,7 @@
         <result column="OrderType" property="orderType"/>
         <result column="SubOrderType" property="subOrderType"/>
         <result column="ContractNo" property="contractNo"/>
+        <result column="allNum" property="allNum"/>
     </resultMap>
 
     <select id="selectByDelNotifyNo" resultMap="getDelNotifyDetail">
@@ -57,7 +58,8 @@
             D.Ins_ApproveResultFlag,
             D.Ins_ApprovedBy,
             D.Ins_ApprovedDate,
-            D.Ins_Remark
+            D.Ins_Remark,
+            (select sum(o.scan_qty) from outbound_label_scan o where o.Site = D.Site and o.del_notify_no = D.DelNotifyNo and o.del_notify_item_no = D.DelNotifyItemNo) as allNum
         from
             dbo.CODelNotifyDetail as D,
             dbo.COHeader as Y,