Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API

pom.xml

@@ -157,7 +157,6 @@
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
                         <param>Tmstruck_Abnormal_Result</param>
-
                     </tables>
                 </configuration>
                 <executions>

src/main/java/com/steerinfo/dil/controller/TmstruckSelfMachineController.java

@@ -37,9 +37,4 @@ public class TmstruckSelfMachineController extends BaseRESTfulController {
         Map<String,Object>map=tmstruckSelfMachineService.getDeliveryOrder(orderNumber);
         return map;
     }
-//    public static void main(String[] args) {
-//            TmstruckSelfMachineController tmstruckSelfMachineController = new TmstruckSelfMachineController();
-//        Map<String, Object> wysdd2021091000000002 = tmstruckSelfMachineController.getBILLOrder("WYSDD2021091000000002");
-//        System.out.println(wysdd2021091000000002);
-//    }
 }

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

@@ -56,7 +56,7 @@ public interface TmstruckEnfactoryResultMapper extends IBaseMapper<TmstruckEnfac
 
     Map<String, Object> getBillOrder(String orderNumber);
 
-    List<Map<String, Object>> getBillOrderMaterial(String orderNumber);
+    List<Map<String, Object>>getBillOrderMaterial(String orderNumber);
 
      //通过运输订单获取零星物资进厂实绩
     List<Map<String, Object>> getSporadicSuppliesEnFactoryResult(Map<String, Object> map);
@@ -73,4 +73,6 @@ public interface TmstruckEnfactoryResultMapper extends IBaseMapper<TmstruckEnfac
 
     List<Map<String, Object>> getEnResult();
 
+
+
 }

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

@@ -113,6 +113,7 @@ public interface TmstruckMeasureCommissionMapper extends IBaseMapper<TmstruckMea
     //查询钢材委托
     Map<String, Object> getSteelMeasureCommission(Map<String, Object> map);
 
-    //查询还没计重的物资
+    //查询已计重的物资
     Integer getAlreadyWeightMaterialNum(BigDecimal orderId);
+
 }

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

@@ -43,10 +43,13 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
 
     @Autowired
     private RulesMapper rulesMapper;
+
     @Autowired
-    UtilsMapper utilsMapper;
+    private UtilsMapper utilsMapper;
+
     @Autowired
     private RulesServiceImpl rulesService;
+
     @Autowired
     private TmstruckTareReturnResultMapper tmstruckTareReturnResultMapper;
 
