解决冲突

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

@@ -417,6 +417,42 @@ public class StatisticalReportController extends BaseRESTfulController {
         return success(pageList);
     }
 
+    @ApiOperation(value="查询该组织机构下的厂外进厂内转")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId", value = "s", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getOutFactoryInwardList")
+    public RESTfulResult getOutFactoryInwardList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                       Integer apiId,
+                                       Integer pageNum,
+                                       Integer pageSize,
+                                       String startTime,
+                                       String endTime,
+                                       String orgCode,
+                                       String isPage,
+                                       String index
+    ){
+        if (index!=null&&!"null".equals(index)){
+            mapValue.put("index",index);
+        }
+        if (orgCode!=null&&!"null".equals(orgCode)){
+            mapValue.put("orgCode",orgCode);
+        }
+        DataChange.queryDataByDateTime(startTime, endTime, mapValue,sdfDateTime);//根据时间段查询数据
+        if ("yes".equals(isPage)){
+            return  success(statisticalReportService.getOutFactoryInwardList(mapValue));
+        }
+        PageHelper.startPage(pageNum, pageSize);
+        //分页数据
+        List<Map<String, Object>> report = statisticalReportService.getOutFactoryInwardList(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData4(apiId, null, report);
+        return success(pageList);
+    }
+
     @ApiOperation(value="查询该组织机构下的内转统计报表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
@@ -468,9 +504,21 @@ public class StatisticalReportController extends BaseRESTfulController {
                                          Integer pageNum,
                                          Integer pageSize,
                                          String startTime,
-                                         String endTime
+                                         String endTime, BigDecimal orderType, String index, String isPage,String orgCode
     ){
+        if (index!=null&&!"null".equals(index)){
+            mapValue.put("index",index);
+        }
+        if (orgCode!=null&&!"null".equals(orgCode)){
+            mapValue.put("orgCode",orgCode);
+        }
+        if (orderType!=null&&!"null".equals(orderType)){
+            mapValue.put("orderTypee",orderType);
+        }
         DataChange.queryDataByDateTime(startTime, endTime, mapValue,sdfDateTime);//根据时间段查询数据
+        if ("yes".equals(isPage)){
+            return  success(statisticalReportService.getInwardReportForAssemble(mapValue));
+        }
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> report = statisticalReportService.getInwardReportForAssemble(mapValue);

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

@@ -167,6 +167,8 @@ public class TmstruckLoadResultController extends BaseRESTfulController {
                 return failed("已装过此物资");
             }else if(i == -3) {
                 return failed("该订单没有装货作业");
+            }else if (i ==-5){
+                return failed("请勿重复装车");
             }else if( i == -6){
                 return failed("请通知司机完成前序操作再来装货！");
             }else if(i == -7){

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

@@ -69,4 +69,7 @@ public interface StatisticalReportMapper {
 
     //查看该组织架构下的厂内内转统计报表
     List<Map<String, Object>> getInwardInFactory(Map<String, Object> mapValue);
+
+    //查询该组织下厂外-厂内内转统计报表（猫儿寨等）
+    List<Map<String, Object>> getOutFactoryInwardList(Map<String, Object> mapValue);
 }

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

@@ -63,5 +63,14 @@ public interface TmstruckLeaveFactoryResultMapper extends IBaseMapper<TmstruckLe
     Integer getSeq(BigDecimal orderId);
 
     Map<String, Object> getMessageMap(BigDecimal orderId);
-
+    // 得到销售订单下已出厂车辆已计量净重
+    Double getLeaveFactoryNetWeight(BigDecimal saleOrderId);
+    // 得到销售订单下单总重量
+    Double getSaleMaterialWeight(BigDecimal saleOrderId);
+    // 得到当前运单净重
+    Double getNowNetWeight(String orderNumber);
+    // 得到销售订单id
+    BigDecimal getSaleOrderId(String orderNumber);
+
+    Integer getOrderStatus(BigDecimal orderId);
 }

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

@@ -116,4 +116,6 @@ public interface TmstruckMeasureCommissionMapper extends IBaseMapper<TmstruckMea
     //查询已计重的物资
     Integer getAlreadyWeightMaterialNum(BigDecimal orderId);
 
+    Integer getNoNetWeight(BigDecimal orderId);
+
 }

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

@@ -67,5 +67,6 @@ public interface IStatisticalReportService {
     //查看该组织机构下的纯内转统计报表
     List<Map<String,Object>> getInwardInFactory(Map<String,Object> map);
 
+    List<Map<String, Object>> getOutFactoryInwardList(Map<String, Object> mapValue);
 }
 

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

@@ -245,5 +245,8 @@ public class StatisticalReportImpl implements IStatisticalReportService {
         return  statisticalReportMapper.getInwardInFactory(mapValue);
     }
 
-
+    @Override
+    public List<Map<String, Object>> getOutFactoryInwardList(Map<String, Object> mapValue) {
+        return statisticalReportMapper.getOutFactoryInwardList(mapValue);
+    }
 }

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

@@ -115,6 +115,10 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
                 return tmstruckEnfactoryResultMapper.getImportedDomesticNzLoadResult(map); //apiId:99
             case 10:
             case 20:
+            case 23:
+            case 24:
+            case 15:
+            case 16:
                 return tmstruckEnfactoryResultMapper.getCGNZEnFactory(map); //apiId:99
             case 11:
                 return tmstruckEnfactoryResultMapper.getInFactoryMaterialEnFactoryResult(map); //apiId:357
@@ -213,6 +217,8 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
             case 10:
             case 17:
             case 18:
+            case 23:
+            case 24:
                 checkMeasureCommission = tmstruckMeasureCommissionService.addMaoMeasureCommission(map); //添加计毛委托 并发送计毛委托
                 break;
             case 12:

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

@@ -148,6 +148,8 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 return tmstruckLeaveFactoryResultMapper.getImportedDomesticNzEnFactoryResult(map); //apiId:110
             case 10:
             case 20:
+            case 23:
+            case 24:
                 return tmstruckEnfactoryResultMapper.getCgNzOutFactory(map);
             case 11:
                 return tmstruckLeaveFactoryResultMapper.getInFactoryOutFactoryResult(map); //apiId:361
@@ -201,6 +203,19 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
             if(loadResultMap == null || loadResultMap.get("loadEndTime") == null){
                 throw new Exception("该车未扫装货，请提醒司机去扫装货");
             }
+            // 查询运单所属的销售订单id
+            BigDecimal saleOrderId = tmstruckLeaveFactoryResultMapper.getSaleOrderId(orderNumber);
+            // 得到销售订单下已出厂车辆已计量净重
+            Double allNetWeight = tmstruckLeaveFactoryResultMapper.getLeaveFactoryNetWeight(saleOrderId);
+            if (allNetWeight != null) {
+                // 得到当前运单净重
+                Double nowNetWeight = tmstruckLeaveFactoryResultMapper.getNowNetWeight(orderNumber);
+                // 得到销售订单下单总重量
+                Double saleWeight = tmstruckLeaveFactoryResultMapper.getSaleMaterialWeight(saleOrderId);
+                if (allNetWeight + nowNetWeight > saleWeight) {
+                    throw new Exception("该销售订单吨位已超额，不允许出厂，请提醒司机走流程卸货！");
+                }
+            }
         }
         map.putAll(mesMap);
         map.putAll(selectMap);
