luobang hace 6 meses
padre
commit
06385bc311

+ 3 - 3
src/main/java/com/steerinfo/dil/service/impl/OmsTransOrderServiceImpl.java

@@ -2339,9 +2339,9 @@ public class OmsTransOrderServiceImpl {
         String businessTypeName = amsTransRequirementMapper.selectBusinessTypeName(amsTransRequirement.getBusinessType().toString());
         int i = 1;
         for (Map<String, Object> maps : mapList) {
-            if((((List<String>)map.get("roleCodes"))).contains("xsxz") && "大宗销售订单".equals(businessTypeName) && omsTransOrderMapper.countDriverScene(DataChange.dataToBigDecimal(maps.get("driverId"))) > 0){
-                throw new Exception(businessTypeName + "类型的运单已派发给该司机,请等待作业完成再派发下一单!");
-            }
+//            if((((List<String>)map.get("roleCodes"))).contains("xsxz") && "大宗销售订单".equals(businessTypeName) && omsTransOrderMapper.countDriverScene(DataChange.dataToBigDecimal(maps.get("driverId"))) > 0){
+//                throw new Exception(businessTypeName + "类型的运单已派发给该司机,请等待作业完成再派发下一单!");
+//            }
             //增加派车主表记录
             OmsTransOrder omsTransOrder = new OmsTransOrder();
             omsTransOrder.setTransOrderId(omsTransOrderMapper.nextId());

+ 2 - 2
src/main/resources/com/steerinfo/dil/mapper/OmsTransOrderMapper.xml

@@ -5423,7 +5423,7 @@
   </update>
 
   <select id="sumWeightToTransPlan" resultType="java.lang.String">
-    select to_char(nvl(sum(apc.material_number),0), 'fm9999999990.0000')
+    select to_char(nvl(sum(apc.material_number),0), 'fm99999999990.0000')
     from ams_requirement_child arc
            left join ams_plan_child apc
                      on arc.requirement_child_id = apc.requirement_child_id
@@ -5440,7 +5440,7 @@
                                          THEN ooc.actual_weight
                                        ELSE OOC.NET_WEIGHT
                                     END , ooc.net_weight), CASE WHEN OTO.DELETED IS NULL THEN 0 ELSE ooc.material_number END)),0),
-              'fm999990.0000')
+              'fm99999999990.0000')
     FROM AMS_TRANS_REQUIREMENT ATR
            LEFT JOIN ams_requirement_child arc
                      ON ATR.TRANS_REQUIREMENT_ID = ARC.TRANS_REQUIREMENT_ID