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

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

@@ -16,6 +16,7 @@ import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.File;
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -113,20 +114,18 @@ public class TmstruckLeaveFactoryResultController extends BaseRESTfulController
             @ApiImplicitParam(name = "orderNumber", value = "", required = false, dataType = "String"),
     })
     @PostMapping("/addLeaveFactoryResult")
-    public RESTfulResult addLeaveFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue) throws Exception {
-        String nu=mapValue.get("orderNumber").toString();
-        //执行查询语句找出运输类型进行判断，是否为出厂 4 已完成计皮
-        Integer i = tmstruckLeaveFactoryResultService.selectTransportRoute(nu);
+    public RESTfulResult addLeaveFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue){
        //中交新路接口
 //        Map<String, Object> parem=tmstruckLeaveFactoryResultService.getTruckFactoryResult("WYSDD2021091000000002");
 //        parem.put("turnOf","0");
 //        routeService.saveRoute(parem);
-//        if (i == 4) {
-        int leaveFactory=tmstruckLeaveFactoryResultService.leaveFactoryByPDA(mapValue);
+        int leaveFactory = 0;
+        try {
+            leaveFactory = tmstruckLeaveFactoryResultService.leaveFactoryByPDA(mapValue);
+        }catch (Exception e){
+            return failed(e.getMessage());
+        }
         return  success(leaveFactory);
-//        }else
-//            return  failed();
-
     }
 
     @ApiOperation(value="APP查询汽车出厂实绩")

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

@@ -363,4 +363,25 @@ public class TmstruckLoadResultController extends BaseRESTfulController {
         int i = tmstruckLoadResultService.addDaZhouToDaGangLoadResult(map);
         return success(i);
     }
+
+
+    @ApiOperation(value = "采购内转查询待装车物资信息")
+    @PostMapping("/cgNzLoadingResult")
+    public RESTfulResult cgnzLoadResult(@RequestBody(required = false)Map<String,Object>mapval,
+                                        Integer apiId,
+                                        Integer pageNum,
+                                        Integer pageSize,
+                                        Integer orderType,
+                                        Integer orderStatus){
+
+        mapval.put("orderType",orderType);
+        mapval.put("orderStatus",orderStatus);
+        //不分页筛选数据
+        List<Map<String, Object>> LoadingResult = tmstruckLoadResultService.getCgNzLoadingResult(mapval);
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> loadResult = tmstruckLoadResultService.getCgNzLoadingResult(mapval);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, LoadingResult,loadResult);
+        return success(pageList);
+    }
 }

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

@@ -130,7 +130,8 @@ public class TmstruckWeightResultController extends BaseRESTfulController {
                                            Integer apiId,
                                            Integer pageNum,
                                            Integer pageSize,
-                                           Integer orderType,String con
+                                           Integer orderType,
+                                           String con
     ){
 
         mapValue.put("orderTypee", orderType);

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

@@ -60,4 +60,9 @@ public interface TmstruckEnfactoryResultMapper extends IBaseMapper<TmstruckEnfac
 
 //    通过运输订单获取零星物资进厂实绩
     List<Map<String, Object>> getSporadicSuppliesEnFactoryResult(Map<String, Object> map);
+
+    List<Map<String, Object>> getCGNZEnFactory(Map<String, Object> map);
+
+    List<Map<String, Object>> getCgNzOutFactory(Map<String, Object> map);
+
 }

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

@@ -39,7 +39,7 @@ public interface TmstruckLeaveFactoryResultMapper extends IBaseMapper<TmstruckLe
     //查询内转厂内物资出厂实绩
     List<Map<String, Object>> getInFactoryOutFactoryResult(Map<String, Object> map);
 
-    //通过总实绩Id
+    //通过总实绩Id查询出厂实绩
     BigDecimal getResultIdByTotalId(Integer resultTotalId);
 
     Map<String, Object> getTruckFactoryResult(String nu);

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

@@ -101,10 +101,17 @@ public interface TmstruckLoadResultMapper extends IBaseMapper<TmstruckLoadResult
     //查询所有正在进行进厂排队的销售订单
     List<Map<String, Object>> getSaleOrderOnQueue(Map<String, Object> map);
 
+
+    //根据总实绩查询装车实绩
     BigDecimal getResultId(BigDecimal totalId);
 
+    //根据总实绩id查询运输订单类型
     Integer getOrderType(BigDecimal totalId);
 
     //根据运输id查询所有的零星物资出厂实绩
     List<Map<String, Object>> getSporadicSuppliesLoadResult(Map<String, Object> map);
+
+   //获取达州钢铁内转实绩
+    List<Map<String, Object>> getCgNzLoadingResult(Map<String, Object> mapVal);
+
 }

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);
@@ -67,4 +66,9 @@ public interface TmstruckMeasureCommissionMapper extends IBaseMapper<TmstruckMea
 
     //零星物资进厂计量委托
     Map<String, Object> sporadicDXMeasure(Map<String, Object> map);
+
+    Integer getReceiveIdByRequirementOrderId(Object orderId);
+
+    Map<String, Object> purchaseXqCgNzDXMeasure(Map<String, Object> map);
+
 }

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

@@ -82,4 +82,7 @@ public interface TmstruckWeightResultMapper extends IBaseMapper<TmstruckWeightRe
 
 //    根据运输订单Id获取计毛实绩
     List<Map<String, Object>> getSporadicSuppliesJiMiaoResult(Map<String, Object> map);
+
+    BigDecimal getXqCgWeightIdByLineAndOrderId(Map<String, Object> map);
+
 }

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

@@ -65,4 +65,7 @@ public interface UtilsMapper {
 
     //通过订单ID查询物资ID（针对单拼）
     List<Integer> getMaterialIdByOrderId(BigDecimal orderId);
+
+    //查询订单ID查询第一个计量的物资Id（物资子表）
+    Integer getLxFirstMaterialId(BigDecimal orderId);
 }

src/main/java/com/steerinfo/dil/service/ITmstruckLeaveFactoryResultService.java

@@ -25,7 +25,7 @@ public interface ITmstruckLeaveFactoryResultService {
     List<Map<String, Object>> getLeaveFactoryResult(Map<String, Object> map);
 
     //更新出厂实绩 通过运输订单号
-    int leaveFactoryByPDA(Map<String, Object> map);
+    int leaveFactoryByPDA(Map<String, Object> map) throws Exception;
 
     //查询运输路线是否为可出厂 路段顺序号为 4：已计皮完成
     Integer selectTransportRoute(String orderNumber);

src/main/java/com/steerinfo/dil/service/ITmstruckLoadResultService.java

@@ -76,4 +76,8 @@ public interface ITmstruckLoadResultService{
 
     //新增达州站-厂内装车实绩
     int addDaZhouToDaGangLoadResult(Map<String, Object> map);
+
+   //查询采购内转装车实绩
+    List<Map<String, Object>> getCgNzLoadingResult(Map<String, Object> mapval);
+
 }

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

@@ -112,10 +112,11 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
             case 9:
                 return tmstruckEnfactoryResultMapper.getImportedDomesticNzLoadResult(map); //apiId:99
             case 10:
-                break;
+                return tmstruckEnfactoryResultMapper.getCGNZEnFactory(map); //apiId:99
             case 11:
                 return tmstruckEnfactoryResultMapper.getInFactoryMaterialEnFactoryResult(map); //apiId:357
             case 12:
+                return tmstruckEnfactoryResultMapper.getSporadicSuppliesEnFactoryResult(map);// apiId:403
             case 13:
                 return tmstruckEnfactoryResultMapper.getSporadicSuppliesEnFactoryResult(map);// apiId:403
         }