@@ -275,8 +290,8 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 //判断出厂路段顺序号是否为最后一个 采购订单关闭订单
                 i += utilsService.closeOrderNormally(map);
                 //根据运输订单ID查询路段顺序号
-                Integer seq = tmstruckLeaveFactoryResultMapper.getSeq(orderId);
-                if(seq == 10){
+                Integer orderStatus = tmstruckLeaveFactoryResultMapper.getOrderStatus(orderId);
+                if(orderStatus == 2){
                     //判断是否满足条件--计划是否被启用
                     Integer j = tmstruckLeaveFactoryResultMapper.getPlanEnable(orderId);
                     if(j == 1){
@@ -290,6 +305,16 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                     }
                 }
                 break;
+            case 23:
+            case 24:
+                i += utilsService.closeOrderNormally(map);
+                omsFeign.addPurInwardOrder(orderId);
+                try {
+                    bmsTruckFeign.addInwardDetailsOrder(map);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                break;
             case 12:
             case 13:
             case 14:

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

@@ -115,6 +115,8 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
             case 15:
             case 16:
             case 20:
+            case 23:
+            case 24:
                 return tmstruckLoadResultMapper.getImportedDomesticNzLoadResult(map); //apiId = 353
             case 11:
                 return tmstruckLoadResultMapper.getInFactoryLoadResult(map); //apiId = 359
@@ -210,11 +212,6 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         //装货时查询是否含有净重
         Integer netWeight = tmstruckUnloadResultMapper.getNetWeightByTotalId(resultTotalId);
         if(orderType == 11 || orderType == 15 || orderType == 16){
-            //根据总实绩ID查询内转订单是否有装货实绩
-            BigDecimal loadResultId = tmstruckLoadResultMapper.getResultId(resultTotalId);
-            if(loadResultId != null){
-                return -5;
-            }
             int sqe = DataChange.dataToBigDecimal(mesMap.get("Sqe")).intValue();
             sqe = sqe + 1;
             map.put("resultId",tmstruckLoadResultMapper.selectMaxId());
@@ -227,7 +224,10 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
             //推送消息到websocket
             utilsService.pushMesToWebsocket(capacityNumber, "装货");
             BigDecimal orderId = DataChange.dataToBigDecimal(mesMap.get("orderId"));
-             addCapacityRemark(map);
+            int i1 = addCapacityRemark(map);
+            if(i1 == -5){
+                return -5;
+            }
             //根据运输订单查找需求备注
             Map<String,Object>  remarkMap=tmstruckTimeTaskResultMapper.selectInwardDueTimeByOrderId(orderId);
             String remark =(String) remarkMap.get("remark");
@@ -304,18 +304,19 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         tmstruckLoadResultMapper.updateByPrimaryKeySelective(tmstruckLoadResult);
         //推送消息到websocket
         utilsService.pushMesToWebsocket(capacityNumber, "装货");
+        //map.put("orderTypee",orderType);
         //发送计量委托
-        if (map.get("warehouseId")==null){
-          map.put("warehouseName",null);
-        }else {
-            //根据id查找装货点名称
-            String warehouseName = utilsMapper.queryWarehouseName(DataChange.dataToBigDecimal(map.get("warehouseId")));
-            map.put("warehouseName",warehouseName);
-        }
-        int i = tmstruckMeasureCommissionService.addMeasureCommissionForLoding(map);
-        if (i!=1){
-         return  -7;
-        }
+        //if (map.get("warehouseId")==null){
+        //  map.put("warehouseName",null);
+        //}else {
+        //    //根据id查找装货点名称
+        //    String warehouseName = utilsMapper.queryWarehouseName(DataChange.dataToBigDecimal(map.get("warehouseId")));
+        //    map.put("warehouseName",warehouseName);
+        //}
+        //int i = tmstruckMeasureCommissionService.addMeasureCommissionForLoding(map);
+        //if (i!=1){
+        // return  -7;
+        //}
         return 1;
     }
 

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

@@ -64,10 +64,10 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
     private static final String daXingUrl = "http://172.16.59.251:8121/daXingWeight/OrderBusiness/addOrder.do";
 
     //给达钢发送委托
-    private static final List<Integer> judgeDaGangNum = Arrays.asList(5, 6, 8, 11, 17,15,16);
+    private static final List<Integer> judgeDaGangNum = Arrays.asList(5, 6, 8, 11, 17,15,16,23);
 
     //给达兴发委托
-    private static final List<Integer> judgeDaXinNum = Arrays.asList(7, 18);
+    private static final List<Integer> judgeDaXinNum = Arrays.asList(7, 18,24);
 
     //销售焦炭、化产品 判断一厂二厂委托
     private static final String judgeCoke = "一厂";
@@ -102,8 +102,8 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         String ysdd = (String) map.get("orderNumber");
         String sendUrl = url + "?ysdd=" + ysdd + "&loadingPace=" + loadingPace;
         String jsonData = getRequestUtils.doGet(sendUrl);
-        System.out.println("委托已发送"  +jsonData);
-        MeasureJsonData measureJsonData=new MeasureJsonData();
+        System.out.println("委托已发送" + jsonData);
+        MeasureJsonData measureJsonData = new MeasureJsonData();
         BigDecimal measureId = measureJsonDataMapper.selectMaxId();
         //设置主键id
         measureJsonData.setMeasureId(measureId);
@@ -111,10 +111,11 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         measureJsonData.setMeasureTypeId(new BigDecimal(1));
         measureJsonData.setMeasureJsonData(jsonData);
         int i = measureJsonDataMapper.insertSelective(measureJsonData);
-        return  i;
+        return i;
     }
 
 
+
     /**
      * 查询计量委托 0 ：计皮     1：计毛
      * @param map orderTypee 订单类型   type 是计皮还是计毛
@@ -208,28 +209,29 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             measureCommission.remove("isPoundSale");
             if(isPoundSale != null){
                 if(DataChange.dataToBigDecimal(isPoundSale).intValue() == 0){
-                    measureCommission.put("deliveryMethod", "磅重交货");
+                    measureCommission.put("deliveryMethod", "磅重");
                 }else {
-                    measureCommission.put("deliveryMethod", "理重交货");
+                    measureCommission.put("deliveryMethod", "理重");
                 }
             }else {
                 String materiaName = (String) measureCommission.get("materiaName");
                 if(materiaName.contains("盘螺")){ //如果名字中包含盘螺则为磅重交货
-                    measureCommission.put("deliveryMethod", "磅重交货");
+                    measureCommission.put("deliveryMethod", "磅重");
                 }else {
-                    measureCommission.put("deliveryMethod", "理重交货");
+                    measureCommission.put("deliveryMethod", "理重");
                 }
             }
             //查询已经计量物资
-            Integer materialNum = tmstruckMeasureCommissionMapper.getAlreadyWeightMaterialNum(DataChange.dataToBigDecimal(map.get("orderId")));
-            if(materialNum >= 1){
-                measureCommission.put("IsAssembly", true);
-            }else {
+            //Integer materialNum = tmstruckMeasureCommissionMapper.getAlreadyWeightMaterialNum(DataChange.dataToBigDecimal(map.get("orderId")));
+            //查询有净重的条数，如果有净重的条数为0，则为false，否则发true
+            Integer materialNum = tmstruckMeasureCommissionMapper.getNoNetWeight(DataChange.dataToBigDecimal(map.get("orderId")));
+            if(materialNum == 0){
                 measureCommission.put("IsAssembly", false);
+            }else {
+                measureCommission.put("IsAssembly", true);
             }
         }
-//        System.out.println(measureCommission);
-//        return 1;
+        System.out.println(measureCommission);
         return sendMesToMeasure(measureCommission);
     }
 
@@ -340,7 +342,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission.put("isDel", false);
                 measureCommission.put("isInsert", true);
                 measureCommission.put("IsAssembly", false);
-                measureCommission.put("deliveryMethod", "磅重交货");
+                measureCommission.put("deliveryMethod", "磅重");
                 measureCommission.put("packagesNum", 0);
                 if(map.get("isDG") != null){
                     measureCommission.put("factory", "dg");
@@ -359,9 +361,8 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission.put("isDel", false);
                 measureCommission.put("isInsert", true);
                 measureCommission.put("IsAssembly", false);
-                measureCommission.put("deliveryMethod", "磅重交货");
+                measureCommission.put("deliveryMethod", "磅重");
                 measureCommission.put("packagesNum", 0);
-
                 break;
             case 11:
                 //纯内转发送计量委托
@@ -379,7 +380,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission.put("isRelationEAS", false);
                 measureCommission.put("flowTo", "中转");
                 measureCommission.put("IsAssembly", false);
-                measureCommission.put("deliveryMethod", "磅重交货");
+                measureCommission.put("deliveryMethod", "磅重");
                 measureCommission.put("packagesNum", 0);
                 System.out.println(measureCommission);
                 break;
@@ -413,12 +414,13 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 }
                 measureCommission.put("isDel", false);
                 measureCommission.put("isInsert", true);
-                measureCommission.put("deliveryMethod", "磅重交货");
+                measureCommission.put("deliveryMethod", "磅重");
                 measureCommission.put("packagesNum", 0);
                 break;
             case 20://采购内转委托总厂区
             case 15:
             case 16:
+            case 23:
                 measureCommission=tmstruckMeasureCommissionMapper.purchaseXqCgNzMeasure(map);
                 if(measureCommission == null){
                     return 0;
@@ -430,7 +432,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission.put("flowTo","进厂");
                 measureCommission.put("isDel",false);
                 measureCommission.put("isInsert",true);
-                measureCommission.put("deliveryMethod", "磅重交货");
+                measureCommission.put("deliveryMethod", "磅重");
                 measureCommission.put("packagesNum", 0);
         }
         if(measureCommission != null){
@@ -477,6 +479,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 break;
             case 10:
             case 20:
+            case 24:
                 //新区采购内转
                 measureCommission = tmstruckMeasureCommissionMapper.purchaseXqCgNzDXMeasure(map);
                 if(measureCommission == null)

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

@@ -53,6 +53,11 @@ public class TmstruckQualityResultServiceImpl implements ITmstruckQualityResultS
                 return tmstruckQualityResultMapper.getQualityResult(map); //apiId:150
             case 9:
             case 10:
+            case 20:
+            case 23:
+            case 24:
+            case 15:
+            case 16:
                 return tmstruckQualityResultMapper.getInwardQualityResult(map); //apiId:150
             case 11:
                 break;

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

@@ -120,6 +120,8 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             case 20:
             case 15:
             case 16:
+            case 23:
+            case 24:
                 return tmstruckUnloadResultMapper.getImportedDomesticNzUnload2Result(map); //apiId:356
             case 11:
                 return tmstruckUnloadResultMapper.getInFactoryUnloadResult(map); //apiId:360

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

@@ -129,6 +129,8 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
             case 20:
             case 15:
             case 16:
+            case 23:
+            case 24:
                 return tmstruckWeightResultMapper.getImportedDomesticNzJiMao2Result(map); // apiID:354
             case 11:
                 return tmstruckWeightResultMapper.getInFactoryJiLiangResult(map);       //apiId: 358

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

@@ -70,8 +70,7 @@ public class UtilsServiceImpl implements IUtilsService {
         BigDecimal maxSeq = DataChange.dataToBigDecimal(mesMap.get("maxSeq"));
         if(orderSeq.intValue() == maxSeq.intValue()){
             map.put("orderStatus", 2);
-            utilsMapper.updateOrderStatusByOrderIdOrNum(map);
-
+            return utilsMapper.updateOrderStatusByOrderIdOrNum(map);
         }
         if(map.get("priceId")!=null){
             //如果有价格ID 则说明需要结算 调用新增详单接口

src/main/resources/application-dev.yml

@@ -28,23 +28,23 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   BmsShipFeign:
-    url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
+    url: ${BMSSHIPFEIGN_URL:172.16.33.166:8007}
   BmsTruckFeign:
-    url: ${BMSTRUCKFEIGN_URL:172.16.33.162:8009}
+    url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8009}
   WmshBoundFeign:
-    url: ${WMSHBOUNDFEIGN_URL:172.16.33.162:8013}
+    url: ${WMSHBOUNDFEIGN_URL:172.16.33.166:8013}
   WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.33.162:8012}
+    url: ${WMSFEIGN_URL:172.16.33.166:8012}
   OmsFeign:
-    url: ${OMSFEIGN_URL:172.16.33.162:8016}
+    url: ${OMSFEIGN_URL:172.16.33.166:8016}
   JoinFeign:
-    url: ${JOINFEIGN_URL:172.16.33.162:8006}
+    url: ${JOINFEIGN_URL:172.16.33.166:8006}
   QmsFeign:
-    url: ${QMSFEIGN_URL:172.16.33.162:8017}
+    url: ${QMSFEIGN_URL:172.16.33.166:8017}
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.162:8015}
+    url: ${AMSFEIGN_URL:172.16.33.166:8015}
   OTMSFeign:
     url: ${OTMSFEIGN_URL:172.16.33.166:8038}
 server:

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

@@ -384,7 +384,7 @@
         on RCON.CONSIGNEE_ID = ASO.RECEIVE_ID
         left join RMS_SUPPLIER RS
         on RS.SUPPLIER_ID = ASO.SHIPPER_ID
-        join TMSTRUCK_LOAD_RESULT TLR
+        left join TMSTRUCK_LOAD_RESULT TLR
         on TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         and TLR.MATERIAL_ID = TWR.MATERIAL_ID
         left join RMS_WAREHOUSE RW
@@ -393,17 +393,17 @@
         on TWR.RESULT_GROSS_PLACE_ID = RTCMAO.TRUCK_CALCULATE_ID
         left join RMS_TRUCK_CALCULATE RTCPI
         on TWR.RESULT_TARE_PLACE_ID = RTCPI.TRUCK_CALCULATE_ID
-        join TMSTRUCK_ENFACTORY_RESULT TER
+        left join TMSTRUCK_ENFACTORY_RESULT TER
         on TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         left join RMS_GATEPOST RGEN
         on RGEN.GATEPOST_ID = TER.GATEPOST_ID
-        join TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+        left join TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
         on TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         left join RMS_GATEPOST RGOUT
         on RGOUT.GATEPOST_ID = TLFR.GATEPOST_ID
-        join RMS_CAPACITY RC
+        left join RMS_CAPACITY RC
         on RC.CAPACITY_ID = OO.CAPACITY_ID
-        join RMS_MATERIAL RM
+        left join RMS_MATERIAL RM
         on RM.MATERIAL_ID = TWR.MATERIAL_ID
         left join TMSTRUCK_ARRIVAL_RESULT TAR
         on TAR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
@@ -411,16 +411,24 @@
         on TTR.RESULT_TOTAL_ID = TRR.RESULT_TOTAL_ID
         WHERE OO.ORDER_TYPE = #{orderTypee}
         AND ASO.SHIPPER_ID = #{shipperId}
+        AND OO.ORDER_STATUS IN (2,5)
         <if test="carrierSsoId != null">
             and RC2.CARRIER_SSO_ID = #{carrierSsoId}
         </if>
         <if test="receivName != null">
             and RCON.CONSIGNEE_COMPANY_NAME like #{receivName}
         </if>
-        <if test="oneDate != null">
+        <if test="oneDate != null and orderTypee == 1">
+            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TER.RESULT_ENTRY_GATE_TIME
+        </if>
+        <if test="startDate != null and orderTypee == 1">
+            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TER.RESULT_ENTRY_GATE_TIME
+            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= TER.RESULT_ENTRY_GATE_TIME
+        </if>
+        <if test="oneDate != null and orderTypee != 1">
             and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TWR.RESULT_GROSS_WEIGHT_TIME
         </if>
-        <if test="startDate != null">
+        <if test="startDate != null and orderTypee != 1">
             and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TWR.RESULT_GROSS_WEIGHT_TIME
             and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= TWR.RESULT_GROSS_WEIGHT_TIME
         </if>
@@ -1313,223 +1321,91 @@
                     "orderNumber" like '%${item}%'
                 </foreach>
             </if>
-            <if test="resultGrossWeight != null">
-                and
-                <foreach collection="resultGrossWeight" item="item" open="(" separator="or" close=")">
-                    "resultGrossWeight" like '%${item}%'
-                </foreach>
-            </if>
-            <if test=" resultGrossWeightTime!= null">
-                and
-                <foreach collection="resultGrossWeightTime" item="item" open="(" separator="or" close=")">
-                    "resultGrossWeightTime" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="truckCalculateNumber1 != null">
-                and
-                <foreach collection="truckCalculateNumber1" item="item" open="(" separator="or" close=")">
-                    "truckCalculateNumber1" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="resultTareWeight != null">
-                and
-                <foreach collection="resultTareWeight" item="item" open="(" separator="or" close=")">
-                    "resultTareWeight" like '%${item}%'
-                </foreach>
-            </if>
-            <if test=" resultTareWeightTime != null">
-                and
-                <foreach collection="resultTareWeightTime" item="item" open="(" separator="or" close=")">
-                    "resultTareWeightTime" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="truckCalculateNumber2 != null">
-                and
-                <foreach collection="truckCalculateNumber2" item="item" open="(" separator="or" close=")">
-                    "truckCalculateNumber2" like '%${item}%'
-                </foreach>
-            </if>
-            <if test=" resultNetWeight!= null">
-                and
-                <foreach collection="resultNetWeight" item="item" open="(" separator="or" close=")">
-                    "resultNetWeight" like '%${item}%'
-                </foreach>
-            </if>
-            <if test=" resultEntryGateTime!= null">
-                and
-                <foreach collection="resultEntryGateTime" item="item" open="(" separator="or" close=")">
-                    "resultEntryGateTime" like '%${item}%'
-                </foreach>
-            </if>
-            <if test=" gatepostName1!= null">
-                and
-                <foreach collection="gatepostName1" item="item" open="(" separator="or" close=")">
-                    "gatepostName1" like '%${item}%'
-                </foreach>
-            </if>
-            <if test=" resultOutGateTime!= null">
-                and
-                <foreach collection="resultOutGateTime" item="item" open="(" separator="or" close=")">
-                    "resultOutGateTime" like '%${item}%'
-                </foreach>
-            </if>
-            <if test=" gatepostName2 != null">
-                and
-                <foreach collection="gatepostName2" item="item" open="(" separator="or" close=")">
-                    "gatepostName2" like '%${item}%'
-                </foreach>
-            </if>
-            <if test=" resultLoadEndTime != null">
-                and
-                <foreach collection="resultLoadEndTime" item="item" open="(" separator="or" close=")">
-                    "resultLoadEndTime" like '%${item}%'
-                </foreach>
-            </if>
-            <if test=" warehouseName1 != null">
-                and
-                <foreach collection="warehouseName1" item="item" open="(" separator="or" close=")">
-                    "warehouseName1" like '%${item}%'
-                </foreach>
-            </if>
-            <if test=" resultEndTime != null">
-                and
-                <foreach collection="resultEndTime" item="item" open="(" separator="or" close=")">
-                    "resultEndTime" like '%${item}%'
-                </foreach>
-            </if>
-            <if test=" warehouseName2 != null">
-                and
-                <foreach collection="warehouseName2" item="item" open="(" separator="or" close=")">
-                    "warehouseName2" like '%${item}%'
-                </foreach>
-            </if>
         </where>
     </select>
     <select id="getInwardReportForAssemble" resultType="java.util.Map" parameterType="java.util.Map">
-        select * from (
-        select
-        OO.ORDER_NUMBER "orderNumber",
-        RC.CAPACITY_NUMBER  "capacityNumber",
-        RS.SHIPPER_NAME     "shipperName",
-        RW1.WAREHOUSE_NAME  "unloadName",
-        RW2.WAREHOUSE_NAME  "loadName",
-        APO.PURCHASE_ORDER_NO "purchaseOrderNo",
-        RM.MATERIAL_NAME    "materialName",
-        RTC2.TRUCK_CALCULATE_NUMBER "grossNumber",
-        RTC1.TRUCK_CALCULATE_NUMBER "tareNumber",
-        TWR.RESULT_NET_WEIGHT   "resultNetWeight",
-        TWR.RESULT_TARE_WEIGHT_TIME  "resultTareWeightTime",
-        TWR.RESULT_TARE_WEIGHT      "resultTareWeight",
-        TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
-        TWR.RESULT_GROSS_WEIGHT     "resultGrossWeight"
-        from OMSTRUCK_ORDER OO
-        left join TMSTRUCK_TOTAL_RESULT TTR on OO.ORDER_ID = TTR.ORDER_ID
-        left join TMSTRUCK_WEIGHT_RESULT  TWR  on TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
-        left join RMS_CAPACITY RC on OO.CAPACITY_ID = RC.CAPACITY_ID
-        left join RMS_TRUCK_CALCULATE RTC1 on RTC1.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
-        left join RMS_TRUCK_CALCULATE RTC2 on RTC2.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_ID
-        left join AMSTRUCK_INWARD_PLAN AIP on AIP.PLAN_ID = OO.ORDER_PLAN_ID
-        left join AMSTRUCK_REQUIREMENT_PLAN ARP on AIP.PLAN_ID = ARP.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_SHIPPER   RS on AIR.REQUIREMENT_SHIPPER_ID = RS.SHIPPER_ID
-        left join AMSTRUCK_REQUIREMENT_MATERIAL ARM on AIR.REQUIREMENT_ID = ARM.REQUIREMENT_ID
-        left join RMS_MATERIAL RM on ARM.MATERIAL_ID = RM.MATERIAL_ID
-        left join RMS_WAREHOUSE RW1 on ARM.REQUIREMENT_UNLOAD_UNIT_ID = RW1.WAREHOUSE_ID
-        left join RMS_WAREHOUSE RW2 on ARM.REQUIREMENT_PLATFORM_ID = RW2.WAREHOUSE_ID
-        where OO.ORDER_TYPE in (15,16) and TWR.RESULT_NET_WEIGHT >= 0
-        <if test="oneDate != null">
-            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TWR.RESULT_TARE_WEIGHT_TIME
-        </if>
-        <if test="startDate != null">
-            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TWR.RESULT_TARE_WEIGHT_TIME
-            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= TWR.RESULT_TARE_WEIGHT_TIME
-        </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=" shipperName != null">
-            and
-            <foreach collection="shipperName" item="item" open="(" separator="or" close=")">
-                "shipperName" like '%${item}%'
-            </foreach>
-        </if>
-        <if test="unloadName != null">
-            and
-            <foreach collection="unloadName" item="item" open="(" separator="or" close=")">
-                "unloadName" like '%${item}%'
-            </foreach>
-        </if>
-        <if test="loadName!= null">
-            and
-            <foreach collection="loadName" item="item" open="(" separator="or" close=")">
-                "loadName" 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="grossNumber!= null">
-            and
-            <foreach collection="grossNumber" item="item" open="(" separator="or" close=")">
-                "grossNumber" like '%${item}%'
-            </foreach>
-        </if>
-        <if test="tareNumber!= null">
-            and
-            <foreach collection="tareNumber" item="item" open="(" separator="or" close=")">
-                "tareNumber" like '%${item}%'
-            </foreach>
-        </if>
-        <if test="resultNetWeight!= null">
-            and
-            <foreach collection="resultNetWeight" item="item" open="(" separator="or" close=")">
-                "resultNetWeight" like '%${item}%'
-            </foreach>
-        </if>
-        <if test="resultTareWeightTime!= null">
-            and
-            <foreach collection="resultTareWeightTime" item="item" open="(" separator="or" close=")">
-                "resultTareWeightTime" like '%${item}%'
-            </foreach>
+        select *
+        from (select DISTINCT oo.order_id                   "orderId",
+        rm.material_name              "materialName",
+        rc.capacity_number            "capacityNumber",
+        rs.supplier_name              "sendName",
+        oo.order_number               "orderNumber",
+        rce.consignee_company_name    "reciveName",
+        ttr.result_total_id           "totalResultId",
+        twr.result_gross_weight      "grossWeight",
+        twr.result_gross_weight_time "grossweightTime",
+        twr.result_tare_weight       "tareWeight",
+        twr.result_tare_weight_time  "tareWeightTime",
+        twr.result_net_weight        "resultNetWeight",
+        RC.CARRIER_NAME "carrierName",
+        RL.LINE_NAME "lineName",
+        db.RESULT_FOREIGN_SHIP_NAME "shipName",
+        rw2.WAREHOUSE_NAME  "warehouseName"
+        from omstruck_order oo
+        left join omstruck_order_material oom
+        on oom.order_id = oo.order_id
+        LEFT JOIN RMS_LINE RL
+        ON RL.LINE_ID=OO.LINE_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 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 RMS_CARRIER  rc
+        on AIP.CARRIER_ID=rc.CARRIER_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_supplier rs
+        on rs.supplier_id = apo.supplier_unit_id
+        left join rms_consignee rce
+        on rce.consignee_id = apo.receive_unit_id
+        left join tmstruck_total_result ttr
+        on ttr.order_id = oo.order_id
+        left join tmstruck_weight_result twr
+        on twr.result_total_id = ttr.result_total_id
+        left join rms_truck_calculate rtc1
+        on rtc1.truck_calculate_id = twr.result_tare_place_id
+        left join tmstruck_load_result tlr
+        on tlr.result_total_id = ttr.result_total_id
+        left join rms_warehouse rw
+        on rw.warehouse_id = tlr.loading_id
+        left join rms_truck_calculate rtc2
+        on rtc2.truck_calculate_id = twr.result_gross_place_id
+        left join tmstruck_unload_result tur
+        on tur.result_total_id = ttr.result_total_id
+        left join rms_warehouse rw2
+        on rw2.warehouse_id = tur.result_unload_place_id
+        LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR1
+        ON TLFR1.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        where
+        twr.result_net_weight IS NOT NULL
+        AND  oo.ORDER_TYPE in (15,16)
+        <if test="orgCode!=null">
+            and oo.OPTIONER_CODE =  #{orgCode}
         </if>
-        <if test="resultTareWeight!= null">
-            and
-            <foreach collection="resultTareWeight" item="item" open="(" separator="or" close=")">
-                "resultTareWeight" like '%${item}%'
-            </foreach>
+        <if test="orderTypee !=null">
+            and oo.ORDER_TYPE = #{orderTypee}
         </if>
-        <if test="resultGrossWeightTime!= null">
-            and
-            <foreach collection="resultGrossWeightTime" item="item" open="(" separator="or" close=")">
-                "resultGrossWeightTime" like '%${item}%'
-            </foreach>
+        <if test="index!=null">
+            and ( (instr(rs.supplier_name, #{index}) > 0) or  (instr(rm.material_name , #{index}) > 0)
+            or  (instr(rc.capacity_number , #{index}) > 0)   or  (instr(rce.consignee_company_name , #{index}) > 0)
+            or  (instr( RC.CARRIER_NAME , #{index}) > 0)  or     (instr(RL.LINE_NAME , #{index}) > 0))
         </if>
-        <if test="resultGrossWeight!= null">
-            and
-            <foreach collection="resultGrossWeight" item="item" open="(" separator="or" close=")">
-                "resultGrossWeight" like '%${item}%'
-            </foreach>
+        <if test="oneDate != null">
+            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = TWR.RESULT_TARE_WEIGHT_TIME
         </if>
-        <if test="purchaseOrderNo!= null">
-            and
-            <foreach collection="purchaseOrderNo" item="item" open="(" separator="or" close=")">
-                "purchaseOrderNo" like '%${item}%'
-            </foreach>
+        <if test="startDate != null">
+            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  TWR.RESULT_TARE_WEIGHT_TIME
+            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >=  TWR.RESULT_TARE_WEIGHT_TIME
         </if>
+        )
     </select>
     <select id="getCapacityRemark" resultType="java.util.Map" parameterType="java.util.Map">
       select OO.ORDER_TYPE,
@@ -1760,8 +1636,8 @@
                    AND TUR.SEGMENT_SQE = 8
                    AND TWR4.TARE_SEGMENT_SQE = 9
                   AND TLFR2.SEGMENT_SQE = 10
-                  and oo.ORDER_TYPE in (10,20)
                   AND   twr4.result_net_weight IS NOT NULL
+                    AND  oo.ORDER_TYPE in (10,20)
         <if test="orgCode!=null">
                 and oo.OPTIONER_CODE =  #{orgCode}
         </if>
@@ -1791,7 +1667,8 @@
                TWR.RESULT_TARE_WEIGHT_TIME "tareWeightTime",
                TWR.RESULT_NET_WEIGHT "resultNetWeight",
                RL.LINE_NAME "lineName",
-               RC3.CARRIER_NAME "carrierName"
+               RC3.CARRIER_NAME "carrierName",
+               DB.RESULT_FOREIGN_SHIP_NAME  "shipName"
         from OMSTRUCK_ORDER OO
         LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
         ON OO.ORDER_ID=OOM.ORDER_ID
@@ -1803,6 +1680,8 @@
         ON RM.MATERIAL_ID=OOM.MATERIAL_ID
         LEFT JOIN AMS_PURCHASE_ORDER APO
         ON OO.ORDER_PLAN_ID=APO.PURCHASE_ORDER_ID
+        LEFT JOIN DIL_BATCH DB
+        ON DB.BATCH_ID = APO.BATCH_ID
         LEFT JOIN RMS_CARRIER RC3
         ON RC3.CARRIER_ID=OO.CARRIER_ID
         LEFT JOIN RMS_SUPPLIER RS
@@ -1871,7 +1750,7 @@
         left join RMS_WAREHOUSE RW2 on ARM.REQUIREMENT_PLATFORM_ID = RW2.WAREHOUSE_ID
         left join RMS_MATERIAL_TYPE RMT ON RMT.MATERIAL_TYPE_ID = RM.MATERIAL_TYPE_ID
         <where>
-            OO.ORDER_TYPE in (11,15,16)  AND  TWR.RESULT_NET_WEIGHT IS NOT NULL
+            OO.ORDER_TYPE = 11  AND  TWR.RESULT_NET_WEIGHT IS NOT NULL
             <if test="orgCode!=null">
                 AND OO.OPTIONER_CODE=#{orgCode}
             </if>
@@ -1890,5 +1769,86 @@
             )
         </where>
     </select>
+    <select id="getOutFactoryInwardList" resultType="java.util.Map" parameterType="java.util.Map">
+        select *
+        from (select DISTINCT oo.order_id                   "orderId",
+        rm.material_name              "materialName",
+        rc.capacity_number            "capacityNumber",
+        rs.supplier_name              "sendName",
+        oo.order_number               "orderNumber",
+        rce.consignee_company_name    "reciveName",
+        ttr.result_total_id           "totalResultId",
+        twr.result_gross_weight      "grossWeight",
+        twr.result_gross_weight_time "grossweightTime",
+        twr.result_tare_weight       "tareWeight",
+        twr.result_tare_weight_time  "tareWeightTime",
+        twr.result_net_weight        "resultNetWeight",
+        RC.CARRIER_NAME "carrierName",
+        RL.LINE_NAME "lineName",
+        DB.RESULT_FOREIGN_SHIP_NAME "shipName",
+        rw2.WAREHOUSE_NAME  "warehouseName"
+        from omstruck_order oo
+        left join omstruck_order_material oom
+        on oom.order_id = oo.order_id
+        LEFT JOIN RMS_LINE RL
+        ON RL.LINE_ID=OO.LINE_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 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 RMS_CARRIER  rc
+        on AIP.CARRIER_ID=rc.CARRIER_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_supplier rs
+        on rs.supplier_id = apo.supplier_unit_id
+        left join rms_consignee rce
+        on rce.consignee_id = apo.receive_unit_id
+        left join tmstruck_total_result ttr
+        on ttr.order_id = oo.order_id
+        left join tmstruck_weight_result twr
+        on twr.result_total_id = ttr.result_total_id
+        left join rms_truck_calculate rtc1
+        on rtc1.truck_calculate_id = twr.result_tare_place_id
+        left join tmstruck_load_result tlr
+        on tlr.result_total_id = ttr.result_total_id
+        left join rms_warehouse rw
+        on rw.warehouse_id = tlr.loading_id
+        left join rms_truck_calculate rtc2
+        on rtc2.truck_calculate_id = twr.result_gross_place_id
+        left join tmstruck_unload_result tur
+        on tur.result_total_id = ttr.result_total_id
+        left join rms_warehouse rw2
+        on rw2.warehouse_id = tur.result_unload_place_id
+        LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR1
+        ON TLFR1.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        where
+        twr.result_net_weight IS NOT NULL
+        AND  oo.ORDER_TYPE in (23,24)
+        <if test="orgCode!=null">
+            and oo.OPTIONER_CODE =  #{orgCode}
+        </if>
+        <if test="index!=null">
+            and ( (instr(rs.supplier_name, #{index}) > 0) or  (instr(rm.material_name , #{index}) > 0)
+            or  (instr(rc.capacity_number , #{index}) > 0)   or  (instr(rce.consignee_company_name , #{index}) > 0)
+            or  (instr( RC.CARRIER_NAME , #{index}) > 0)  or     (instr(RL.LINE_NAME , #{index}) > 0))
+        </if>
+        <if test="oneDate != null">
+            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = TWR.RESULT_TARE_WEIGHT_TIME
+        </if>
+        <if test="startDate != null">
+            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  TWR.RESULT_TARE_WEIGHT_TIME
+            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >=  TWR.RESULT_TARE_WEIGHT_TIME
+        </if>
+        )
+    </select>
 
 </mapper>

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

@@ -1313,7 +1313,7 @@
         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 in (10,20)
+        and OO.ORDER_TYPE in (10,20,23,24)
         <if test="userId">
             and air.INSERT_USERNAME=#{userId}
         </if>
@@ -1416,7 +1416,7 @@
   left join RMS_GATEPOST RG
     on RG.GATEPOST_ID = TLFR.GATEPOST_ID
  where RESULT_OUT_GATE_TIME is not null
-   and OO.ORDER_TYPE in (10,20)
+   and OO.ORDER_TYPE in (10,20,23,24)
    <if test="userId !=null">
       and AIR.INSERT_USERNAME = #{userId}
    </if>

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

@@ -1249,4 +1249,56 @@
         WHERE
             OO.ORDER_ID = #{orderId}
     </select>
+
+    <select id="getLeaveFactoryNetWeight" parameterType="DECIMAL" resultType="java.lang.Double" >
+        SELECT SUM(TWR.RESULT_NET_WEIGHT)  AS "nowNetWeight"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+                           ON OO.ORDER_ID = TTR.ORDER_ID
+                 LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+                           ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                 LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+                           ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                 LEFT JOIN RMS_MATERIAL RM
+                           ON TWR.MATERIAL_ID = RM.MATERIAL_ID
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+        WHERE ASOM.SALE_ORDER_ID = #{saleOrderId}
+          AND RM.MATERIAL_NAME = '钒渣'
+          AND TLFR.RESULT_OUT_GATE_TIME IS NOT NULL
+    </select>
+
+    <select id="getSaleMaterialWeight" parameterType="DECIMAL" resultType="java.lang.Double" >
+        SELECT DISTINCT ASM.MATERIAL_WEIGHT  AS "saleWeight"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+                 LEFT JOIN AMS_SALE_MATERIAL ASM
+                           ON ASM.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+        WHERE ASM.SALE_ORDER_ID = #{saleOrderId}
+    </select>
+
+    <select id="getSaleOrderId" parameterType="java.lang.String" resultType="DECIMAL" >
+        SELECT ASO.SALE_ORDER_ID AS "saleOrderId"
+        FROM OMSTRUCK_ORDER OO
+                 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
+        WHERE OO.ORDER_NUMBER = #{orderNumber}
+    </select>
+
+    <select id="getNowNetWeight" parameterType="java.lang.String" resultType="java.lang.Double" >
+        SELECT TWR.RESULT_NET_WEIGHT AS "nowNetWeight"
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON OO.ORDER_ID = TTR.ORDER_ID
+        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+        ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        WHERE OO.ORDER_NUMBER = #{orderNumber}
+    </select>
+    <select id="getOrderStatus" resultType="java.lang.Integer" parameterType="DECIMAL">
+        SELECT OO.ORDER_STATUS  FROM OMSTRUCK_ORDER OO
+        WHERE OO.ORDER_ID   = #{orderId}
+    </select>
 </mapper>

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

@@ -1405,7 +1405,7 @@
     ON RC.CAPACITY_ID = OO.CAPACITY_ID
     LEFT JOIN RMS_WAREHOUSE RW
     ON RW.WAREHOUSE_ID = TLR.LOADING_ID
-    WHERE OO.ORDER_TYPE in (10,20,15,16)
+    WHERE OO.ORDER_TYPE in (10,20,15,16,23,24)
     AND TLR.RESULT_LOAD_START_TIME IS NOT NULL
     <if test="userId !=null">
       and AIR.INSERT_USERNAME = #{userId}

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

@@ -1111,12 +1111,14 @@
                     APO.QIITEM              "qiItem",
                     APO.RESOURCE_POINT      "resourcePoint",
                     APO.PURCHASE_ORDER_NO "purchaseOrder",
+                    APO.SUPPLIER_SCREEN_INFO    "supplierScreenInfo",
                     RS.SUPPLIER_NAME "sendUnit",
                     RCE.CONSIGNEE_COMPANY_NAME "ReceivUnit",
                     RW.WAREHOUSE_NAME "unloadPlace",
+                    RW1.WAREHOUSE_NAME "loadPlace",
                     TWR.INSERT_UPDATE_REMARK "demo",
                     RM.MATERIAL_ID "materialId",
-                    RM.MATERIAL_NAME "materiaName",
+                    CONCAT(RM.MATERIAL_NAME ,CONCAT(RM.MATERIAL_SPECIFICATION, RM.MATERIAL_MODEL)) "materiaName",
                     DB.RESULT_FOREIGN_SHIP_NAME "shipNum",
                     concat( RM.MATERIAL_SPECIFICATION, RM.MATERIAL_MODEL ) "goodsType",
                     RTC.TRUCK_CALCULATE_NUMBER "steelyardNum"
@@ -1132,6 +1134,7 @@
                         LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
                         LEFT JOIN TMSTRUCK_UNLOAD_RESULT TUR ON TUR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
                         LEFT JOIN RMS_WAREHOUSE RW ON RW.WAREHOUSE_ID = AIR.REQUIREMENT_UNLOAD_UNIT_ID
+                        LEFT JOIN RMS_WAREHOUSE RW1 ON RW1.WAREHOUSE_ID = AIR.REQUIREMENT_PLATFORM_ID
                         LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_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
@@ -1259,7 +1262,7 @@
 
 
    <!--发送委托给达钢-->
-    <select id="selectXsMeasuresion" resultType="java.util.Map" parameterType="java.math.BigDecimal">
+    <select id="selectXsMeasuresion" resultType="java.util.Map" parameterType="java.util.Map">
         select *
         from (
                  select ASO.SALE_NUMBER                                      "purchaseOrder",
@@ -1274,7 +1277,6 @@
                         ASO.SALE_REMARK                                      "shipNum",
                         OO.INSERT_UPDATE_REMARK                              "demo",
                         ASM.EAS_PRIMARY_ID                                   "FLID"
-
                  from OMSTRUCK_ORDER OO
                           left join OMSTRUCK_ORDER_MATERIAL OOM
                                     ON OO.ORDER_ID = OOM.ORDER_ID
@@ -1357,5 +1359,15 @@
                            and OOM.MATERIAL_ID = TWR.MATERIAL_ID
             )
     </select>
+    <select id="getNoNetWeight" resultType="java.lang.Integer" parameterType="decimal">
+        SELECT count(*)
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.ORDER_ID = OO.ORDER_ID
+        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+        ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        WHERE TWR.RESULT_NET_WEIGHT IS not NULL
+        AND OO.ORDER_ID = #{orderId}
+    </select>
 
 </mapper>