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

pom.xml

@@ -147,7 +147,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <param>TMSTRUCK_LOAD_RESULT</param>
+                        <param>AMSTRUCK_REQUIREMENT_MATERIAL</param>
                     </tables>
                 </configuration>
                 <executions>

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

@@ -234,12 +234,11 @@ public class StatisticalReportController extends BaseRESTfulController {
                                                     String startTime,
                                                     String endTime
     ){
-        DataChange.queryDataByDate(startTime, endTime, mapValue, sdfDate);//根据时间段查询数据
-        List<Map<String, Object>> allReport =  statisticalReportService.getPurInwardReport(mapValue);
+        DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDate);//根据时间段查询数据
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> report = statisticalReportService.getPurInwardReport(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allReport, report);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, report);
         return success(pageList);
     }
 }

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

@@ -177,7 +177,12 @@ public class TmstruckLoadResultController extends BaseRESTfulController {
     })
     @PostMapping("/addSale2LoadResult")
     public RESTfulResult addSale2LoadResult(@RequestBody(required=false) Map<String, Object> map){
-        int i = tmstruckLoadResultService.addXS2LoadResult(map);
+        int i = 0;
+        try {
+            i = tmstruckLoadResultService.addXS2LoadResult(map);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         return success(i);
     }
 

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

@@ -57,4 +57,20 @@ public class TmstruckMeasureCommissionController extends BaseRESTfulController {
         int i = tmstruckMeasureCommissionService.addMaoMeasureCommission(map);
         return success(i);
     }
+    @ApiOperation(value="发送计量委托 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId", value = "装车作业实绩ID", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/sendMeasureCommission")
+    public RESTfulResult sendMeasureCommission(@RequestBody(required = false) Map<String, Object> map) throws Exception {
+        int i = 0;
+        try {
+            i = tmstruckMeasureCommissionService.sendMeasureCommssion(map);
+        } catch (Exception e) {
+            e.getMessage();
+        }
+        return success(i);
+    }
+
+
 }

src/main/java/com/steerinfo/dil/feign/BmsTruckFeign.java

@@ -16,5 +16,5 @@ import java.math.BigDecimal;
 public interface BmsTruckFeign {
 
     @PostMapping("api/v1/bmstruck/bmstruckdetailsorder/addDetailsOrder/{orderId}")
-    public RESTfulResult addDetailsOrder(@PathVariable("orderId") BigDecimal orderId) throws Exception ;
+    public RESTfulResult addDetailsOrder(@PathVariable("orderId") BigDecimal orderId);
 }

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

@@ -66,4 +66,8 @@ public interface TmstruckEnfactoryResultMapper extends IBaseMapper<TmstruckEnfac
 
     List<Map<String, Object>> getCgNzOutFactory(Map<String, Object> map);
 
+
+    //辅料查询 有几次进厂 并进了几次厂
+    Integer selectEnFactoryNumber(BigDecimal resultTotalId);
+    Integer selectAllEnFactoryNum(BigDecimal resultTotalId);
 }

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

@@ -114,4 +114,13 @@ public interface TmstruckLoadResultMapper extends IBaseMapper<TmstruckLoadResult
    //获取达州钢铁内转实绩
     List<Map<String, Object>> getCgNzLoadingResult(Map<String, Object> mapVal);
 
+    //获取装货实绩备注
+    Map<String,Object> getInsertUpdateRemark(BigDecimal resultTotalId);
+
+    //查找当前订单共有几次出
+    List<Integer> allOutFactoryNum(BigDecimal orderId);
+
+    //修改装货路段顺序号
+    int updateSqe(@Param("orderId")BigDecimal orderId);
+
 }

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

@@ -28,7 +28,7 @@ public interface TmstruckMeasureCommissionMapper extends IBaseMapper<TmstruckMea
     //通过总实绩ID查询没有净重的计量实绩
     Integer selectNoNetWeightResult(BigDecimal resultTotalId);
 
-    //通过订单ID查询收货单位ID
+    //通过订单ID查询组织对单位ID
     Integer getReceiveIdByOrderId(BigDecimal orderId);
 
     //通过订单ID查询发货单位ID
@@ -67,6 +67,14 @@ public interface TmstruckMeasureCommissionMapper extends IBaseMapper<TmstruckMea
     //零星物资进厂计量委托
     Map<String, Object> sporadicDXMeasure(Map<String, Object> map);
 
+    //零星计量委托(老厂区)
+    Map<String,Object> sproadicMeasure(Map<String,Object> map);
+
+    //内转计量委托(老厂区)
+    Map<String,Object> purchaseXqCgNzMeasure(Map<String,Object> map);
+
+    //纯内转发送计量委托
+    Map<String,Object> purchaseNzMeasure(Map<String,Object> map);
     //内转
     Integer getReceiveIdByRequirementOrderId(Object orderId);
 
@@ -83,4 +91,7 @@ public interface TmstruckMeasureCommissionMapper extends IBaseMapper<TmstruckMea
 
     //查询零星订单发货单位ID
     Integer getPtLxSendUnitIdByOrderId(BigDecimal orderId);
+
+    //查找未计量完成的物资
+    List<Map<String,Object>> getMaterialIdAndCalculateId(Map<String,Object> map);
 }

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