@@ -135,20 +136,26 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
 
     /**
      * 通过PDA进厂
-     * orderNumber 运输订单号 gatepostName 门岗名称
+     * orderNumber 运输订单号 gatepostId 门岗Id
      * 1：销售订单；2：焦炭发运计划；3：水渣发运计划；4：内转到异地库；5：采购辅料订单；6：采购老区燃料订单；
      * 7：采购新区燃料订单；8：采购进口矿(万州-厂内)；9：采购内转(达州-厂内)；10：采购内转(老区-厂内)； 11：厂内内转
      * @param map
      * @return
      */
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public int enFactoryResultByPDA(Map<String, Object> map) throws Exception {
         int i = 0;
         //通过运输订单号查询订单类型
         String orderNumber = (String) map.get("orderNumber");
+
         String substring = orderNumber.substring(0, orderNumber.length() - 1);
-        map.putAll(tmstruckEnfactoryResultMapper.selectEnFactoryResultId(substring));
+        Map<String, Object> selectMap = tmstruckEnfactoryResultMapper.selectEnFactoryResultId(substring);
+        if(selectMap == null){
+            throw new Exception("该车已进厂！！");
+        }
+        map.putAll(selectMap);
         BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderTypee"));
+        BigDecimal lineSqe = DataChange.dataToBigDecimal(map.get("segmentSqe"));
         i += updateEnFactoryResultByPDA(map); //添加进厂实绩
         //修改路段顺序号
         i += utilsService.updateOrderLineSequence(map);
@@ -185,14 +192,14 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
                     //更新汽车衡
                     i += tmstruckWeightResultService.updateWeightResult(calculateMap);
                 }
-                checkMeasureCommission += tmstruckMeasureCommissionService.addXSMeasureCommission(map); //添加计皮委托
+                checkMeasureCommission = tmstruckMeasureCommissionService.addXSMeasureCommission(map); //添加计皮委托
                 break;
             case 2:
             case 3:
                 //计算计皮汽车衡并更新计量实绩
                 i += tmstruckWeightResultService.calculateTruckCalculateByOne(map, 1);
                 //焦炭 水渣 等只会有一种物资
-                i += tmstruckMeasureCommissionService.addMaoMeasureCommission(map); //添加计量委托
+                checkMeasureCommission += tmstruckMeasureCommissionService.addMaoMeasureCommission(map); //添加计量委托
                 break;
             case 5:
             case 6:
@@ -202,24 +209,35 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
                 //计算计毛汽车衡并更新计量实绩 (暂时无法计算汽车衡)  需要写一个单独的方法 先计皮再计毛的
                 map.put("grossPlaceId", 18);
                 i += tmstruckWeightResultService.updateWeightResult(map);
-                //通过物资ID查询物资Id
+                //通过订单ID查询物资Id
                 List<Integer> materialIdList = utilsMapper.getMaterialIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
                 map.put("materialId", materialIdList.get(0));
-                checkMeasureCommission += tmstruckMeasureCommissionService.addMaoMeasureCommission(map); //添加计毛委托 并发送计毛委托
+                checkMeasureCommission = tmstruckMeasureCommissionService.addMaoMeasureCommission(map); //添加计毛委托 并发送计毛委托
                 break;
             case 10: // 采购内转（老区-厂内） 没有进厂
+                if(lineSqe.intValue() == 1){
+                   //计算计皮汽车衡并更新计量实绩
+                    map.put("tarePlaceId",15);
+                    i += tmstruckWeightResultService.updateWeightResult(map);
+                    checkMeasureCommission = tmstruckMeasureCommissionService.addMaoMeasureCommission(map); //添加计量委托
+                }else{
+                    map.put("grossPlaceId",18);
+                    i += tmstruckWeightResultService.updateWeightResult(map);
+                    checkMeasureCommission = tmstruckMeasureCommissionService.addMaoMeasureCommission(map); //添加计量委托
+
+                }
                 break;
             case 11:
+                break;
             case 12:
-                //更新计量实绩
-                map.put("grossPlaceId", 5);
-                i += tmstruckWeightResultService.updateWeightResult(map);
+            case 13:
+                //无法确定汽车衡
                 //发送计量委托
-                List<Integer> materialIdByOrderId = utilsMapper.getMaterialIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
-                map.put("materialId", materialIdByOrderId.get(0));
+                Integer materialId = utilsMapper.getLxFirstMaterialId(DataChange.dataToBigDecimal(map.get("orderId")));
+                map.put("materialId", materialId);
                 //默认收货单位为新厂区
+                 checkMeasureCommission += tmstruckMeasureCommissionService.addLXMeasureCommission(map);
 
-                checkMeasureCommission += tmstruckMeasureCommissionService.addLXMeasureCommission(map);
         }
         if(checkMeasureCommission == 0){
             throw new Exception("委托发送失败");

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

@@ -126,10 +126,11 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
             case 9:
                 return tmstruckLeaveFactoryResultMapper.getImportedDomesticNzEnFactoryResult(map); //apiId:110
             case 10:
-                break;
+                return tmstruckEnfactoryResultMapper.getCgNzOutFactory(map);
             case 11:
                 return tmstruckLeaveFactoryResultMapper.getInFactoryOutFactoryResult(map); //apiId:361
             case 12:
+                return tmstruckLeaveFactoryResultMapper.getSporadicLeaveFactory(map);
             case 13:
                 return tmstruckLeaveFactoryResultMapper.getSporadicLeaveFactory(map);
         }
@@ -144,11 +145,15 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
      * @param map
      * @return
      */
