luobang 2 years ago
parent
commit
4e6f3ae9b0

+ 4 - 0
src/main/java/com/steerinfo/dil/mapper/TmstruckLeaveFactoryResultMapper.java

@@ -146,4 +146,8 @@ public interface TmstruckLeaveFactoryResultMapper extends IBaseMapper<TmstruckLe
 
     List<String> getEasPrimaryIds(String orderNumber);
 
+    String getPrintFlag();
+
+    int getPrintNumber(BigDecimal orderId);
+
 }

+ 7 - 0
src/main/java/com/steerinfo/dil/service/impl/TmstruckLeaveFactoryResultServiceImpl.java

@@ -268,6 +268,13 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 throw new Exception("该车未扫卸货,请提醒司机去补扫卸货");
             }
         }
+        if(orderType == 1 && "true".equals(tmstruckLeaveFactoryResultMapper.getPrintFlag())) {
+                //如果是钢材订单,且打印送货单是必须打印,那么进这个方法
+            Integer printNumber = tmstruckLeaveFactoryResultMapper.getPrintNumber(DataChange.dataToBigDecimal(mesMap.get("orderId")));
+            if(printNumber == 0){
+                throw new Exception("未打印送货单,请提醒司机去打印");
+            }
+        }
         map.putAll(mesMap);
         map.putAll(selectMap);
         map.remove("Sqe");

+ 8 - 0
src/main/resources/com/steerinfo/dil/mapper/TmstruckLeaveFactoryResultMapper.xml

@@ -1486,4 +1486,12 @@
           AND TWR.RESULT_NET_WEIGHT IS NOT NULL
           AND oo.order_number = #{orderNumber}
     </select>
+    <select id="getPrintFlag" resultType="string">
+        SELECT DILV.VERSION_VALUE FROM DIL_VERSION DILV
+        WHERE DILV.VERSION_ID = 7
+    </select>
+    <select id="getPrintNumber" resultType="java.lang.Integer">
+        SELECT OO.PRINTNUMBER FROM OMSTRUCK_ORDER OO
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
 </mapper>