修改采购内转发送委托方式

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

@@ -25,9 +25,8 @@ public interface TmstruckMeasureCommissionMapper extends IBaseMapper<TmstruckMea
     //查询销售计量委托
     Map<String, Object> getXSMeasureCommission(Map<String, Object> map);
 
-    /*
-     * from zhangXuan
-     */
+    //通过总实绩ID查询没有净重的计量实绩
+    Integer selectNoNetWeightResult(BigDecimal resultTotalId);
 
     //通过订单ID查询收货单位ID
     Integer getReceiveIdByOrderId(BigDecimal orderId);

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

@@ -65,4 +65,5 @@ public interface UtilsMapper {
 
     //通过订单ID查询物资ID（针对单拼）
     List<Integer> getMaterialIdByOrderId(BigDecimal orderId);
+
 }

src/main/java/com/steerinfo/dil/service/impl/TmstruckLoadResultServiceImpl.java

@@ -242,9 +242,9 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
     }
 
     /**
-     * PDA新增销售钢渣、水渣、危化品装车实绩
+     * PDA新增销售钢渣、水渣、危化品装车实绩  采购内转
      * loadStartTime 装车开始时间
-     * warehouseId  仓库Id      orderNumber 运输订单号   insertUpdateRemark 备注
+     * warehouseId  仓库Id      orderNumber 运输订单号 / orderId   insertUpdateRemark 备注
      * @param map
      * @return
      */

src/main/java/com/steerinfo/dil/service/impl/TmstruckMeasureCommissionServiceImpl.java

@@ -242,6 +242,14 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission.put("deliveryType", "计重");
                 measureCommission.put("billType", "0");
                 measureCommission.put("crname", "admin");
+                //判断还没有净重的计量实绩
+                Integer weightResultCount = tmstruckMeasureCommissionMapper.selectNoNetWeightResult(DataChange.dataToBigDecimal(map.get("resultTotalId")));
+                if(weightResultCount == 1){
+                    //如果只剩一条未计量的数据则需要走金蝶(进厂卸货)
+                    measureCommission.put("orderSource", measureCommission.get("chooseOrderSource"));
+                }else {
+                    measureCommission.put("orderSource", "0");
+                }
                 measureCommission.put("ended", "0");
                 break;
             case 11:

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

@@ -957,7 +957,7 @@
     <select id="purchaseXqCgNzDXMeasure" resultType="java.util.Map" parameterType="map">
         select *
         from (
-                 select APO.PURCHASE_ORDER_NO || ',' || APO.EAS_ENTRY_ID                               "orderSource",
+                 select APO.PURCHASE_ORDER_NO || ',' || APO.EAS_ENTRY_ID                               "chooseOrderSource",
                         OO.ORDER_NUMBER                                                                "orderId",
                         RC.CAPACITY_NUMBER                                                             "carNumber",
                         (case when TWR.RESULT_GROSS_PLACE_ID is not null
@@ -1023,4 +1023,11 @@
              )
         where rownum = 1
     </select>
+
+    <!--  通过总实绩ID查询没有净重的计量实绩  -->
+    <select id="selectNoNetWeightResult" parameterType="java.math.BigDecimal" resultType="java.lang.Integer">
+        select COUNT(TWR.WEIGHT_TASK_RESULT_ID)
+        from TMSTRUCK_WEIGHT_RESULT TWR
+        where TWR.RESULT_NET_WEIGHT is null
+    </select>
 </mapper>