-    public int leaveFactoryByPDA(Map<String, Object> map){
+    public int leaveFactoryByPDA(Map<String, Object> map) throws Exception{
         int i = 0;
         String orderNumber = (String) map.get("orderNumber");
         String substring = orderNumber.substring(0, orderNumber.length() - 1);
-        map.putAll(tmstruckLeaveFactoryResultMapper.selectResultId(substring));
+        Map<String, Object> selectMap = tmstruckLeaveFactoryResultMapper.selectResultId(substring);
+        if(selectMap == null){
+            throw new Exception("该车已出厂！！");
+        }
+        map.putAll(selectMap);
         map.put("orderNumber", substring);
         BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderTypee"));
         i += updateLeaveResultByPDA(map); //更新出厂实绩
@@ -180,11 +185,14 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
 //                }
                 break;
             case 10:
+                //判断出厂路段顺序号是否为最后一个 采购订单关闭订单
+                i += utilsService.closeOrderNormally(map);
                 break;
             case 11:
                 break;
             case 12:
-                //判断出厂路段顺序号是否为最后一个 采购订单关闭订单
+            case 13:
+                //判断出厂路段顺序是否为最后一个零星订单关闭订单
                 i += utilsService.closeOrderNormally(map);
         }
         utilsService.pushMesToWebsocket((String) map.get("capacityNumber"), "出厂");

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

@@ -90,6 +90,8 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
                 return tmstruckLoadResultMapper.getImportedDomesticNzLoadResult(map); //apiId = 353
             case 11:
                 return tmstruckLoadResultMapper.getInFactoryLoadResult(map); //apiId = 359
+            case  12:
+                return tmstruckLoadResultMapper.getSporadicSuppliesLoadResult(map); //apiId = 404
             case 13:
                 return tmstruckLoadResultMapper.getSporadicSuppliesLoadResult(map); //apiId = 404
         }
@@ -242,12 +244,13 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
     }
 
     /**
-     * PDA新增销售钢渣、水渣、危化品装车实绩
+     * PDA新增销售钢渣、水渣、危化品装车实绩  采购内转
      * loadStartTime 装车开始时间
-     * warehouseId  仓库Id      orderNumber 运输订单号   insertUpdateRemark 备注
+     * warehouseId  仓库Id      orderNumber 运输订单号 / orderId   insertUpdateRemark 备注
      * @param map
      * @return
      */
+    @Transactional
     public int addXS2LoadResult(Map<String, Object> map){
         //通过运输订单号 查询 总实绩ID、订单类型
         Map<String,Object> orderMap = tmstruckEnfactoryResultMapper.selectTotalResultIdByCpAndOn(map);
@@ -265,14 +268,21 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         Date loadEndTime = new Date();
         tmstruckLoadResult.setResultLoadEndTime(loadEndTime);
         //计算装车时长 取分钟
-        long differentTime = (loadEndTime.getTime() - loadStartTime.getTime() / 60000);
+        long differentTime = (loadEndTime.getTime() - loadStartTime.getTime()) / 60000;
         tmstruckLoadResult.setResultLoadDuration(new BigDecimal(differentTime));
         // 更新装货点
         tmstruckLoadResult.setLoadingId(DataChange.dataToBigDecimal(map.get("warehouseId")));
         tmstruckLoadResult.setInsertUpdateRemark((String) map.get("insertUpdateRemark"));
         int i = tmstruckLoadResultMapper.updateByPrimaryKeySelective(tmstruckLoadResult);
         //装车成功后计算计毛汽车衡（出厂：2）
-        i += tmstruckWeightResultService.calculateTruckCalculateByOne(map, 2);
+        BigDecimal orderType = DataChange.dataToBigDecimal(orderMap.get("orderType"));
+        if(orderType.intValue() == 10){
+            //如果订单是采购内转类型订单
+            map.put("grossPlaceId", 15);
+            i += tmstruckWeightResultService.updateWeightResult(map);
+        }else {
+            i += tmstruckWeightResultService.calculateTruckCalculateByOne(map, 2);
+        }
         //更新路段顺序号
         i += utilsService.updateOrderLineSequence(map);
         //推送消息到websocket
@@ -555,4 +565,9 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         }
         return count;
     }
+
+    @Override
+    public List<Map<String, Object>> getCgNzLoadingResult(Map<String, Object> mapval) {
+        return tmstruckLoadResultMapper.getCgNzLoadingResult(mapval);
+    }
 }

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

@@ -83,18 +83,24 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         addMeasureCommission(map); // 添加计毛委托
         //发送数据给计量系统 必要数据 orderTypee：订单类型  resultTotalId： 总实绩Id   orderId
         //获取当前订单是属于哪个厂区订单
-        Integer receiveId = tmstruckMeasureCommissionMapper.getReceiveIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
-            if (receiveId == 1) {
-                //发送委托给达州钢铁
-                i += sendMeasureCommissionMes(map);
-            }
-            if (receiveId == 2) {
-                //发送委托给达兴能源
-                i += sendDXMeasureCommissionMes(map);
+        Integer receiveId = 0 ;
+        if(DataChange.dataToBigDecimal(map.get("orderTypee")).intValue() == 10){
+            receiveId = tmstruckMeasureCommissionMapper.getReceiveIdByRequirementOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
+        }else{
+            receiveId = tmstruckMeasureCommissionMapper.getReceiveIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
+        }
+        if(receiveId == 1){
+            //发送委托给达州钢铁
+            i += sendMeasureCommissionMes(map);
+        }
+        if(receiveId == 2) {
+            //发送委托给达兴能源
+            i += sendDXMeasureCommissionMes(map);
         }
         return i;
     }
 
+
     /**
      * 发送销售订单计量委托
      * @param map
@@ -173,6 +179,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             case 3:
                 break;
             case 10:
+                break;
             case 11:
             case 4:
 
@@ -211,6 +218,8 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             case 2:
             case 3:
                 measureCommission = tmstruckMeasureCommissionMapper.saleDXMeasure(map); //订单ID  物资ID  计量实绩ID
+                if(measureCommission == null)
+                    return 0;
                 measureCommission.put("deliveryType", "计重");
                 measureCommission.put("billType", "1");
                 measureCommission.put("crname", "admin");
@@ -223,6 +232,8 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             case 7:
             case 8:
                 measureCommission =  tmstruckMeasureCommissionMapper.purchaseDXMeasure(map);
+                if(measureCommission == null)
+                    return 0;
                 measureCommission.put("deliveryType", "计重");
                 measureCommission.put("billType", "0");
                 measureCommission.put("crname", "admin");
@@ -230,11 +241,33 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             case 9:
                 break;
             case 10:
+                //新区采购内转
+                measureCommission = tmstruckMeasureCommissionMapper.purchaseXqCgNzDXMeasure(map);
+                if(measureCommission == null)
+                    return 0;
+                measureCommission.put("deliveryType", "计重");
+                measureCommission.put("crname", "admin");
+                //判断还没有净重的计量实绩
+                Integer weightResultCount = tmstruckMeasureCommissionMapper.selectNoNetWeightResult(DataChange.dataToBigDecimal(map.get("resultTotalId")));
+                if(weightResultCount == 1){
+                    //如果只剩一条未计量的数据则需要走金蝶(进厂卸货)
+                    measureCommission.put("orderSource", measureCommission.get("chooseOrderSource"));
+                    measureCommission.put("billType", "0");
+                    measureCommission.put("item", measureCommission.get("item") + ",1");
+                }else {
+                    measureCommission.put("orderSource", "0");
+                    measureCommission.put("billType", "2");
+                }
+                measureCommission.put("ended", "0");
                 break;
             case 11:
+                break;
             case 12:
+            case 13:
                 measureCommission = tmstruckMeasureCommissionMapper.sporadicDXMeasure(map);
-                measureCommission.put("regionName", " "); //无法确定汽车衡
+                if(measureCommission == null)
+                    return 0;
+                measureCommission.put("regionName", "无法确定汽车衡"); //无法确定汽车衡
                 measureCommission.put("deliveryType", "计重");
                 measureCommission.put("billType", "2");
                 measureCommission.put("planQuantity", "0");
@@ -242,10 +275,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission.put("orderSource", "0");
                 measureCommission.put("ended", "0");
                 break;
-            case 13:
             case 14:
-
-
         }
         /*访问接口发送数据*/
         return sendMesToDXMeasure(measureCommission);