@@ -362,6 +365,14 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 }else if(orderType == 13){
                     measureCommission.put("flowTo","出厂");
                 }else if(orderType == 14){
+                    //查询还有几次未计量实绩
+                    BigDecimal resultTotalId = DataChange.dataToBigDecimal(map.get("resultTotalId"));
+                    Integer count = tmstruckMeasureCommissionMapper.selectNoNetWeightResult(resultTotalId);
+                    if(count > 1){ //第一次进厂
+                        measureCommission.put("materiaName", measureCommission.get("materiaName") + "(出)");
+                    }else { //第二次进厂
+                        measureCommission.put("materiaName", measureCommission.get("materiaName") + "(入)");
+                    }
                     measureCommission.put("flowTo","中转");
                 }else{
                     measureCommission.put("flowTo","退货");
@@ -401,8 +412,8 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
     public int sendDXMeasureCommissionMes(Map<String, Object> map){
         Map<String, Object> measureCommission = null;
         //查询计量委托
-        BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderTypee"));
-        switch (orderType.intValue()){
+        Integer orderType = DataChange.dataToBigDecimal(map.get("orderTypee")).intValue();
+        switch (orderType){
             case 1:
             case 2:
             case 3:
@@ -452,10 +463,13 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission = tmstruckMeasureCommissionMapper.sporadicDXMeasure(map);
                 if(measureCommission == null)
                     return 0;
-                if(orderType.intValue() == 14){
-                    Integer weightResultCount14 = tmstruckMeasureCommissionMapper.selectNoNetWeightResult(DataChange.dataToBigDecimal(map.get("resultTotalId")));
-                    if(weightResultCount14 == 1){
+                if(orderType == 14){
+                    Integer count = tmstruckMeasureCommissionMapper.selectNoNetWeightResult(DataChange.dataToBigDecimal(map.get("resultTotalId")));
+                    if(count > 1){ //第一次进厂
+                        measureCommission.put("goodsName", measureCommission.get("goodsName") + "(出)");
+                    }else {//第二次进厂
                         measureCommission.put("item", measureCommission.get("item") + ",1");
+                        measureCommission.put("goodsName", measureCommission.get("goodsName") + "(入)");
                     }
                 }
                 measureCommission.put("regionName", "无法确定汽车衡"); //无法确定汽车衡

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

@@ -29,15 +29,13 @@ public class TmstruckSelfMachineService implements ITmstruckSelfMachineService {
      */
     @Override
     public Map<String, Object> getBillOrder(String orderNumber) {
-
         //1.根据运输订单号查询主干信息
-
         Map<String,Object>map=tmstruckEnfactoryResultMapper.getBillOrder(orderNumber);
-
-        //2.根据运输订单号查询枝叶信息-物资
-
-        List<Map<String,Object>>list=tmstruckEnfactoryResultMapper.getBillOrderMaterial(orderNumber);
-        map.put("materialList",list);
+        if(map !=null){
+            //2.根据运输订单号查询枝叶信息-物资
+            List<Map<String,Object>>list=tmstruckEnfactoryResultMapper.getBillOrderMaterial(orderNumber);
+            map.put("materialList",list);
+        }
         return map;
     }
 

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

@@ -1137,57 +1137,39 @@
     </select>
 
     <select id="getBillOrder" parameterType="java.lang.String" resultType="java.util.Map">
-        select
+        SELECT
             oo.order_number "orderNumber",
             rc.capacity_number "capacityNumber",
             rce.consignee_company_name "consigeeName",
             rcr.carrier_name "carrierName",
-            TO_CHAR(SYSDATE,'YYYY-MM-DD') "billDate"
-        from omstruck_order oo
-                 left join
-             rms_capacity rc
-             on
-                 rc.capacity_id = oo.capacity_id
-                 left join
-             ams_sale_order_material asom
-             on
-                 asom.sale_order_material_id = oo.order_plan_id
-                 left join
-             ams_sale_order aso
-             on
-                 aso.sale_order_id = asom.sale_order_id
-                 left join
-             rms_consignee rce
-             on
-                 rce.consignee_id = aso.receive_id
-                 left join
-             ams_dispatch_sale_order adso
-             on
-                 adso.sale_order_material_id = asom.sale_order_material_id
-                 left join
-             rms_carrier rcr
-             on
-                 rcr.carrier_id = adso.carrier_id
-        where oo.order_number = #{orderNumber}
+            TO_CHAR( SYSDATE, 'YYYY-MM-DD' ) "billDate"
+        FROM
+            omstruck_order oo
+                LEFT JOIN rms_capacity rc ON rc.capacity_id = oo.capacity_id
+                LEFT JOIN ams_sale_order_material asom ON asom.sale_order_material_id = oo.order_plan_id
+                LEFT JOIN ams_sale_order aso ON aso.sale_order_id = asom.sale_order_id
+                LEFT JOIN rms_consignee rce ON rce.consignee_id = aso.receive_id
+                LEFT JOIN ams_dispatch_sale_order adso ON adso.sale_order_material_id = asom.sale_order_material_id
+                LEFT JOIN rms_carrier rcr ON rcr.carrier_id = adso.carrier_id
+        WHERE
+            oo.order_number = #{orderNumber}
+          and oo.ORDER_STATUS = 5
+          and oo.ORDER_PRINT_STATUS is null
     </select>
 
     <select id="getBillOrderMaterial" parameterType="java.lang.String" resultType="java.util.Map" >
-        select
+        SELECT
             rm.material_name "materialName",
             rm.material_specification "materialSpe",
             rm.material_model "materialModel",
             oom.order_material_number "materialNumber",
             oom.order_material_weight "materialWeight"
-        from omstruck_order oo
-                 left join
-             omstruck_order_material oom
-             on
-                 oom.order_id = oo.order_id
-                 left join
-             rms_material rm
-             on
-                 rm.material_id = oom.order_material_id
-        where oo.order_number = #{orderNumber}
+        FROM
+            omstruck_order oo
+                LEFT JOIN omstruck_order_material oom ON oom.order_id = oo.order_id
+                LEFT JOIN rms_material rm ON rm.material_id = oom.material_id
+        WHERE
+            oo.order_number = #{ orderNumber}
     </select>
 
     <!--    通过id获取零星物资id-->