@@ -42,9 +42,12 @@ public interface UtilsMapper {
     //根据运输订单号查询物资Id
     BigDecimal queryOrderMesByOrderId(String orderNumber);
 
-    //查询当前路段顺序号
+    //查询当前路段顺序号通过订单Id
     Integer getLineSequenceByOrderId(@Param("orderId") BigDecimal orderId);
 
+    //通过订单号查询订单实绩
+    Integer getLineSequenceByOrderNumber(String orderNumber);
+
     //查询订单跟订单物资中间表 查询是否有多个物资Id
     List<Integer> getAllMaterialId(Map<String, Object> map);
 
@@ -77,4 +80,15 @@ public interface UtilsMapper {
 
     //通过路段顺序号和线路ID查找 线路子表的子表的ID 和门岗ID或汽车衡ID
     List<Integer> getLineSegmentGateCalcId(Map<String, Object> map);
+
+    //通过运输订单id查找运输订单类型
+    BigDecimal getOrderTypeByOrderId(BigDecimal orderId);
+
+    //通过运输订单号查询运输订单类型
+    Map<String, Object> getOrderTypeByOrderNumber(String orderNumber);
+
+    //根据运输订单id查找是否有多个物资
+    Integer countMaterialByOrderId(BigDecimal orderId);
+
+
 }

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

@@ -23,6 +23,9 @@ public interface ITmstruckLoadResultService{
     //查询所有的装车实绩
     List<Map<String, Object>> getAllLoadResult(Map<String, Object> map);
 
+    //判断装货实绩是否含有“未装货”，如果含有未装货，则将路段顺序号减1
+    int loadJudge(Map<String,Object> map);
+
     //生成装车实绩(销售)
     int addLoadResult(Map<String, Object> map);
 
@@ -33,7 +36,7 @@ public interface ITmstruckLoadResultService{
     int addXSLoadResult(Map<String, Object> map);
 
     //修改销售钢渣、水渣、危化品装车实绩
-    int addXS2LoadResult(Map<String, Object> map);
+    int addXS2LoadResult(Map<String, Object> map) throws Exception;
 
     //修改装车作业
     int updateLoadResult(TmstruckLoadResult tmstruckLoadResult);

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

@@ -28,4 +28,7 @@ public interface ITmstruckMeasureCommissionService{
     //添加计毛委托
     int addMaoMeasureCommission(Map<String, Object> map);
 
+    //发送计量委托
+    int sendMeasureCommssion(Map<String,Object> map) throws Exception;
+
 }

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

@@ -29,6 +29,9 @@ public interface IUtilsService {
     //用于更新路段顺序号
     int updateOrderLineSequence(Map<String, Object> map);
 
+    //用于更新路段顺序号
+    int updateOrderLineSqeByOrderNumber(Map<String, Object> map);
+
     //通过月台名称查找月台Id platformName
     Integer queryPlatformIdByName(String platformName);
 

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

@@ -4,8 +4,10 @@ import com.steerinfo.dil.feign.OmsFeign;
 import com.steerinfo.dil.mapper.TmstruckEnfactoryResultMapper;
 import com.steerinfo.dil.mapper.UtilsMapper;
 import com.steerinfo.dil.model.TmstruckEnfactoryResult;
+import com.steerinfo.dil.model.TmstruckLeaveFactoryResult;
 import com.steerinfo.dil.service.ITmstruckEnfactoryResultService;
 import com.steerinfo.dil.util.DataChange;
+import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -112,6 +114,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
             case 9:
                 return tmstruckEnfactoryResultMapper.getImportedDomesticNzLoadResult(map); //apiId:99
             case 10:
+            case 20:
                 return tmstruckEnfactoryResultMapper.getCGNZEnFactory(map); //apiId:99
             case 11:
                 return tmstruckEnfactoryResultMapper.getInFactoryMaterialEnFactoryResult(map); //apiId:357
@@ -148,6 +151,22 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
         int i = 0;
         //通过运输订单号查询订单类型
         String orderNumber = (String) map.get("orderNumber");
+        //通过订单号查询订单类型 及总实绩Id
+        Map<String, Object> mesMap = utilsMapper.getOrderTypeByOrderNumber(orderNumber);
+        Integer orderType = DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue();
+
+        if(orderType == 11){
+            //内转订单类型  没有生成实绩 直接新增
+            Integer sqe = utilsMapper.getLineSequenceByOrderNumber(orderNumber);
+            sqe = sqe == null ? 1 : sqe + 1;
+            map.put("resultId", tmstruckEnfactoryResultMapper.selectMaxId());  //插入进厂实绩Id
+            map.put("Sqe", sqe); //查询路段顺序号 + 1
+            i += tmstruckEnfactoryResultMapper.insertSelective(generateEnFactoryResult(map));
+            mesMap.put("orderLineSequence", sqe);
+            i += utilsService.updateOrderLineSqeByOrderNumber(mesMap); //更新路段顺序号
+            return i;
+        }
+
         Map<String, Object> selectMap = tmstruckEnfactoryResultMapper.selectEnFactoryResultId(orderNumber);
         if(selectMap == null){
             throw new Exception("该车已进厂！！");
@@ -160,11 +179,11 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
             }
         }
         map.putAll(selectMap);
-        BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderTypee"));
         BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
+        BigDecimal resultTotalId = DataChange.dataToBigDecimal(map.get("resultTotalId"));
         //判断委托是否发送成功
         int checkMeasureCommission = 0;
-        switch (orderType.intValue()){
+        switch (orderType){
             case 1:
                 //查询未装车实绩
                 List<Map<String, Object>> mapList = rulesService.judgeLastMaterial(DataChange.dataToBigDecimal(map.get("orderId")));
@@ -181,37 +200,44 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
                 checkMeasureCommission = tmstruckMeasureCommissionService.addXSMeasureCommission(map); //添加计皮委托
                 break;
             case 5:
+                Integer num = tmstruckEnfactoryResultMapper.selectAllEnFactoryNum(resultTotalId);
+                if(num == 2){
+                    //如果辅料有两次进厂，则判断还剩几次没进厂数据，如果还剩两次则发委托
+                    Integer judgeNum = tmstruckEnfactoryResultMapper.selectEnFactoryNumber(resultTotalId);
+                    if (judgeNum == 1){
+                        checkMeasureCommission = 1;
+                        break;
+                    }
+                }
+                checkMeasureCommission = tmstruckMeasureCommissionService.addMaoMeasureCommission(map); //添加计毛委托 并发送计毛委托
+                break;
             case 6:
             case 7:
-            case 8:
-            case 9:
-            case 17:
+//            case 8:
+//            case 9:
+            case 10:
+//            case 11:
+//            case 17:
             case 18:
-                //通过订单ID查询物资Id
-                List<Integer> materialIds = utilsMapper.getMaterialIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
-                map.put("materialId", materialIds.get(0));
                 checkMeasureCommission = tmstruckMeasureCommissionService.addMaoMeasureCommission(map); //添加计毛委托 并发送计毛委托
                 break;
-            case 10:
-                checkMeasureCommission = tmstruckMeasureCommissionService.addMaoMeasureCommission(map); //添加计量委托
-                break;
-            case 11:
-                break;
+//            case 11:
+//                break;
             case 12:
             case 13:
             case 16:
             case 15:
+            case 20:
                 //发送计量委托(查询物资顺序第一个装卸货的物资)
                 //拿到需要计量的物资ID
                 Integer materialId = utilsMapper.getLxFirstMaterialId(DataChange.dataToBigDecimal(map.get("orderId")));
                 map.put("materialId", materialId);
                 checkMeasureCommission += tmstruckMeasureCommissionService.addLXMeasureCommission(map);
         }
-
         if(checkMeasureCommission == 0){
             throw new Exception("委托发送失败");
         }
-        i += updateEnFactoryResultByPDA(map); //添加进厂实绩
+        i += tmstruckEnfactoryResultMapper.updateByPrimaryKeySelective(generateEnFactoryResult(map)); //添加进厂实绩
         //修改路段顺序号
         i += utilsService.updateOrderLineSequence(map);
         utilsService.pushMesToWebsocket((String) map.get("capacityNumber"), "车辆进厂");
@@ -282,11 +308,11 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
     }
 
     /**
-     * 通过PDA添加进厂实绩方法
+     * 生成进厂实绩
      * @param map
      * @return
      */
-    public int updateEnFactoryResultByPDA(Map<String, Object> map){
+    public TmstruckEnfactoryResult generateEnFactoryResult(Map<String, Object> map){
         TmstruckEnfactoryResult tmstruckEnfactoryResult = new TmstruckEnfactoryResult();
         //获取进厂实绩id
         tmstruckEnfactoryResult.setResultId(DataChange.dataToBigDecimal(map.get("resultId")));
@@ -297,7 +323,13 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
         tmstruckEnfactoryResult.setInsertTime(new Date());
         tmstruckEnfactoryResult.setResultEntryMode("手动抬杠");
         tmstruckEnfactoryResult.setInsertUsername("admin");
-        return tmstruckEnfactoryResultMapper.updateByPrimaryKeySelective(tmstruckEnfactoryResult);
+        if(map.get("Sqe") != null){
+            tmstruckEnfactoryResult.setSegmenSqe(DataChange.dataToBigDecimal(map.get("Sqe")));
+        }
+        if(map.get("totalId") != null){
+            tmstruckEnfactoryResult.setResultTotalId(DataChange.dataToBigDecimal(map.get("totalId")));
+        }
+        return tmstruckEnfactoryResult;
     }
 
     /**

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

@@ -140,6 +140,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
             case 9:
                 return tmstruckLeaveFactoryResultMapper.getImportedDomesticNzEnFactoryResult(map); //apiId:110
             case 10:
+            case 20:
                 return tmstruckEnfactoryResultMapper.getCgNzOutFactory(map);
             case 11:
                 return tmstruckLeaveFactoryResultMapper.getInFactoryOutFactoryResult(map); //apiId:361
@@ -204,6 +205,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 break;
             case 4:
                 break;
+            case 5:
             case 6:
             case 7:
                 //判断出厂路段顺序号是否为最后一个 采购订单关闭订单
@@ -215,7 +217,6 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                     omsFeign.addNewTransportOrder(orderId.intValue());
                 }
                 break;
-            case 5:
             case 8:
             case 9:
             case 17:
@@ -232,8 +233,8 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
 //                }
                 break;
             case 10:
+            case 20:
                 //生成新的采购内转运输订单
-
                 //判断出厂路段顺序号是否为最后一个 采购订单关闭订单
                 i += utilsService.closeOrderNormally(map);
                 //根据运输订单ID查询路段顺序号
@@ -249,6 +250,7 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 }
                 break;
             case 11:
+                i += utilsService.closeOrderNormally(map);
                 break;
             case 12:
             case 13:
@@ -259,6 +261,8 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 //关闭当前订单
                 i += utilsService.closeOrderNormally(map);
                 break;
+
+
         }
         utilsService.pushMesToWebsocket((String) map.get("capacityNumber"), "出厂");
         return i;

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

@@ -3,10 +3,9 @@ package com.steerinfo.dil.service.impl;
 import com.steerinfo.dil.feign.OmsFeign;
 import com.steerinfo.dil.feign.WMSFeign;
 import com.steerinfo.dil.feign.WmshBoundFeign;
-import com.steerinfo.dil.mapper.TmstruckEnfactoryResultMapper;
-import com.steerinfo.dil.mapper.TmstruckLoadResultMapper;
-import com.steerinfo.dil.mapper.TmstruckReturnResultMapper;
-import com.steerinfo.dil.mapper.UtilsMapper;
+import com.steerinfo.dil.mapper.*;
+import com.steerinfo.dil.model.TmstruckEnfactoryResult;
+import com.steerinfo.dil.model.TmstruckLeaveFactoryResult;
 import com.steerinfo.dil.model.TmstruckLoadResult;
 import com.steerinfo.dil.service.ITmstruckLoadResultService;
 import com.steerinfo.dil.util.DataChange;
@@ -46,7 +45,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
     private UtilsServiceImpl utilsService;
 
     @Autowired
-    private RulesServiceImpl rulesService;
+    private TmstruckLeaveFactoryResultMapper tmstruckLeaveFactoryResultMapper;
 
     @Autowired
     private WmshBoundFeign wmshBoundFeign;
@@ -60,6 +59,9 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
     @Autowired
     private TmstruckWeightResultServiceImpl tmstruckWeightResultService;
 
+    @Autowired
+    private  TmstruckMeasureCommissionServiceImpl tmstruckMeasureCommissionService;
+
     /**
      * 生成销售装车实绩（虚拟装车实绩）
      * @param map
@@ -102,6 +104,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
                 return tmstruckLoadResultMapper.getCGJKLoadResult(map); // apiId = 91
             case 9:
             case 10:
+            case 20:
                 return tmstruckLoadResultMapper.getImportedDomesticNzLoadResult(map); //apiId = 353
             case 11:
                 return tmstruckLoadResultMapper.getInFactoryLoadResult(map); //apiId = 359
@@ -114,6 +117,8 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         return null;
     }
 
+
+
     /**
      * 新增采购装车实绩  / 内转装车实绩
      * @param map  resultMeasuredTonnage ：计量吨位  portId：港口ID
@@ -249,7 +254,8 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
      * @return
      */
     @Transactional
-    public int addXS2LoadResult(Map<String, Object> map){
+    public int addXS2LoadResult(Map<String, Object> map) throws Exception {
+        int j=0;
         //通过运输订单号 查询 总实绩ID、订单类型
         Map<String,Object> orderMap = tmstruckEnfactoryResultMapper.selectTotalResultIdByCpAndOn(map);
         BigDecimal resultTotalId = (BigDecimal) orderMap.get("resultTotalId");
@@ -275,18 +281,65 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
                 tmstruckLoadResult.setLoaderId(new BigDecimal(personnelId));
             }
         }
+        BigDecimal orderType =(BigDecimal) orderMap.get("orderType");
+        BigDecimal orderId=DataChange.dataToBigDecimal("orderId");
+        if (orderType.intValue()==11){
+            //判断是否需要第二次计量
+            //根据运输订单号查找物资
+            Integer materialNum = utilsMapper.countMaterialByOrderId(orderId);
+            if (materialNum>1) {
+                //发送第二次计量委托
+                j += tmstruckMeasureCommissionService.sendMeasureCommssion(map);
+
+            }
+        }
         // 更新装货点
         tmstruckLoadResult.setLoadingId(DataChange.dataToBigDecimal(map.get("warehouseId")));
-        tmstruckLoadResult.setInsertUpdateRemark((String) map.get("insertUpdateRemark"));
-        tmstruckLoadResult.setCaseNumber((String) map.get("caseNumber"));
-        int i = tmstruckLoadResultMapper.updateByPrimaryKeySelective(tmstruckLoadResult);
         //更新路段顺序号
-        i += utilsService.updateOrderLineSequence(map);
+        int i = utilsService.updateOrderLineSequence(map);
+        //判断是否为未装货
+        if (map.get("insertUpdateRemark")!=null) {
+            String insertUpdateRemark = (String) map.get("insertUpdateRemark");
+            if("未装货".equals(insertUpdateRemark)){
+                loadJudge(orderMap);
+            }
+            tmstruckLoadResult.setInsertUpdateRemark(insertUpdateRemark);
+        }
+        if (j == 0) {
+            throw new Exception("第二次委托发送失败");
+        }
+        tmstruckLoadResult.setCaseNumber((String) map.get("caseNumber"));
+        i += tmstruckLoadResultMapper.updateByPrimaryKeySelective(tmstruckLoadResult);
         //推送消息到websocket
         utilsService.pushMesToWebsocket((String) orderMap.get("capacityNumber"), "装货");
         return i;
     }
 
+    /**
+     * 更改最大路段顺序号 -1
+     * @Author TXF
+     * @Date 2022/2/13 12:59
+     * @param map
+     * @return
+     **/
+    @Override
+    public int loadJudge(Map<String, Object> map) {
+        BigDecimal orderId =DataChange.dataToBigDecimal(map.get("orderId"));
+        //查找当前订单共有几次出厂
+        List<Integer> resultIdList = tmstruckLoadResultMapper.allOutFactoryNum(orderId);
+        if(resultIdList.size() > 1){
+            for(int i = 0; i < resultIdList.size() - 1; i ++){
+                //给最后一次出厂 之外的出厂实绩 赋值出厂时间
+                TmstruckLeaveFactoryResult tmstruckLeaveFactoryResult = new TmstruckLeaveFactoryResult();
+                tmstruckLeaveFactoryResult.setResultId(new BigDecimal(resultIdList.get(i)));
+                tmstruckLeaveFactoryResult.setResultOutMode("未装货出厂");
+                tmstruckLeaveFactoryResult.setResultOutGateTime(new Date());
+                tmstruckLeaveFactoryResultMapper.updateByPrimaryKeySelective(tmstruckLeaveFactoryResult);
+            }
+        }
+        return tmstruckLoadResultMapper.updateSqe(orderId);
+    }
+
     /**
      * 添加装车标准时长ID
      * @param orderNumber

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

@@ -2,13 +2,16 @@ package com.steerinfo.dil.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.steerinfo.dil.mapper.RulesMapper;
 import com.steerinfo.dil.mapper.TmstruckMeasureCommissionMapper;
+import com.steerinfo.dil.mapper.UtilsMapper;
 import com.steerinfo.dil.model.TmstruckMeasureCommission;
 import com.steerinfo.dil.service.ITmstruckMeasureCommissionService;
 import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.util.HTTPRequestUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -33,6 +36,12 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
     @Autowired
     private TmstruckMeasureCommissionMapper tmstruckMeasureCommissionMapper;
 
+    @Autowired
+    private RulesMapper rulesMapper;
+    @Autowired
+    UtilsMapper utilsMapper;
+    @Autowired
+    private RulesServiceImpl rulesService;
    /**
      * 查询计量委托 0 ：计皮     1：计毛
      * @param map orderTypee 订单类型   type 是计皮还是计毛
@@ -82,23 +91,23 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         int i = 0;
         addMeasureCommission(map); // 添加计毛委托
         //发送数据给计量系统 必要数据 orderTypee：订单类型  resultTotalId： 总实绩Id   orderId
-        //获取当前订单是属于哪个厂区订单
-        Integer receiveId = 0 ;
-        Integer supplierId = 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){
+        int orderType = DataChange.dataToBigDecimal(map.get("orderTypee")).intValue();
+        if(orderType == 10){
+            //获取当前订单是属于哪个厂区订单
+            Integer receiveId = tmstruckMeasureCommissionMapper.getReceiveIdByRequirementOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
+            if(receiveId == 1){
+                i += sendMeasureCommissionMes(map);  //发送委托给达州钢铁
+            }else if(receiveId == 2) {
+                i += sendDXMeasureCommissionMes(map); //发送委托给达兴能源
+            }
+        }else if(orderType == 6 || orderType == 5 || orderType == 11){
             //发送委托给达州钢铁
             i += sendMeasureCommissionMes(map);
-        }
-        if(receiveId == 2) {
+        }else if(orderType == 18 || orderType == 7) {
             //发送委托给达兴能源
             i += sendDXMeasureCommissionMes(map);
         }
+
         return i;
     }
 
@@ -139,7 +148,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             Integer receiveId = tmstruckMeasureCommissionMapper.getLxRealReceiveIdByOrderId(orderId);
             if(receiveId == 1){
                 //给达钢发送委托
-
+                i = sendMeasureCommissionMes(map);
             }else if(receiveId == 2){
                 //给达兴发送委托
                 i = sendDXMeasureCommissionMes(map);
@@ -147,10 +156,8 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         }else if(orderType == 13){
             Integer sendId = tmstruckMeasureCommissionMapper.getLxRealSendUnitIdByOrderId(orderId);
             if(sendId == 1){
-                //给达钢发送委托
-
+                i = sendMeasureCommissionMes(map);
             }else if(sendId == 2){
-                //给达兴发送委托
                 i = sendDXMeasureCommissionMes(map);
             }
 
@@ -159,23 +166,28 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             //如果是15类型的订单寻找订单父级发货单位  (现只有进厂)
             Integer receiveId = tmstruckMeasureCommissionMapper.getLxRealReceiveIdByOrderId(orderId);
             if(receiveId == 1){
-                //给达钢发送委托1
-
+                i = sendMeasureCommissionMes(map);
             }else if (receiveId == 2){
-                //给达兴发送委托
                 i = sendDXMeasureCommissionMes(map);
             }
         }else if(orderType == 16){
             //出厂,发货单位
             Integer sendUnitId = tmstruckMeasureCommissionMapper.getLxRealSendUnitIdByOrderId(orderId);
             if(sendUnitId == 1){
-                //给达钢发送委托1
-
+                i = sendMeasureCommissionMes(map);
             }else if (sendUnitId == 2){
-                //给达兴发送委托
                 i = sendDXMeasureCommissionMes(map);
             }
         }
+        else if(orderType == 20) {//内转零星进厂
+            //查询还未计量实绩
+            Integer noNetWeightResult = rulesMapper.getNoNetWeightResult(orderId);
+            if(noNetWeightResult != 2){
+                i = sendMeasureCommissionMes(map);
+            }else {
+                i = sendDXMeasureCommissionMes(map);//如果有两条没有净重的实绩则需要给达兴发委托  否则给达钢发委托
+            }
+        }
         addMeasureCommission(map); // 添加计毛委托
         return i;
     }
@@ -208,18 +220,18 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
 
 
     /**
-     * 查询计量委托并向计量系统发送数据  调用他们接口
+     * 查询计量委托并向计量系统发送数据  调用他们接口 (老厂区）
      * 1：销售订单；2：焦炭发运计划；3：水渣发运计划；4：内转到异地库；5：采购辅料订单；6：采购老区燃料订单；
      * 7：采购新区燃料订单；8：采购进口矿(万州-厂内)；9：采购内转(达州-厂内)；10：采购内转(老区-厂内)； 11：厂内内转
      * @param map orderTypee 订单类型  type 计皮0还是计毛1类型  orderId  订单ID
      */
     public int sendMeasureCommissionMes(Map<String, Object> map){
-        Map<String, Object> measureCommission = null;
+        Map<String, Object> measureCommission = new HashMap<>();
         //查询计量委托
-        BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderTypee"));
-        switch (orderType.intValue()){
+        Integer orderType = DataChange.dataToBigDecimal(map.get("orderTypee")).intValue();
+        BigDecimal orderId=DataChange.dataToBigDecimal(map.get("orderId"));
+        switch (orderType){
             case 1:
-
                 break;
             case 2:
                 break;
@@ -227,27 +239,82 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 break;
             case 10:
                 break;
-            case 11:
+            case 11://纯内转发送计量委托
+                 //查找是否是多拼
+                 Integer materialNu = utilsMapper.countMaterialByOrderId(orderId);
+                 if (materialNu > 1){
+                     List<Map<String, Object>> inwardCommission = tmstruckMeasureCommissionMapper.getMaterialIdAndCalculateId(map);
+                 }else {
+                     measureCommission = tmstruckMeasureCommissionMapper.purchaseNzMeasure(map);
+                 }
+                 measureCommission.put("isRelationEAS", false);
+                 measureCommission.put("flowTo", "进厂");
+                 measureCommission.put("isDel", false);
+                 measureCommission.put("isInsert", true);
+                 measureCommission.put("IsAssembly", false);
+                 measureCommission.put("deliveryMethod", "磅重交货");
+                 measureCommission.put("packagesNum", 0);
+                 measureCommission.put("ReceivUnit","四川省达州钢铁集团有限责任公司");
+                 measureCommission.put("sendUnit","四川省达州钢铁集团有限责任公司");
+                 break;
             case 4:
-
                 break;
             case 5:
             case 6:
             case 7:
             case 8:
-            case 9:
+//            case 9:
                 measureCommission =  tmstruckMeasureCommissionMapper.purchaseMeasure(map);
-                measureCommission.put("isRelationEAS", true);
+                if(orderType == 6){
+                    measureCommission.put("isRelationEAS", false);
+                }else {
+                    measureCommission.put("isRelationEAS", true);
+                }
                 measureCommission.put("flowTo", "进厂");
                 measureCommission.put("isDel", false);
                 measureCommission.put("isInsert", true);
                 measureCommission.put("IsAssembly", false);
                 measureCommission.put("deliveryMethod", "磅重交货");
                 measureCommission.put("packagesNum", 0);
+                break;
+            case 12:
+            case 13:
+                 //内转零星进厂（老厂区）
+                //零星计量委托(老厂区)
+                measureCommission = tmstruckMeasureCommissionMapper.sproadicMeasure(map);
+                measureCommission.put("isRelationEAS",false);
+                measureCommission.put("flowTo","进厂");
+                measureCommission.put("isDel", false);
+                measureCommission.put("isInsert", true);
+                measureCommission.put("IsAssembly", false);
+                measureCommission.put("deliveryMethod", "磅重交货");
+                measureCommission.put("packagesNum", 0);
+                break;
+            case 15:
+            case 16:
+                //零星计量委托(老厂区)  会有多拼
+                measureCommission = tmstruckMeasureCommissionMapper.sproadicMeasure(map);
+                measureCommission.put("isRelationEAS",false);
+                measureCommission.put("flowTo","出厂");
+                measureCommission.put("isDel", false);
+                measureCommission.put("isInsert", true);
+                measureCommission.put("deliveryMethod", "磅重交货");
+                measureCommission.put("packagesNum", 0);
+                break;
+            case 20://采购内转委托总厂区
+                measureCommission=tmstruckMeasureCommissionMapper.purchaseXqCgNzMeasure(map);
+                measureCommission.put("isRelationEAS",false);
+                measureCommission.put("flowTo","进厂");
+                measureCommission.put("isDel",false);
+                measureCommission.put("isInsert",true);
+                measureCommission.put("deliveryMethod", "磅重交货");
+                measureCommission.put("packagesNum", 0);
+
         }
         /*访问接口发送数据*/
-//        sendMesToMeasure(measureCommission);
         return 1;
+//        return sendMesToMeasure(measureCommission);
+
     }
 
 
@@ -290,6 +357,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             case 9:
                 break;
             case 10:
+            case 20:
                 //新区采购内转
                 measureCommission = tmstruckMeasureCommissionMapper.purchaseXqCgNzDXMeasure(map);
                 if(measureCommission == null)
@@ -314,19 +382,6 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 break;
             case 12:
             case 13:
-                measureCommission = tmstruckMeasureCommissionMapper.sporadicDXMeasure(map);
-                if(measureCommission == null)
-                    return 0;
-                measureCommission.put("regionName", "无法确定汽车衡"); //无法确定汽车衡
-                measureCommission.put("deliveryType", "计重");
-                measureCommission.put("billType", "2");
-                measureCommission.put("planQuantity", "0");
-                measureCommission.put("crname", "admin");
-                measureCommission.put("orderSource", "0");
-                measureCommission.put("ended", "0");
-                break;
-//            case 14:
-            //零星一车多趟
             case 15:
             case 16:
                 measureCommission = tmstruckMeasureCommissionMapper.sporadicDXMeasure(map);
@@ -339,12 +394,11 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 measureCommission.put("crname", "admin");
                 measureCommission.put("orderSource", "0");
                 measureCommission.put("ended", "0");
+                break;
             
         }
         /*访问接口发送数据*/
         return sendMesToDXMeasure(measureCommission);
-  //      System.out.println(measureCommission);
-  //    return 1;
     }
 
     /**
@@ -374,6 +428,8 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             if(success){
                 return 1;
             }
+        }else{
+            System.out.println("委托发送失败：" + jsonData);
         }
         return 0;
     }
@@ -405,4 +461,54 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         }
         return 0;
     }
+
+    //发送计量委托
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int sendMeasureCommssion(Map<String, Object> map)  throws Exception {
+        int i=0;
+        //获取订单类型
+        BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
+        BigDecimal orderType = utilsMapper.getOrderTypeByOrderId(orderId);
+        map.put("orderTypee", orderType);
+        //根据运输订单id查找运输订单号
+        switch (orderType.intValue()){
+            case 1: //查询未装车实绩
+                List<Map<String, Object>> mapList = rulesService.judgeLastMaterial(DataChange.dataToBigDecimal(map.get("orderId")));
+                map.put("materialId", mapList.get(0).get("materialId"));
+                i+=addXSMeasureCommission(map);
+            case 2:
+            case 3: //通过物资ID查询订单ID（针对单拼）
+                List<Integer> materialIdList = utilsMapper.getMaterialIdByOrderId(orderId);
+                map.put("materialId", materialIdList.get(0));
+                i+=addXSMeasureCommission(map);
+                break;
+            case 12:
+            case 13:
+            case 15:
+            case 20:
+            case 16: //发送计量委托(查询物资顺序第一个装卸货的物资)
+                //拿到需要计量的物资ID
+                Integer materialId = utilsMapper.getLxFirstMaterialId(DataChange.dataToBigDecimal(map.get("orderId")));
+                map.put("materialId", materialId);
+                i+=addLXMeasureCommission(map);
+                break;
+            case 5:
+            case 6:
+            case 7:
+//            case 8:
+//            case 9:
+            case 10:
+            case 11:
+//            case 17:
+            case 18:
+                //通过订单ID查询物资Id
+                i+=addMaoMeasureCommission(map);
+        }
+        if (i==0){
+            throw new Exception("委托发送失败");
+        }
+        return i;
+    }
+
 }

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

@@ -112,6 +112,7 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             case 9:
                 return tmstruckUnloadResultMapper.getImportedDomesticNzUnloadResult(map); //apiId:355
             case 10:
+            case 20:
                 return tmstruckUnloadResultMapper.getImportedDomesticNzUnload2Result(map); //apiId:356
             case 11:
                 return tmstruckUnloadResultMapper.getInFactoryUnloadResult(map); //apiId:360
@@ -144,11 +145,6 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
         i += updateUnloadResultBy(map); //更新卸货实绩
         //路段顺序号 + 1
         i += utilsService.updateOrderLineSequence(map);
-        BigDecimal resultTotalId = DataChange.dataToBigDecimal(map.get("resultTotalId"));
-        BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
-        Map<String, Object> mesMap = new HashMap<>();
-        mesMap.put("orderId", orderId);
-        mesMap.put("orderType", orderType);
         switch (orderType.intValue()){
             case 1:
                 break;
@@ -167,6 +163,7 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             case 15:
             case 17:
             case 18:
+            case 20:
                 i += tmstruckReceiptResultService.addReceiptResult(map); //新增完卸车实绩后新增一条收货实绩
                 break;
             case 11:

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

@@ -129,6 +129,7 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
             case 9:
                 return tmstruckWeightResultMapper.getImportedDomesticNzJiMaoResult(map); // apiID:354
             case 10:
+            case 20:
                 return tmstruckWeightResultMapper.getImportedDomesticNzJiMao2Result(map); // apiID:354
             case 11:
                 return tmstruckWeightResultMapper.getInFactoryJiLiangResult(map);       //apiId: 358
@@ -175,6 +176,7 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
             case 13:
 //                return tmstruckWeightResultMapper.getFactorySkinSporadicJIPi(map); //apiId=401
             case 15:
+            case 20:
             case 16:
                 return tmstruckWeightResultMapper.getFactorySkinSporadicWeight(map); //apiId=401
         }

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

@@ -1,5 +1,7 @@
 package com.steerinfo.dil.service.impl;
 
+import com.steerinfo.dil.feign.BmsShipFeign;
+import com.steerinfo.dil.feign.BmsTruckFeign;
 import com.steerinfo.dil.feign.IMFeign;
 import com.steerinfo.dil.mapper.UtilsMapper;
 import com.steerinfo.dil.service.IUtilsService;
@@ -22,6 +24,9 @@ public class UtilsServiceImpl implements IUtilsService {
 
     @Autowired
     private IMFeign imFeign;
+
+    @Autowired
+    private BmsTruckFeign bmsTruckFeign;
     /**
      * 查询运输订单ID主键
      * @return
@@ -64,7 +69,11 @@ public class UtilsServiceImpl implements IUtilsService {
         BigDecimal maxSeq = DataChange.dataToBigDecimal(mesMap.get("maxSeq"));
         if(orderSeq.intValue() == maxSeq.intValue()){
             map.put("orderStatus", 2);
-            return utilsMapper.updateOrderStatusByOrderIdOrNum(map);
+            utilsMapper.updateOrderStatusByOrderIdOrNum(map);
+        }
+        if(map.get("priceId")!=null){
+            //如果有价格ID 则说明需要结算 调用新增详单接口
+//            bmsTruckFeign.addDetailsOrder(DataChange.dataToBigDecimal(map.get("orderId")));
         }
         return 0;
     }
@@ -100,6 +109,18 @@ public class UtilsServiceImpl implements IUtilsService {
         return utilsMapper.updateLineSeqByOrderIdOrNum(mesMap);
     }
 
+    /**
+     * 厂内内转订单专属更新路段顺序号方法
+     * @Author TXF
+     * @Date 2022/2/17 22:02
+     * @param map
+     * @return
+     **/
+    public int updateOrderLineSqeByOrderNumber(Map<String, Object> map){
+        return utilsMapper.updateLineSeqByOrderIdOrNum(map);
+    }
+
+
     /**
      * 通过月台名称查询月台Id
      * @param platformName

src/main/resources/application-dev.yml

@@ -33,7 +33,7 @@ openfeign:
   OmsFeign:
     url: ${OMSFEIGN_URL:localhost:8016}
   JoinFeign:
-    url: ${JOINFEIGN_URL:172.16.33.162:8006}
+    url: ${JOINFEIGN_URL:localhost:8006}
   QmsFeign:
     url: ${QMSFEIGN_URL:172.16.33.162:8017}
   ImFeign:

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

@@ -735,7 +735,7 @@
             TMSTRUCK_TOTAL_RESULT TTR
         LEFT JOIN OMSTRUCK_ORDER OO ON OO.ORDER_ID = TTR.ORDER_ID
         WHERE
-            OO.ORDER_TYPE = 10
+            OO.ORDER_TYPE in (10,20)
         order by TTR.RESULT_TOTAL_ID desc
     </select>
     <select id="getInwardReportResult" resultType="java.util.LinkedHashMap">
@@ -840,7 +840,7 @@
         on tlfr2.result_total_id = ttr.result_total_id
       left join rms_gatepost rg4
         on tlfr2.gatepost_id = rg4.gatepost_id
-     where oo.order_type = 10
+     where oo.order_type in (10,20)
        and ter1.segmen_sqe = 1
        and twr1.tare_segment_sqe = 2
        and tlr.segment_sqe = 3

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

@@ -629,7 +629,9 @@
     <select id="selectTotalResultIdByCpAndOn" parameterType="java.util.Map" resultType="java.util.Map">
         select TTR.RESULT_TOTAL_ID "resultTotalId",
                RC.CAPACITY_NUMBER "capacityNumber",
-               OO.ORDER_TYPE       "orderType"
+               OO.ORDER_TYPE       "orderType",
+               OO.ORDER_ID          "orderId",
+               OO.LINE_ID           "lineId"
         from OMSTRUCK_ORDER OO
         left join TMSTRUCK_TOTAL_RESULT TTR
         on TTR.ORDER_ID = OO.ORDER_ID
@@ -1162,7 +1164,7 @@
     <select id="getSporadicSuppliesEnFactoryResult" parameterType="java.util.Map" resultType="java.util.Map">
         select *
         from (
-        select TER.RESULT_ID "resultId",
+        select distinct TER.RESULT_ID "resultId",
                OO.ORDER_ID    "orderId",
                 OO.ORDER_NUMBER "orderNumber",
                 RC.CAPACITY_NUMBER "capacityNumber",
@@ -1282,7 +1284,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 = 10
+        and OO.ORDER_TYPE in (10,20)
         <if test="userId">
             and air.INSERT_USERNAME=#{userId}
         </if>
@@ -1378,7 +1380,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 = 10
+   and OO.ORDER_TYPE in (10,20)
    <if test="userId !=null">
       and AIR.INSERT_USERNAME = #{userId}
    </if>
@@ -1402,4 +1404,17 @@
         </where>
     </select>
 
+    <select id="selectAllEnFactoryNum" parameterType="java.math.BigDecimal" resultType="int">
+        select count(TER.RESULT_TOTAL_ID)
+        from TMSTRUCK_ENFACTORY_RESULT TER
+        where TER.RESULT_TOTAL_ID = #{resultTotalId}
+    </select>
+
+    <select id="selectEnFactoryNumber" parameterType="java.math.BigDecimal" resultType="int">
+        select count(TER.RESULT_TOTAL_ID)
+        from TMSTRUCK_ENFACTORY_RESULT TER
+        where TER.RESULT_TOTAL_ID = #{resultTotalId}
+        and TER.RESULT_ENTRY_GATE_TIME is null
+    </select>
+
 </mapper>

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

@@ -596,7 +596,8 @@
                         OO.CAPACITY_ID      "capacityId",
                         RC.CAPACITY_NUMBER  "capacityNumber",
                         TLFR.SEGMENT_SQE    "segmentSqe",
-                        OO.ORDER_LINE_SEQUENCE      "orderSegmentSqe"
+                        OO.ORDER_LINE_SEQUENCE      "orderSegmentSqe",
+                        OO.PRICE_ID             "priceId"
                  from OMSTRUCK_ORDER OO
                           left join TMSTRUCK_TOTAL_RESULT TTR
                                     on OO.ORDER_ID = TTR.ORDER_ID
@@ -961,7 +962,6 @@
         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 = 11
         )
@@ -1092,7 +1092,7 @@
     <select id="getSporadicLeaveFactory" parameterType="java.util.Map" resultType="java.util.Map">
         select *
         from (
-        select TLFR.RESULT_ID              "resultId",
+        select distinct TLFR.RESULT_ID              "resultId",
         OO.ORDER_NUMBER                    "orderNumber",
         RC.CAPACITY_NUMBER                 "capacityNumber",
         RG.GATEPOST_NAME                   "gatepostName",

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

@@ -1350,7 +1350,7 @@
     ON RC.CAPACITY_ID = OO.CAPACITY_ID
     LEFT JOIN RMS_WAREHOUSE RW
     ON RW.WAREHOUSE_ID = TLR.LOADING_ID
-    WHERE OO.ORDER_TYPE =10
+    WHERE OO.ORDER_TYPE in (10,20)
     AND TLR.RESULT_LOAD_START_TIME IS NOT NULL
     <if test="userId !=null">
       and AIR.INSERT_USERNAME = #{userId}
@@ -1513,7 +1513,7 @@
   <select id="getSporadicSuppliesLoadResult" resultType="java.util.Map">
     select *
     from (
-    select
+    select distinct
     TLR.RESULT_ID "resultId",
     OO.ORDER_NUMBER "orderNumber",
     RC.CAPACITY_NUMBER "capacityNumber",
@@ -1617,4 +1617,39 @@
                      and TLR.RESULT_LOAD_END_TIME IS NULL
                      and OO.ORDER_TYPE = #{orderType})
   </select>
+  <select id="getInsertUpdateRemark" resultType="java.util.Map" parameterType="java.util.Map">
+    select OO.LINE_ID "lineId",
+           OO.ORDER_ID "orderId"
+    from OMSTRUCK_ORDER OO
+    left join TMSTRUCK_TOTAL_RESULT TTR
+    on TTR.ORDER_ID=OO.ORDER_ID
+    left join TMSTRUCK_LOAD_RESULT TLR
+    on  TTR.RESULT_TOTAL_ID=TLR.RESULT_TOTAL_ID
+    where TTR.RESULT_TOTAL_ID=#{resultTotalId}
+  </select>
+
+  <select id="allOutFactoryNum" resultType="int" parameterType="java.math.BigDecimal">
+    select TLFR.RESULT_ID
+    from OMSTRUCK_ORDER OO
+           left join TMSTRUCK_TOTAL_RESULT TTR on TTR.ORDER_ID = OO.ORDER_ID
+           left join TMSTRUCK_LEAVE_FACTORY_RESULT TLFR on TTR.RESULT_TOTAL_ID = TLFR.RESULT_TOTAL_ID
+    where OO.ORDER_ID = #{orderId}
+      and TLFR.RESULT_OUT_GATE_TIME is null
+    order by TLFR.SEGMENT_SQE
+  </select>
+
+  <update id="updateSqe" parameterType="java.util.Map">
+    update OMSTRUCK_ORDER OO
+    set OO.ORDER_LINE_SEQUENCE =
+        (
+          select MAX(RLS.SEGMENT_SQE)
+          from OMSTRUCK_ORDER OO
+                 left join RMS_LINE RL
+                           on OO.LINE_ID = RL.LINE_ID
+                 left join RMS_LINE_SEGEMNT RLS
+                           on RL.LINE_ID = RLS.LINE_ID
+          where OO.ORDER_ID = #{orderId}
+        ) - 1
+    where OO.ORDER_ID = #{orderId}
+  </update>
 </mapper>

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

@@ -833,9 +833,9 @@
         where OO.ORDER_ID = #{orderId}
     </select>
 
-<!--   通过订单ID查询收货单位ID -->
+<!--   通过订单ID查询组织ID -->
     <select id="getReceiveIdByOrderId" parameterType="java.math.BigDecimal" resultType="java.lang.Integer">
-        select APO.RECEIVE_UNIT_ID
+        select APO.PURCHASING_ORGANIZATION_ID
         from OMSTRUCK_ORDER OO
         left join AMS_PURCHASE_ORDER APO
             on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
@@ -934,6 +934,43 @@
                 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="sproadicMeasure" parameterType="map" resultType="java.util.Map">
+        select RM.MATERIAL_NAME "materiaName",
+               OO.ORDER_NUMBER "transportNum",
+               RC.CAPACITY_NUMBER "carNum",
+               RS.SUPPLIER_NAME "sendUnit",
+               RC2.CONSIGNEE_COMPANY_NAME "ReceivUnit",
+               RM.MATERIAL_ID "materialId",
+               CONCAT(RM.MATERIAL_SPECIFICATION,RM.MATERIAL_MODEL) "goodsType",
+               TWR.INSERT_UPDATE_REMARK    "demo",
+               RC2.CONSIGNEE_COMPANY_NAME  "unloadPlace",
+               RTC.TRUCK_CALCULATE_NUMBER  "steelyardNum"
+
+        from OMSTRUCK_ORDER OO
+        left join TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.ORDER_ID=OO.ORDER_ID
+        left join TMSTRUCK_WEIGHT_RESULT TWR
+        on TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
+        left join RMS_TRUCK_CALCULATE RTC
+        on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_ID
+        LEFT JOIN OMSTRUCK_ORDER_MATERIAL oom
+        ON OO.ORDER_ID=oom.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 RC2
+         ON RC2.CONSIGNEE_ID=ASO.RECEIVE_UNIT_ID
+         WHERE OO.ORDER_ID=#{orderId} and  TWR.RESULT_NET_WEIGHT is null
+    </select>
+
+
+
+
     <select id="getReceiveIdByRequirementOrderId" resultType="java.lang.Integer" parameterType="java.math.BigDecimal">
         select apo.receive_unit_id
   from omstruck_order oo
@@ -1063,4 +1100,126 @@
                            on ASO.SPORADIC_ORDER_ID = OO.ORDER_PLAN_ID
         where OO.ORDER_ID = #{orderId}
     </select>
+<!--  老厂区采购内转计量委托 -->
+    <select id="purchaseXqCgNzMeasure" resultType="java.util.Map" parameterType="java.math.BigDecimal">
+        SELECT
+            *
+        FROM
+            (
+                SELECT
+                    OO.ORDER_NUMBER "transportNum",
+                    RC.CAPACITY_NUMBER "carNum",
+                    APO.PURCHASE_ORDER_NO "purchaseOrder",
+                    RS.SUPPLIER_NAME "sendUnit",
+                    RCE.CONSIGNEE_COMPANY_NAME "ReceivUnit",
+                    RW.WAREHOUSE_NAME "unloadPlace",
+                    TWR.INSERT_UPDATE_REMARK "demo",
+                    RM.MATERIAL_ID "materialId",
+                    RM.MATERIAL_NAME "materiaName",
+                    concat( RM.MATERIAL_SPECIFICATION, RM.MATERIAL_MODEL ) "goodsType",
+                    RTC.TRUCK_CALCULATE_NUMBER "steelyardNum"
+                FROM
+                    OMSTRUCK_ORDER OO
+                        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 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_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_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 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
+                        LEFT JOIN RMS_TRUCK_CALCULATE RTC ON RTC.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
+                WHERE
+                    OO.ORDER_ID = #{orderId}
+                ORDER BY
+                    TWR.TARE_SEGMENT_SQE DESC
+                )
+        WHERE
+            ROWNUM = 1
+    </select>
+    <select id="purchaseNzMeasure" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT
+            *
+        FROM
+            (
+                SELECT
+                    OO.ORDER_NUMBER "transportNum",
+                    RC.CAPACITY_NUMBER "carNum",
+                    APO.PURCHASE_ORDER_NO "purchaseOrder",
+                    RW.WAREHOUSE_NAME "unloadPlace",
+                    TWR.INSERT_UPDATE_REMARK "demo",
+                    RM.MATERIAL_ID "materialId",
+                    RM.MATERIAL_NAME "materiaName",
+                    concat( RM.MATERIAL_SPECIFICATION, RM.MATERIAL_MODEL ) "goodsType",
+                    RTC.TRUCK_CALCULATE_NUMBER "steelyardNum"
+                FROM
+                    OMSTRUCK_ORDER OO
+                        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 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_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_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 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
+                        LEFT JOIN RMS_TRUCK_CALCULATE RTC ON RTC.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
+                WHERE
+                    OO.ORDER_ID = #{orderId}
+                ORDER BY
+                    TWR.TARE_SEGMENT_SQE DESC,
+                    OOM.MATERIAL_PRIORITY DESC
+            )
+        WHERE
+            ROWNUM = 1
+    </select>
+
+<!--  查找未计量完成的物资  -->
+    <select id="getMaterialIdAndCalculateId" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT
+            OO.ORDER_NUMBER "transportNum",
+            RC.CAPACITY_NUMBER "carNum",
+            APO.PURCHASE_ORDER_NO "purchaseOrder",
+            RW.WAREHOUSE_NAME "unloadPlace",
+            TWR.INSERT_UPDATE_REMARK "demo",
+            RM.MATERIAL_ID "materialId",
+            RM.MATERIAL_NAME "materiaName",
+            concat( RM.MATERIAL_SPECIFICATION, RM.MATERIAL_MODEL ) "goodsType",
+            RTC.TRUCK_CALCULATE_NUMBER "steelyardNum"
+        FROM
+            OMSTRUCK_ORDER OO
+                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 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_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_UNLOAD_RESULT TUR ON TUR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_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 = AIR.REQUIREMENT_UNLOAD_UNIT_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
+                LEFT JOIN RMS_TRUCK_CALCULATE RTC ON RTC.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
+        WHERE
+            OO.ORDER_ID = #{orderId} AND TLR.RESULT_LOAD_END_TIME IS NOT NULL
+        ORDER BY
+            TWR.TARE_SEGMENT_SQE DESC,
+            TLR.SEGMENT_SQE DESC,
+            OOM.MATERIAL_PRIORITY DESC
+
+    </select>
+
+
 </mapper>

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

@@ -819,7 +819,7 @@
         LEFT JOIN RMS_WAREHOUSE RW
         ON RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
         WHERE TUR.RESULT_END_TIME IS NOT NULL
-        AND OO.ORDER_TYPE = 10
+        AND OO.ORDER_TYPE in (10,20)
         <if test="userId !=null">
             AND AIR.INSERT_USERNAME = #{userId}
         </if>
@@ -949,7 +949,7 @@
     <select id="getSporadicSuppliesUnloadResult" resultType="java.util.Map">
         SELECT *
         FROM (
-        SELECT
+        SELECT distinct
         TUR.RESULT_ID             "resultId",
         OO.ORDER_NUMBER           "orderNumber",
         RC.CAPACITY_NUMBER        "capacityNumber",

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

@@ -1895,7 +1895,7 @@
         left join RMS_MATERIAL RM
         on RM.MATERIAL_ID = OOM.MATERIAL_ID
         where RESULT_TARE_WEIGHT_TIME is not null
-        and OO.ORDER_TYPE = 10
+        and OO.ORDER_TYPE in (10,20)
         <if test="userId!=null">
             AND  air.INSERT_USERNAME =#{userId}
         </if>
@@ -2003,7 +2003,7 @@
         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
+        and OO.ORDER_TYPE in (10,20)
         <if test="userId !=null">
             AND AIR.INSERT_USERNAME = #{userId}
         </if>
@@ -2172,7 +2172,7 @@
     <select id="getSporadicSuppliesJiMiaoResult" resultType="java.util.Map">
         select *
         from (
-        select
+        select distinct
         TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId",
         OO.ORDER_NUMBER "orderNumber",
         RC.CAPACITY_NUMBER "capacityNumber",
@@ -2364,7 +2364,7 @@
     <select id="getFactorySkinSporadicWeight" resultType="java.util.Map">
         select *
         from (
-        select
+        select distinct
         TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId",
         ASO.SPORADIC_ORDER_NO "purchaseOrderNo",
         RM.MATERIAL_NAME "materialName",

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

@@ -178,4 +178,31 @@
                            on RLGC.SEGMENT_ID = RLS.SEGMENT_ID
         where RLS.LINE_ID = #{lineId} and RLS.SEGMENT_SQE = #{segmentSqe}
     </select>
+    <select id="getOrderTypeByOrderId" resultType="java.math.BigDecimal">
+        select OO.ORDER_TYPE "orderType"
+        from OMSTRUCK_ORDER OO
+        where  OO.ORDER_ID=#{orderId}
+    </select>
+     <!-- 根据运输订单id查找是否有多个物资 -->
+    <select id="countMaterialByOrderId" parameterType="java.math.BigDecimal" resultType="java.util.Map">
+        select count(MATERIAL_ID)
+        from OMSTRUCK_ORDER_MATERIAL OOM
+        where OOM.ORDER_ID=#{orderId}
+    </select>
+
+    <select id="getOrderTypeByOrderNumber" parameterType="string" resultType="map">
+        select OO.ORDER_TYPE "orderType",
+               TTR.RESULT_TOTAL_ID "totalId",
+               OO.ORDER_ID      "orderId"
+        from OMSTRUCK_ORDER OO
+        left join TMSTRUCK_TOTAL_RESULT TTR
+            on TTR.ORDER_ID = OO.ORDER_ID
+        where  OO.ORDER_ID=#{orderNumber}
+    </select>
+
+    <select id="getLineSequenceByOrderNumber" parameterType="string" resultType="java.lang.Integer">
+        select OO.ORDER_LINE_SEQUENCE
+        from OMSTRUCK_ORDER OO
+        where OO.ORDER_NUMBER = #{orderNumber}
+    </select>
 </mapper>

src/main/test/tts.java

@@ -1,13 +0,0 @@
-import org.junit.Test;
-
-import java.math.BigDecimal;
-
-public class tts {
-    @Test
-    public void test(){
-        BigDecimal bigDecimal = new BigDecimal("10.001");
-        BigDecimal bigDecimal1 = new BigDecimal("7.288");
-        BigDecimal divide = bigDecimal.subtract(bigDecimal1).divide(new BigDecimal(1), 2, 4);
-        System.out.println(divide);
-    }
-}