@@ -301,7 +331,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         if(!"null".equals(jsonData)){
             System.out.println(jsonData);
             HashMap hashMap = JSON.parseObject(jsonData, HashMap.class);
-            String code = (String) map.get("code");
+            String code = (String) hashMap.get("code");
             System.out.println(hashMap.get("msg"));
             if("0".equals(code)){
                 return 1;

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

@@ -133,8 +133,10 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
         int i = 0;
         map.putAll(tmstruckUnloadResultMapper.selectTotalIdByOrderNo((String) map.get("orderNumber")));
         BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderTypee"));
+        i += updateUnloadResultBy(map); //更新卸货实绩
         //路段顺序号 + 1
         i += utilsService.updateOrderLineSequence(map);
+        BigDecimal resultTotalId = DataChange.dataToBigDecimal(map.get("resultTotalId"));
         switch (orderType.intValue()){
             case 1:
                 break;
@@ -149,7 +151,6 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             case 7:
             case 8:
             case 9:
-                i += updateUnloadResultBy(map); //更新卸货实绩
                 //计算计皮汽车衡 (当前无法计算汽车衡)
                 map.put("tarePlaceId", 6);
                 i += tmstruckWeightResultService.updateWeightResult(map);
@@ -157,19 +158,27 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
 //                List<Integer> materialIdList = utilsMapper.getMaterialIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
 //                map.put("materialId", materialIdList.get(0));
                 i += tmstruckReceiptResultService.addReceiptResult(map); //新增完卸车实绩后新增一条收货实绩
-                //计皮委托发送后更新出厂门岗
-                BigDecimal resultTotalId = DataChange.dataToBigDecimal(map.get("resultTotalId"));
+
                 //计算出厂门岗 （暂时定死）
                 Integer gatepostId = 2;
+                //计皮委托发送后更新出厂门岗
                 i += tmstruckLeaveFactoryResultService.updateLeaveFactoryGatepostId(resultTotalId.intValue(), gatepostId);
                 break;
             case 10:
+                //计算计皮汽车衡 (当前无法计算汽车衡)
+                map.put("tarePlaceId", 18);
+                i += tmstruckWeightResultService.updateWeightResult(map);
+                //计算出厂门岗 （暂时定死）
+                Integer gatepostId2 = 9;
+                //计皮委托发送后更新出厂门岗
+                i += tmstruckLeaveFactoryResultService.updateLeaveFactoryGatepostId(resultTotalId.intValue(), gatepostId2);
+                i += tmstruckReceiptResultService.addReceiptResult(map); //新增完卸车实绩后新增一条收货实绩
                 break;
             case 11:
                 //判断出厂路段顺序号是否为最后一个
                 i += utilsService.closeOrderNormally(map);
             case 12:
-                i += updateUnloadResultBy(map); //更新卸货实绩
+
                 //判断是否还有物资，如果还有物资就执行发送计量委托
                 materialIdIsNorWeight(map);
                 break;

src/main/resources/bootstrap.yml

@@ -37,7 +37,7 @@ openfeign:
     url: ${IMFEIGN_URL:172.16.33.161:8055}
 
 
-#    测试环境
+##    测试环境
 #  ColumnDataFeign:
 #    url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
 #  BmsShipFeign:

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

@@ -639,12 +639,9 @@
             <if test="orderId != null">
                 OO.ORDER_ID = #{orderId}
             </if>
-            <if test="orderNumber != null">
+            <if test="orderNumber != null and orderId == null">
                 and OO.ORDER_NUMBER = #{orderNumber}
             </if>
-            <if test="capacityNumber != null">
-                RC.CAPACITY_NUMBER = #{capacityNumber} and OO.ORDER_STATUS != 2 --司机还未结束不能生成下一单
-            </if>
         </where>
     </select>
 
@@ -657,20 +654,25 @@
 
     <!--  通过运输订单号查找实绩Id -->
     <select id="selectEnFactoryResultId" parameterType="string" resultType="java.util.Map">
-        select TER.RESULT_ID       "resultId",
-               OO.ORDER_ID         "orderId",
-               OO.ORDER_TYPE       "orderTypee", --避免与筛选条件重名
-               TER.RESULT_TOTAL_ID "resultTotalId",
-               RC.CAPACITY_NUMBER   "capacityNumber",
-               TER.SEGMEN_SQE       "segmentSqe" --进厂的路段顺序号
-        from OMSTRUCK_ORDER OO
-                 left join TMSTRUCK_TOTAL_RESULT TTR
-                           on OO.ORDER_ID = TTR.ORDER_ID
-                 left join TMSTRUCK_ENFACTORY_RESULT TER
-                           on TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-                 left join RMS_CAPACITY RC
-                            on RC.CAPACITY_ID = OO.CAPACITY_ID
-        where OO.ORDER_NUMBER = #{orderNumber}
+        select * from (select TER.RESULT_ID              "resultId",
+               OO.ORDER_ID                "orderId",
+               OO.ORDER_TYPE              "orderTypee", --避免与筛选条件重名
+               OO.ORDER_TYPE              "orderType",
+               TER.RESULT_TOTAL_ID        "resultTotalId",
+               RC.CAPACITY_NUMBER         "capacityNumber",
+               TER.SEGMEN_SQE             "segmentSqe", --进厂的路段顺序号
+               ter.result_entry_gate_time
+          from OMSTRUCK_ORDER OO
+          left join TMSTRUCK_TOTAL_RESULT TTR
+            on OO.ORDER_ID = TTR.ORDER_ID
+          left join TMSTRUCK_ENFACTORY_RESULT TER
+            on TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+          left join RMS_CAPACITY RC
+            on RC.CAPACITY_ID = OO.CAPACITY_ID
+         where OO.ORDER_NUMBER = #{orderNumber}
+           and ter.result_entry_gate_time is null
+         order by TER.SEGMEN_SQE)
+         where rownum=1
     </select>
 
     <!--  查找排队序号 -->
@@ -1293,5 +1295,146 @@
         </where>
         <include refid="orderByEnterTime"></include>
     </select>
-
+    <select id="getCGNZEnFactory" resultType="java.util.Map" parameterType="map">
+        select
+        *
+        from(
+        select TER.RESULT_ID "resultId",
+        APO.PURCHASE_ORDER_NO "purchaseOrderNo",
+        RM.MATERIAL_NAME "materialName",
+        DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
+        OO.ORDER_NUMBER "orderNumber",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RG.GATEPOST_NAME "gatepostName",
+        TER.RESULT_ENTRY_MODE "resultEntryMode",
+        TER.RESULT_ENTRY_GATE_TIME "resultEntryGateTime",
+        RS.SUPPLIER_NAME "supplierName",
+        OOM.ORDER_MATERIAL_WEIGHT "orderMaterialWeight",
+        TER.INSERT_TIME "insertTime",
+        RCON.CONSIGNEE_COMPANY_NAME "consigneeCompanyName"
+        from TMSTRUCK_ENFACTORY_RESULT TER
+        left join TMSTRUCK_TOTAL_RESULT TTR
+        on TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        left join OMSTRUCK_ORDER OO
+        on TTR.ORDER_ID = OO.ORDER_ID
+        left join amstruck_inward_plan aip
+        on aip.plan_id = oo.order_plan_id
+        left join amstruck_requirement_plan arp
+        on arp.plan_id = aip.plan_id
+        left join amstruck_inward_requirement air
+        on air.requirement_id = arp.requirement_id
+        left join AMS_PURCHASE_ORDER APO
+        on apo.purchase_order_id = air.purchase_order_id
+        left join DIL_BATCH DB
+        on DB.BATCH_ID = APO.BATCH_ID
+        left join RMS_CAPACITY RC
+        on RC.CAPACITY_ID = OO.CAPACITY_ID
+        left join RMS_SUPPLIER RS
+        on RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+        left join RMS_CONSIGNEE RCON
+        on RCON.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
+        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
+        left join RMS_GATEPOST RG
+        on RG.GATEPOST_ID = TER.GATEPOST_ID
+        where TER.RESULT_ENTRY_GATE_TIME is not null
+        and OO.ORDER_TYPE = 10
+        )
+        <where>
+            <if test="purchaseOrderId != null">
+                <foreach collection="purchaseOrderId" item="item" open="(" separator="or" close=")">
+                    "purchaseOrderId" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialName != null">
+                and
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="resultForeignShipName != null">
+                and
+                <foreach collection="resultForeignShipName" item="item" open="(" separator="or" close=")">
+                    "resultForeignShipName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="orderNumber != null">
+                and
+                <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
+                    "orderNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="capacityNumber != null">
+                and
+                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                    "capacityNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="warehouseName != null">
+                and
+                <foreach collection="warehouseName" item="item" open="(" separator="or" close=")">
+                    "warehouseName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="resultEntryMode != null">
+                and
+                <foreach collection="resultEntryMode" item="item" open="(" separator="or" close=")">
+                    "resultEntryMode" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="supplierName != null">
+                and
+                <foreach collection="supplierName" item="item" open="(" separator="or" close=")">
+                    "supplierName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="orderMaterialWeight != null">
+                and
+                <foreach collection="orderMaterialWeight" item="item" open="(" separator="or" close=")">
+                    "orderMaterialWeight" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderByEnterTime"></include>
+    </select>
+    <select id="getCgNzOutFactory" resultType="java.util.Map">
+        select TLFR.RESULT_ID                     "resultId",
+       APO.PURCHASE_ORDER_NO              "purchaseOrderNo",
+       RM.MATERIAL_NAME                   "materialName",
+       DB.RESULT_FOREIGN_SHIP_NAME        "resultForeignShipName",
+       OO.ORDER_NUMBER                    "orderNumber",
+       RC.CAPACITY_NUMBER                 "capacityNumber",
+       RG.GATEPOST_NAME                   "gatepostName",
+       TLFR.RESULT_OUT_MODE               "resultOutMode",
+       TLFR.RESULT_OUT_GATE_TIME          "resultOutGateTime",
+       TLFR.RESULT_TRUCK_SNAPSHOT_PICTURE "resultTruckSnapshotPicture"
+  from TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+  left join TMSTRUCK_TOTAL_RESULT TTR
+    on TTR.RESULT_TOTAL_ID = TLFR.RESULT_TOTAL_ID
+  left join OMSTRUCK_ORDER OO
+    on OO.ORDER_ID = TTR.ORDER_ID
+  left join amstruck_inward_plan aip
+    on aip.plan_id = oo.order_plan_id
+  left join amstruck_requirement_plan arp
+    on arp.plan_id = aip.plan_id
+  left join amstruck_inward_requirement air
+    on air.requirement_id = arp.requirement_id
+  left join AMS_PURCHASE_ORDER APO
+    on APO.PURCHASE_ORDER_ID = air.PURCHASE_ORDER_ID
+  left join DIL_BATCH DB
+    on DB.BATCH_ID = APO.BATCH_ID
+  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
+  left join RMS_CAPACITY RC
+    on RC.CAPACITY_ID = OO.CAPACITY_ID
+  left join RMS_GATEPOST RG
+    on RG.GATEPOST_ID = TLFR.GATEPOST_ID
+ where RESULT_OUT_GATE_TIME is not null
+   and OO.ORDER_TYPE = 10
+    order by tlfr.result_out_gate_time
+    </select>
 </mapper>

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

@@ -767,9 +767,15 @@
 
 <!-- 通过总实绩Id 查询出厂实绩ID   -->
     <select id="getResultIdByTotalId" parameterType="int" resultType="java.math.BigDecimal">
-        select TLFR.RESULT_ID
-        from TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
-        where TLFR.RESULT_TOTAL_ID = #{resultTotalId}
+        select *
+        from (
+                 select TLFR.RESULT_ID
+                 from TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+                 where TLFR.RESULT_TOTAL_ID = #{resultTotalId}
+                   and TLFR.RESULT_OUT_GATE_TIME is null
+                 order by TLFR.SEGMENT_SQE
+             )
+        where rownum = 1
     </select>
     <select id="getTruckFactoryResult" resultType="java.util.Map">
                 

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

@@ -1302,33 +1302,40 @@
         SELECT
                *
         FROM (
-                 SELECT APO.PURCHASE_ORDER_NO       "purchaseOrderNo",
-                        RM.MATERIAL_NAME            "materialName",
-                        DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
-                        OO.ORDER_NUMBER             "orderNumber",
-                        RC.CAPACITY_NUMBER          "capacityNumber",
-                        OOM.ORDER_MATERIAL_WEIGHT   "orderMaterialWeight",
-                        TLR.RESULT_LOAD_START_TIME  "resultLoadStartTime",
-                        RW.WAREHOUSE_NAME           "warehouseName"
-                 FROM TMSTRUCK_LOAD_RESULT TLR
-                          LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
-                                    ON TTR.RESULT_TOTAL_ID = TLR.RESULT_TOTAL_ID
-                          LEFT JOIN OMSTRUCK_ORDER OO
-                                    ON OO.ORDER_ID = TTR.ORDER_ID
-                          LEFT JOIN AMS_PURCHASE_ORDER APO
-                                    ON APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
-                          LEFT JOIN DIL_BATCH DB
-                                    ON DB.BATCH_ID = APO.BATCH_ID
-                          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
-                          LEFT JOIN RMS_CAPACITY RC
-                                    ON RC.CAPACITY_ID = OO.CAPACITY_ID
-                          LEFT JOIN RMS_WAREHOUSE RW
-                                    ON RW.WAREHOUSE_ID = TLR.LOADING_ID
-                 WHERE OO.ORDER_TYPE = #{orderTypee}
-                   AND TLR.RESULT_LOAD_START_TIME IS NOT NULL
+        SELECT APO.PURCHASE_ORDER_NO       "purchaseOrderNo",
+        RM.MATERIAL_NAME            "materialName",
+        DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
+        OO.ORDER_NUMBER             "orderNumber",
+        RC.CAPACITY_NUMBER          "capacityNumber",
+        OOM.ORDER_MATERIAL_WEIGHT   "orderMaterialWeight",
+        TLR.RESULT_LOAD_START_TIME  "resultLoadStartTime",
+        RW.WAREHOUSE_NAME           "warehouseName"
+        FROM TMSTRUCK_LOAD_RESULT TLR
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.RESULT_TOTAL_ID = TLR.RESULT_TOTAL_ID
+        LEFT JOIN OMSTRUCK_ORDER OO
+        ON OO.ORDER_ID = TTR.ORDER_ID
+        left join amstruck_inward_plan aip
+        on aip.plan_id = oo.order_plan_id
+        left join amstruck_requirement_plan arp
+        on arp.plan_id = aip.plan_id
+        left join amstruck_inward_requirement air
+        on air.requirement_id = arp.requirement_id
+        LEFT JOIN AMS_PURCHASE_ORDER APO
+        ON APO.PURCHASE_ORDER_ID = air.PURCHASE_ORDER_ID
+        LEFT JOIN DIL_BATCH DB
+        ON DB.BATCH_ID = APO.BATCH_ID
+        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
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN RMS_WAREHOUSE RW
+        ON RW.WAREHOUSE_ID = TLR.LOADING_ID
+        WHERE OO.ORDER_TYPE =#{orderTypee}
+        AND TLR.RESULT_LOAD_START_TIME IS NOT NULL
+        order by tlr.result_load_end_time
              )
         <where>
             <if test="purchaseOrderNo != null">
@@ -1543,4 +1550,34 @@
             order by "resultLoadStartTime" desc
         </if>
     </select>
+<!--  获取采购内转装车实绩  -->
+    <select id="getCgNzLoadingResult" resultType="java.util.Map" parameterType="java.lang.Integer">
+          select *from ( select OO.ORDER_NUMBER              "orderNumber",
+                       OOM.ORDER_MATERIAL_WEIGHT    "orderMaterialWeight",
+                       OO.ORDER_RECEIVE_REFUSE_TIME "orderReceiveRefuseTime",
+                       RW.WAREHOUSE_NAME            "warehouseName",
+                       RM.MATERIAL_NAME             "materialName",
+                       RC.CAPACITY_NUMBER           "capacityNumber",
+                       RW2.WAREHOUSE_NAME           "warehouseName2",
+                       OO.INSERT_UPDATE_REMARK      "insertUpdateRemark",
+                       TTR.RESULT_TOTAL_ID          "resultTotalId"
+                  from OMSTRUCK_ORDER OO
+                  left join RMS_CAPACITY RC
+                    on RC.CAPACITY_ID = OO.CAPACITY_ID
+                  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
+                  left join RMS_WAREHOUSE RW
+                    on RW.WAREHOUSE_ID = OO.UNLOAD_POINT_ID
+                  left join TMSTRUCK_TOTAL_RESULT TTR
+                    on TTR.ORDER_ID = OO.ORDER_ID
+                  left join TMSTRUCK_LOAD_RESULT TLR
+                    on TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                  left join RMS_WAREHOUSE RW2
+                    on RW2.WAREHOUSE_ID = TLR.LOADING_ID
+                 where OO.ORDER_STATUS = #{orderStatus}
+                   and TLR.RESULT_LOAD_END_TIME IS NULL
+                   and OO.ORDER_TYPE = #{orderType})
+    </select>
 </mapper>

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

@@ -912,33 +912,113 @@
 
 <!--  零星物资进厂计量委托  -->
     <select id="sporadicDXMeasure" parameterType="map" resultType="java.util.Map">
-        select oo.order_number            "orderId",
-               oom.material_id            "item",
-               rc.capacity_number         "carNumber",
-               rm.material_code           "goodsNo",
-               rm.material_name           "goodsName",
-               rs.supplier_name           "provider",
-               (case
-                    when RS.SUPPLIER_DUTY_PARAGRAPH is null
-                        then ' '
-                    else RS.SUPPLIER_DUTY_PARAGRAPH
-                   end
-                   )                      "providerNo",
-               rce.consignee_company_name "receiver",
-               rce.CONSIGNEE_CODE          "receiverNo"
-        from omstruck_order oo
-                 left join omstruck_order_material oom
-                           on oom.order_id = oo.order_id
-                 left join rms_capacity rc
-                           on rc.capacity_id = oo.capacity_id
-                 left join rms_material rm
-                           on rm.material_id = oom.material_id
-                 left join amstruck_sporadic_order aso
-                           on aso.sporadic_order_id = oo.order_plan_id
-                 left join rms_supplier rs
-                           on rs.supplier_id = aso.send_unit_id
-                 left join rms_consignee rce
-                           on rce.consignee_id = aso.receive_unit_id
+        SELECT
+            oo.order_number "orderId",
+            oom.material_id "item",
+            rc.capacity_number "carNumber",
+            rm.material_code "goodsNo",
+            rm.material_name "goodsName",
+            rs.supplier_name "provider",
+            ( CASE WHEN RS.SUPPLIER_DUTY_PARAGRAPH IS NULL THEN ' ' ELSE RS.SUPPLIER_DUTY_PARAGRAPH END ) "providerNo",
+            rce.consignee_company_name "receiver",
+            rce.CONSIGNEE_CODE "receiverNo"
+        FROM
+            omstruck_order oo
+                LEFT JOIN omstruck_order_material oom ON oom.order_id = oo.order_id
+                LEFT JOIN rms_capacity rc ON rc.capacity_id = oo.capacity_id
+                LEFT JOIN rms_material rm ON rm.material_id = oom.material_id
+                LEFT JOIN amstruck_sporadic_order aso ON aso.sporadic_order_id = oo.order_plan_id
+                LEFT JOIN rms_supplier rs ON rs.supplier_id = aso.send_unit_id
+                LEFT JOIN rms_consignee rce ON rce.consignee_id = aso.receive_unit_id
         where oo.order_id = #{orderId} and oom.material_id = #{materialId}
     </select>
+    <select id="getReceiveIdByRequirementOrderId" resultType="java.lang.Integer" parameterType="java.math.BigDecimal">
+        select apo.receive_unit_id
+  from omstruck_order oo
+  left join amstruck_inward_plan aip
+    on aip.plan_id = oo.order_plan_id
+  left join amstruck_requirement_plan arp
+    on arp.plan_id = aip.plan_id
+  left join amstruck_inward_requirement air
+    on air.requirement_id = arp.requirement_id
+  left join ams_purchase_order apo
+    on apo.purchase_order_id = air.purchase_order_id
+ where oo.order_id = #{orderId}
+    </select>
+    <select id="purchaseXqCgNzDXMeasure" resultType="java.util.Map" parameterType="map">
+        select *
+        from (
+                 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
+                              then (
+                                    select RTC.TRUCK_CALCULATE_NUMBER from RMS_TRUCK_CALCULATE RTC
+                                    where RTC.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_ID
+                                  )
+                              when TWR.RESULT_GROSS_PLACE_ID is null
+                              then (
+                                  select RTC.TRUCK_CALCULATE_NUMBER from RMS_TRUCK_CALCULATE RTC
+                                  where RTC.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
+                                  )
+                            end
+                            )                                                                          "regionName",
+                        RS.SUPPLIER_NAME                                                               "provider",
+                        RS.SUPPLIER_DUTY_PARAGRAPH                                                     "providerNo",
+                        RSH.SHIPPER_NAME                                                               "receiver",
+                        (case
+                             when RSH.SHIPPER_PARTITION_CODE is null then
+                                 ' '
+                             else
+                                 RSH.SHIPPER_PARTITION_CODE
+                            end)                                                                       "receiverNo",
+                        RM.MATERIAL_ID || ''                                                           "item",
+                        RM.MATERIAL_CODE                                                               "goodsNo",
+                        CONCAT(RM.MATERIAL_NAME, CONCAT(RM.MATERIAL_SPECIFICATION, RM.MATERIAL_MODEL)) "goodsName",
+                        (case
+                             when OOM.ORDER_MATERIAL_WEIGHT is null then
+                                 0
+                             else
+                                 OOM.ORDER_MATERIAL_WEIGHT
+                            end) || ''                                                                 "planQuantity"
+
+                 from OMSTRUCK_ORDER OO
+                          left join TMSTRUCK_TOTAL_RESULT TTR
+                                    on TTR.ORDER_ID = OO.ORDER_ID
+                          left join amstruck_inward_plan aip
+                                    on aip.plan_id = oo.order_plan_id
+                          left join amstruck_requirement_plan arp
+                                    on arp.plan_id = aip.plan_id
+                          left join amstruck_inward_requirement air
+                                    on air.requirement_id = arp.requirement_id
+                          left join ams_purchase_order apo
+                                    on apo.purchase_order_id = air.purchase_order_id
+                          left join RMS_SUPPLIER RS
+                                    on RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+                          left join RMS_SHIPPER RSH
+                                    on RSH.SHIPPER_ID = APO.RECEIVE_UNIT_ID
+                          left join OMSTRUCK_ORDER_MATERIAL OOM
+                                    on OO.ORDER_ID = OOM.ORDER_ID
+                          left join RMS_MATERIAL RM
+                                    on RM.MATERIAL_ID = OOM.MATERIAL_ID
+                          left join RMS_CAPACITY RC
+                                    on RC.CAPACITY_ID = OO.CAPACITY_ID
+                          left join TMSTRUCK_WEIGHT_RESULT TWR
+                                    on TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
+
+                          left join TMSTRUCK_UNLOAD_RESULT TUR
+                                    on TUR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                 where OO.ORDER_ID = #{orderId}
+                   and TWR.RESULT_NET_WEIGHT is null
+                 order by TWR.TARE_SEGMENT_SQE
+             )
+        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 and TWR.RESULT_TOTAL_ID = #{resultTotalId}
+    </select>
 </mapper>

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

@@ -628,8 +628,14 @@
                             on TTR.RESULT_TOTAL_ID = TRR.RESULT_TOTAL_ID
                   left join OMSTRUCK_ORDER OO
                             on OO.ORDER_ID = TTR.ORDER_ID
+                  left join AMSTRUCK_INWARD_PLAN AIP
+                            on AIP.PLAN_ID = OO.ORDER_PLAN_ID
+                  left join AMSTRUCK_REQUIREMENT_PLAN ARP
+                            on ARP.PLAN_ID = AIP.PLAN_ID
+                  left join AMSTRUCK_INWARD_REQUIREMENT AIR
+                            on AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
                   left join AMS_PURCHASE_ORDER APO
-                            on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
+                            on APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
                   left join DIL_BATCH DB
                             on DB.BATCH_ID = APO.BATCH_ID
                   left join RMS_CAPACITY RC

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

@@ -761,17 +761,14 @@
 
     <!--  查询内转采购进口矿国产矿实绩(老区-厂内)  -->
     <select id="getImportedDomesticNzUnload2Result" parameterType="java.util.Map" resultType="java.util.Map">
-
         SELECT *
-        FROM (
-        SELECT
-        TUR.RESULT_ID          "resultId",
+        FROM (     SELECT TUR.RESULT_ID         "resultId",
         OO.ORDER_NUMBER       "orderNumber",
         RC.CAPACITY_NUMBER    "capacityNumber",
         RM.MATERIAL_NAME      "materialName",
         TWR.RESULT_NET_WEIGHT "resultNetWeight",
         RW.WAREHOUSE_NAME     "warehouseName",
-        TUR.RESULT_START_TIME "resultStartTime"
+        TUR.RESULT_END_TIME "resultEndTime"
         FROM TMSTRUCK_UNLOAD_RESULT TUR
         LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
         ON TTR.RESULT_TOTAL_ID = TUR.RESULT_TOTAL_ID
@@ -787,7 +784,8 @@
         ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         LEFT JOIN RMS_WAREHOUSE RW
         ON RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
-        WHERE TUR.RESULT_START_TIME IS NOT NULL AND OO.ORDER_TYPE = 10
+        WHERE TUR.RESULT_END_TIME IS NOT NULL
+        AND OO.ORDER_TYPE = 10
         )
         <where>
             <if test="orderNumber != null">
@@ -819,10 +817,10 @@
                     "warehouseName" like '%${item}%'
                 </foreach>
             </if>
-            <if test="resultStartTime != null">
+            <if test="resultEndTime != null">
                 and
-                <foreach collection="resultStartTime" item="item" open="(" separator="or" close=")">
-                    "resultStartTime" like '%${item}%'
+                <foreach collection="resultEndTime" item="item" open="(" separator="or" close=")">
+                    "resultEndTime" like '%${item}%'
                 </foreach>
             </if>
         </where>

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

@@ -1382,6 +1382,7 @@
     </select>
 
     <!--   通过物资Id和运输订单id 查询计量实绩Id -->
+
     <select id="getWeightIdBySQEAndOrderId" parameterType="java.util.Map" resultType="DECIMAL">
         select *
         from (
@@ -1392,7 +1393,7 @@
                           left join TMSTRUCK_WEIGHT_RESULT TWR
                                     on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
                  where OO.ORDER_ID = #{orderId}
-                   and (TWR.RESULT_NET_WEIGHT is null or TWR.RESULT_NET_WEIGHT = 0)
+                   and TWR.RESULT_NET_WEIGHT is null
                  order by TWR.TARE_SEGMENT_SQE
              )
         where rownum = 1
@@ -1857,26 +1858,32 @@
     <select id="getImportedDomesticNzJiPi2Result" parameterType="java.util.Map" resultType="java.util.Map">
         select *
         from (
-        select TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId",
-        APO.PURCHASE_ORDER_NO "purchaseOrderNo",
-        RM.MATERIAL_NAME "materialName",
-        OO.ORDER_NUMBER "orderNumber",
-        RC.CAPACITY_NUMBER "capacityNumber",
-        RTC.TRUCK_CALCULATE_NUMBER "truckCalculateNumber",
-        TWR.RESULT_GROSS_WEIGHT "resultGrossWeight",
+        select TWR.WEIGHT_TASK_RESULT_ID    "weightTaskResultId",
+        APO.PURCHASE_ORDER_NO        "purchaseOrderNo",
+        RM.MATERIAL_NAME             "materialName",
+        OO.ORDER_NUMBER              "orderNumber",
+        RC.CAPACITY_NUMBER           "capacityNumber",
+        RTC.TRUCK_CALCULATE_NUMBER   "truckCalculateNumber",
+        TWR.RESULT_GROSS_WEIGHT      "resultGrossWeight",
         TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
-        DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
-        TWR.RESULT_TARE_WEIGHT "resultTareWeight",
-        TWR.RESULT_TARE_WEIGHT_TIME "resultTareWeightTime",
-        TWR.RESULT_NET_WEIGHT "resultNetWeight",
-        TWR.RESULT_POUND_NO "resultPoundNo"
+        DB.RESULT_FOREIGN_SHIP_NAME  "resultForeignShipName",
+        TWR.RESULT_TARE_WEIGHT       "resultTareWeight",
+        TWR.RESULT_TARE_WEIGHT_TIME  "resultTareWeightTime",
+        TWR.RESULT_NET_WEIGHT        "resultNetWeight",
+        TWR.RESULT_POUND_NO          "resultPoundNo"
         from TMSTRUCK_WEIGHT_RESULT TWR
         left join TMSTRUCK_TOTAL_RESULT TTR
         on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         left join OMSTRUCK_ORDER OO
         on TTR.ORDER_ID = OO.ORDER_ID
+        left join amstruck_inward_plan aip
+        on aip.plan_id = oo.order_plan_id
+        left join amstruck_requirement_plan arp
+        on arp.plan_id = aip.plan_id
+        left join amstruck_inward_requirement air
+        on air.requirement_id = arp.requirement_id
         left join AMS_PURCHASE_ORDER APO
-        on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
+        on APO.PURCHASE_ORDER_ID = air.purchase_order_id
         left join DIL_BATCH DB
         on DB.BATCH_ID = APO.BATCH_ID
         left join RMS_CAPACITY RC
@@ -1973,24 +1980,30 @@
     <select id="getImportedDomesticNzJiMao2Result" parameterType="java.util.Map" resultType="java.util.Map">
         SELECT *
         FROM (
-        select TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId",
-        APO.PURCHASE_ORDER_NO "purchaseOrderNo",
-        RM.MATERIAL_NAME "materialName",
-        OO.ORDER_NUMBER "orderNumber",
-        DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
-        RC.CAPACITY_NUMBER "capacityNumber",
-        RTC.TRUCK_CALCULATE_NUMBER "truckCalculateNumber",
-        TWR.RESULT_GROSS_WEIGHT "resultGrossWeight",
+        select TWR.WEIGHT_TASK_RESULT_ID    "weightTaskResultId",
+        APO.PURCHASE_ORDER_NO        "purchaseOrderNo",
+        RM.MATERIAL_NAME             "materialName",
+        OO.ORDER_NUMBER              "orderNumber",
+        DB.RESULT_FOREIGN_SHIP_NAME  "resultForeignShipName",
+        RC.CAPACITY_NUMBER           "capacityNumber",
+        RTC.TRUCK_CALCULATE_NUMBER   "truckCalculateNumber",
+        TWR.RESULT_GROSS_WEIGHT      "resultGrossWeight",
         TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
-        RS.SUPPLIER_NAME "supplierName",
-        RCON.CONSIGNEE_COMPANY_NAME "consigneeCompanyName"
+        RS.SUPPLIER_NAME             "supplierName",
+        rsr.shipper_name             "consigneeCompanyName"
         from TMSTRUCK_WEIGHT_RESULT TWR
         left join TMSTRUCK_TOTAL_RESULT TTR
         on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         left join OMSTRUCK_ORDER OO
         on TTR.ORDER_ID = OO.ORDER_ID
+        left join AMSTRUCK_INWARD_PLAN AIP
+        on AIP.PLAN_ID = OO.ORDER_PLAN_ID
+        left join AMSTRUCK_REQUIREMENT_PLAN ARP
+        on ARP.PLAN_ID = AIP.PLAN_ID
+        left join AMSTRUCK_INWARD_REQUIREMENT AIR
+        on AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
         left join AMS_PURCHASE_ORDER APO
-        on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
+        on APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
         left join DIL_BATCH DB
         ON DB.BATCH_ID = APO.BATCH_ID
         left join RMS_CAPACITY RC
@@ -2003,8 +2016,8 @@
         on RM.MATERIAL_ID = OOM.MATERIAL_ID
         left join RMS_SUPPLIER RS
         on RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
-        left join RMS_CONSIGNEE RCON
-        on RCON.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
+        left join rms_shipper rsr
+        on rsr.shipper_id = APO.RECEIVE_UNIT_ID
         where RESULT_GROSS_WEIGHT_TIME is not null
         and OO.ORDER_TYPE = 10
         )

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

@@ -142,4 +142,16 @@
         from OMSTRUCK_ORDER_MATERIAL OOM
         where OOM.ORDER_ID = #{orderId}
     </select>
+
+<!--  通过订单ID查询零星物资第一个计量的物资  -->
+    <select id="getLxFirstMaterialId" parameterType="java.math.BigDecimal" resultType="java.lang.Integer">
+        select *
+        from (
+                 select OOM.MATERIAL_ID
+                 from OMSTRUCK_ORDER_MATERIAL OOM
+                 where OOM.ORDER_ID = #{orderId}
+                 order by OOM.MATERIAL_DIRECTION
+             )
+        where rownum = 1
+    </select>
 </mapper>