换包装 2022年4月7日 sxm

src/main/java/com/gaotao/modules/schedule/data/SearchScheduleData.java

@@ -140,13 +140,13 @@ public class SearchScheduleData extends BaseData {
     private String directRepackageflag; // 是否是换包装
     private String sortField;//排序规则
 
-    private Double rollCount;
+    private int rollCount;
 
-    public Double getRollCount() {
+    public int getRollCount() {
         return rollCount;
     }
 
-    public void setRollCount(Double rollCount) {
+    public void setRollCount(int rollCount) {
         this.rollCount = rollCount;
     }
 

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

@@ -702,11 +702,11 @@ public interface ScheduleService {
     void otherSwitchSfdcRoll(SearchScheduleData inData);
 
     /**
-     * @Author LR
-     * @Description 检查是否可以创建分卷
-     * @DateTime  2022/2/17 11:45
-     * @Param [inData]
-     * @return com.gaotao.common.utils.R
+     * @Author sxm
+     * @Description 其它报工创建分卷校验
+     * @Date 2022/3/7 13:56
+     * @Param
+     * @return
      **/
     Map<String, Object> otherCheckCreateSplitSfdcRoll(SearchScheduleData inData);
 

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

@@ -3466,8 +3466,10 @@ public class ScheduleServiceImpl implements ScheduleService {
         boolean newRollFlag = inData.isNewRollFlag();
         Float editReportQty = inData.getSfdcReportedQty();
         String username = inData.getOperatorId();
+        // todo 添加参数 是否是换包装
+        String rePackFlag = inData.getParkFlag();
         //1.先校验的存储过程
-        Map<String, Object> checkMap = this.checkMergeSfdcRoll(site, orderNo, itemNo, seqNo, rollNo, newRollNo, rollQty, newRollQty, "N");
+        Map<String, Object> checkMap = this.checkMergeSfdcRoll(site, orderNo, itemNo, seqNo, rollNo, newRollNo, rollQty, newRollQty, rePackFlag);
         //判断是否检验成功
         String checkCode = String.valueOf(checkMap.get("resultCode"));
         if ("400".equalsIgnoreCase(checkCode)) {
@@ -3477,7 +3479,7 @@ public class ScheduleServiceImpl implements ScheduleService {
 
         //2.存储过程 区分当前卷和参与合并的卷
         if (newRollFlag) {
-            Map<String, Object> resultMap = this.checkMergeSfdcRollQty(site, orderNo, newRollNo, newRollQty, "N");
+            Map<String, Object> resultMap = this.checkMergeSfdcRollQty(site, orderNo, newRollNo, newRollQty, rePackFlag);
             //判断是否检验成功
             String resultCode = String.valueOf(resultMap.get("resultCode"));
             if ("400".equalsIgnoreCase(resultCode)) {
@@ -3486,7 +3488,7 @@ public class ScheduleServiceImpl implements ScheduleService {
             }
             return resultMap;
         } else {
-            Map<String, Object> resultMap = this.checkMergeSfdcRollQty(site, orderNo, rollNo, rollQty, "N");
+            Map<String, Object> resultMap = this.checkMergeSfdcRollQty(site, orderNo, rollNo, rollQty, rePackFlag);
             //判断是否检验成功
             String resultCode = String.valueOf(resultMap.get("resultCode"));
             if ("400".equalsIgnoreCase(resultCode)) {
@@ -3559,7 +3561,8 @@ public class ScheduleServiceImpl implements ScheduleService {
         Float editReportQty = inData.getSfdcReportedQty();
         String username = inData.getUsername();
         String operatorId = inData.getOperatorId();
-
+        // todo 添加参数 是否是换包装
+        String rePackFlag = inData.getParkFlag();
         //1.先校验当前卷
         inData.setNewRollFlag(false);
         Map<String, Object> oldMap = this.checkMergeSfdcRoll(inData);
@@ -3568,7 +3571,7 @@ public class ScheduleServiceImpl implements ScheduleService {
         Map<String, Object> newMap = this.checkMergeSfdcRoll(inData);
 
         //校验完成调用存储过程
-        Map<String, Object> resultMap = this.processMergeSfdcRoll(site, orderNo, itemNo, seqNo, rollNo, newRollNo, rollQty, newRollQty, "N", username, operatorId);
+        Map<String, Object> resultMap = this.processMergeSfdcRoll(site, orderNo, itemNo, seqNo, rollNo, newRollNo, rollQty, newRollQty, rePackFlag, username, operatorId);
         //判断是否检验成功
         String resultCode = String.valueOf(resultMap.get("resultCode"));
         if ("400".equalsIgnoreCase(resultCode)) {

src/main/resources/mapper/app/TransdetailDao.xml

@@ -1,13 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.gaotao.modules.finishedProduct.dao.TransdetailDao">
-    <select id="getPickingPartNumber1" resultType="java.lang.Double">
-        select SUM(d.TransQty) as qty FROM TransHeader h
-        LEFT JOIN TransDetail d ON d.TransNo = h.TransNo
-        where h.OrderRef1 = #{orderNo}  AND h.TransType_DB = 'JPO'
-          AND d.partNo =#{partNo}
 
-    </select>
 
     <select id="getPickingPartNumber" resultType="java.lang.Double">
 

src/main/resources/mapper/finishedProduct/CRollinfoDao.xml

@@ -177,7 +177,7 @@
     </select>
     <select id="getCoustomerCode" resultType="java.lang.String">
         SELECT CardCode
-        FROM   RXE.dbo.ODRF
+        FROM   YRTEST.dbo.ODRF
         WHERE DocEntry = #{orderNo}
     </select>
     <select id="getOrderNo" resultType="java.lang.String">
@@ -204,11 +204,11 @@
                             )         AS customer_id,
                         t3.Substitute AS mpn,
                         T0.u_ul
-        FROM   RXE.dbo.OITM T0
-                 INNER JOIN   RXE.dbo.OWOR T1 ON T0.ItemCode = T1.ItemCode
+        FROM   YRTEST.dbo.OITM T0
+                 INNER JOIN   YRTEST.dbo.OWOR T1 ON T0.ItemCode = T1.ItemCode
                  INNER JOIN XJMES.dbo.C_RollInfo t2 ON t1.DocEntry = t2.OrderRef1
             AND t2.SourceType = '生产订单'
-                 LEFT JOIN   RXE.dbo.OSCN t3 ON T0.ItemCode = t3.ItemCode
+                 LEFT JOIN   YRTEST.dbo.OSCN t3 ON T0.ItemCode = t3.ItemCode
         WHERE T0.ItemCode = #{partno}
     </select>
     <select id="rollOutboundControl" resultType="com.gaotao.modules.finishedProduct.entity.CRollinfoEntity">
@@ -271,7 +271,7 @@
     </select>
     <select id="searchLotNo" resultType="java.lang.String">
         SELECT MAX(docentry)
-        FROM   RXE.dbo.OWOR
+        FROM   YRTEST.dbo.OWOR
         WHERE ItemCode = #{partNo}
     </select>
 

src/main/resources/mapper/finishedProduct/SapDao.xml

@@ -2,16 +2,16 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.gaotao.modules.finishedProduct.dao.SapDao">
     <update id="updateOnnmAutoKey">
-        update   RXE.dbo.onnm set AutoKey = #{sapNo} where ObjectCOde = 15
+        update   YRTEST.dbo.onnm set AutoKey = #{sapNo} where ObjectCOde = 15
     </update>
     <update id="updateNNM1NextNumber">
-        update   RXE.dbo.NNM1 set NextNumber = #{sapNo} where ObjectCOde = 15
+        update   YRTEST.dbo.NNM1 set NextNumber = #{sapNo} where ObjectCOde = 15
     </update>
     <update id="updateODRFStuts">
-        update   RXE.dbo.ODRF set DocStatus='C' where  DocEntry = #{orderNo}
+        update   YRTEST.dbo.ODRF set DocStatus='C' where  DocEntry = #{orderNo}
     </update>
     <delete id="reomverNullData">
-        DELETE FROM   RXE.dbo.ODLN where docDate is null  and CardCode is null
+        DELETE FROM   YRTEST.dbo.ODLN where docDate is null  and CardCode is null
     </delete>
     <select id="getCount" resultType="java.lang.Integer">
         Select count(1)   from RoutingHeader where site='1' and PartNo='100001701400' and RevNo='A0'
@@ -19,7 +19,7 @@
     </select>
 
     <update id="UpdateODLNMesTranNo">
-        update    RXE.dbo.ODLN set U_MESTransNo=#{orderNo},draftKey=#{orderNo} where  DocEntry = #{sapNo}
+        update    YRTEST.dbo.ODLN set U_MESTransNo=#{orderNo},draftKey=#{orderNo} where  DocEntry = #{sapNo}
     </update>