修改

src/main/java/com/steerinfo/dil/mapper/OmsTransOrderMapper.java

@@ -360,4 +360,5 @@ public interface OmsTransOrderMapper extends IBaseMapper<OmsTransOrder, BigDecim
 
     void updateIdcardsInfo(Map<String, Object> capacity);
 
+    int countDriverScene(BigDecimal driverId);
 }

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((businessScene.equals("采购") || businessScene.equals("销售")) && omsTransOrderMapper.countDriverScene(DataChange.dataToBigDecimal(maps.get("driverId")),businessScene) > 0){
-//                throw new Exception(businessScene + "类型的运单已派发给该司机，请等待作业完成再派发下一单！");
-//            }
+            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());
@@ -2737,24 +2737,22 @@ public class OmsTransOrderServiceImpl {
             //    e.printStackTrace();
             //    log.error("补录车辆档案失败:"+e.getMessage());
             //}
-            //if("采购".equals(transOrder.get("businessScene"))){
-            //    //采购查询大宗补录卸货实绩
-            //    try{
-            //        findUnloadDetails(omsTransOrder,userName);
-            //    }catch (Exception e){
-            //        e.printStackTrace();
-            //        log.error(omsTransOrder.getSerialNumber()+"补录卸货实绩失败:"+e.getMessage());
-            //    }
-            //}
-            //if("销售".equals(transOrder.get("businessScene"))){
-            //    //销售查询大宗补录装货实绩
-            //    try{
-            //        findLoadDetails(omsTransOrder,userName);
-            //    }catch (Exception e){
-            //        e.printStackTrace();
-            //        log.error(omsTransOrder.getSerialNumber()+"补录装货实绩失败:"+e.getMessage());
-            //    }
-            //}
+            if("采购".equals(transOrder.get("businessScene"))){
+                //采购查询大宗补录卸货实绩
+                try{
+                    findUnloadDetails(omsTransOrder,userName);
+                }catch (Exception e){
+                    e.printStackTrace();
+                }
+            }
+            if("销售".equals(transOrder.get("businessScene"))){
+                //销售查询大宗补录装货实绩
+                try{
+                    findLoadDetails(omsTransOrder,userName);
+                }catch (Exception e){
+                    e.printStackTrace();
+                }
+            }
             if("大宗销售订单".equals(transOrder.get("businessTypeName")) && (transOrder.get("materialName")+"").contains("复磅")){
                 //销售查询是否有同车号，业务类型为型钢销售订单、高线销售订单，未接单但有装货的运单，最近一条。迁移其他实绩
                 replaceResultSpecial(transOrder);

src/main/resources/com/steerinfo/dil/mapper/AmsTransPlanMapper.xml

@@ -910,26 +910,25 @@
         oto.trans_order_id,
         ooc.plan_child_id,
         count(0) con,
-        material_number
+        material_number,
+        net_weight
         from oms_order_child ooc
         left join oms_trans_order oto
         on ooc.trans_order_id = oto.trans_order_id
         where oto.deleted in (2,4,5)
-        group by ooc.order_child_id, oto.trans_order_id, ooc.plan_child_id, material_number),
+        group by ooc.order_child_id, oto.trans_order_id, ooc.plan_child_id, material_number,net_weight),
         t1 as
         (select t.plan_child_id,
         sum(t.material_number) planWeight,
         sum(t.con) con,
         sum(nvl2(nvl2(tlr.actual_tonnage,
         tlr.actual_tonnage,
-        twr.net_weight),
-        nvl2(tlr.actual_tonnage, tlr.actual_tonnage, twr.net_weight),
+        t.net_weight),
+        nvl2(tlr.actual_tonnage, tlr.actual_tonnage, t.net_weight),
         t.material_number)) outWeight
         from t
         left join tms_load_result tlr
         on t.order_child_id = tlr.trans_order_child_id
-        left join tms_weight_result twr
-        on twr.trans_order_child_id = t.order_child_id
         group by t.plan_child_id)
         select *
         from (

src/main/resources/com/steerinfo/dil/mapper/OmsTransOrderMapper.xml

@@ -6837,4 +6837,10 @@
     SET RP.INNNER_CODE = #{innerCode}
     WHERE RP.IDENTITY_CARD = #{sfzh}
   </update>
+  <select id="countDriverScene" resultType="java.lang.Integer">
+    SELECT count(oto.trans_order_id) FROM OMS_TRANS_ORDER OTO
+    WHERE OTO.DRIVER_ID = #{driverId}
+    AND OTO.DELETED IN (4,5)
+    AND OTO.BUSINESS_TYPE_NAME = '大宗销售订单'
+  </select>
 </mapper>