'解决冲突'

pom.xml

@@ -111,6 +111,7 @@
                     <tables>
 <!--                        <table>TMSTRUCK_UNLOAD_RESULT</table>-->
                         <param>OMSTRUCK_ORDER_MATERIAL</param>
+                        <param>AMSTRUCK_REQUIREMENT_MATERIAL</param>
                     </tables>
                 </configuration>
                 <executions>

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

@@ -1283,40 +1283,14 @@ public class OmstruckOrderController extends BaseRESTfulController {
                                                   Integer orderStatus,
                                                   String carrierId,
                                                   String con) {
-        if (con != null) {
-            if(!"undefined".equals(con)){
-                String index="get_inward_order_list3";//设置要查询的索引名称
-                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
-            }
-        }
-        int count = 0;
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
         if (carrierId != null && !"undefined".equals(carrierId)) {
             mapValue.put("carrierId",carrierId);
-            count++;
         }
         mapValue.put("orderStatus",(orderStatus));
-        count++;
-        List<Map<String, Object>> dispatchSaleOrderList = null;
-        if (mapValue.size() == count) {
-            //将查询结果存入索引中
-            dispatchSaleOrderList = omstruckOrderService.getInwardOrderList(mapValue);
-            Map<String, Object> map1 = new HashMap<>();
-            //添加索引
-            map1.put("index","get_inward_order_list3");
-            //添加id
-            map1.put("indexId","planId");
-            dispatchSaleOrderList.add(map1);
-            //新建索引
-            esFeign.insertIndex(dispatchSaleOrderList);
-            //删除
-            dispatchSaleOrderList.remove(dispatchSaleOrderList.size()-1);
-        }
-        if (dispatchSaleOrderList == null) {
-            dispatchSaleOrderList = omstruckOrderService.getInwardOrderList(mapValue);
-        }
+        List<Map<String, Object>>    dispatchSaleOrderList = omstruckOrderService.getInwardOrderList(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> columnList = omstruckOrderService.getInwardOrderList(mapValue);
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, dispatchSaleOrderList,columnList);

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

@@ -279,4 +279,23 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
     public RESTfulResult batchCloseOrder(@RequestBody List<Map<String,Object>> mapList){
         return success(omstruckOrderSeparateService.batchCloseOrder(mapList));
     }
+
+    @ApiOperation(value = "根据订单ID查询订单子表物资信息")
+    @PostMapping("/getOrderMaterial/{orderId}")
+    public RESTfulResult getOrderMaterial(@PathVariable("orderId")Integer orderId) {
+        return success(omstruckOrderSeparateService.getOrderMaterial(orderId));
+    }
+
+    @ApiOperation(value = "查看所有实绩点")
+    @PostMapping("/getAllResultLineMes")
+    public RESTfulResult getAllResultLineMes(Integer orderId){
+        return success(omstruckOrderSeparateService.getAllOrderResult(new BigDecimal(orderId)));
+    }
+
+    @ApiOperation(value = "正常关闭运输订单")
+    @PostMapping("/closeInwardOrder")
+    public RESTfulResult closeInwardOrder(Integer orderId){
+        return success(omstruckOrderSeparateService.closeInwardOrder(orderId));
+    }
+
 }

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

@@ -45,4 +45,8 @@ public interface TmsTruckFeign {
     //生成装车实绩： 运输订单Id、物资Id
     @PostMapping("api/v1/truckTms/tmstruckloadresults/addLoadResult")
     RESTfulResult addLoadResult(@RequestBody(required = false) Map<String, Object> map);
+
+    //发送计量委托,运输订单id
+    @PostMapping("api/v1/truckTms/tmstruckmeasurecommissions/sendMeasureCommission")
+    RESTfulResult sendMeasureCommission(@RequestBody(required = false) Map<String, Object> map);
 }

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

@@ -265,6 +265,8 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     //通过订单查询趟次
     Map<String,Object> getSporadicOrderTimes(BigDecimal orderId);
 
+
+
     //根据运输订单id查找所有实绩id
     List<Map<String,Object>> getAllResultId(BigDecimal orderId);
 
@@ -306,4 +308,6 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
 
     int refuseCtrlZ(Map<String, Object> map);
 
+    Map<String, Object> getInwardOrderMessageToApp(Map<String, Object> map);
+
 }

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

@@ -37,4 +37,7 @@ public interface OmstruckOrderMaterialMapper extends IBaseMapper<OmstruckOrderMa
     //批量删除总实绩表
     Integer batchByOrderIdForTotalDelete(List<BigDecimal> list);
 
+    //根据订单ID查询订单物资ID
+    List<Map<String, Object>> getOrderMaterial(Integer orderId);
+
 }

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

@@ -108,4 +108,24 @@ public interface OmstruckOrderSeparateMapper {
 
     Integer getOrderPlanEnable(Object orderId);
 
+    //通过总实绩ID查询进厂实绩数据
+    List<Map<String, Object>> getAllEnFactoryResultMesByTotalId(Integer resultTotalId);
+
+    //通过总实绩ID查询出厂实绩数据
+    List<Map<String, Object>> getAllOutFactoryResultMesByTotalId(Integer resultTotalId);
+
+      //通过总实绩ID查询装车实绩数据
+    List<Map<String, Object>> getAllLoadResultMesByTotalId(Integer resultTotalId);
+
+      //通过总实绩ID查询卸车实绩数据
+    List<Map<String, Object>> getAllUnloadResultMesByTotalId(Integer resultTotalId);
+
+     //通过总实绩ID查询计毛实绩数据
+    List<Map<String, Object>> getAllMaoWeightResultMesByTotalId(Integer resultTotalId);
+
+     //通过总实绩ID查询计毛实绩数据
+    List<Map<String, Object>> getAllPiWeightResultMesByTotalId(Integer resultTotalId);
+
+    int closeInwardOrder(Integer orderId);
+
 }

src/main/java/com/steerinfo/dil/model/OmstruckOrderMaterial.java

@@ -3,32 +3,31 @@ package com.steerinfo.dil.model;
 import com.steerinfo.framework.model.IBasePO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
 import java.math.BigDecimal;
 import java.util.Date;
 
 @ApiModel(value="运输订单物资中间表")
 public class OmstruckOrderMaterial implements IBasePO<BigDecimal> {
     /**
-     * 主键ID(ORDER_MATERIAL_ID,DECIMAL,38)
+     * 主键ID(ORDER_MATERIAL_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="主键ID",required=true)
     private BigDecimal orderMaterialId;
 
     /**
-     * 订单id(ORDER_ID,DECIMAL,38)
+     * 订单id(ORDER_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="订单id",required=false)
     private BigDecimal orderId;
 
     /**
-     * 钢材物资ID(MATERIAL_ID,DECIMAL,38)
+     * 钢材物资ID(MATERIAL_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="钢材物资ID",required=false)
     private BigDecimal materialId;
 
     /**
-     * 物资件数(ORDER_MATERIAL_NUMBER,DECIMAL,38)
+     * 物资件数(ORDER_MATERIAL_NUMBER,DECIMAL,0)
      */
     @ApiModelProperty(value="物资件数",required=false)
     private BigDecimal orderMaterialNumber;
@@ -75,6 +74,18 @@ public class OmstruckOrderMaterial implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="物资指向：0：物资主表（原料用）；1：物资子表（钢材用）",required=false)
     private BigDecimal materialDirection;
 
+    /**
+     * 物资装卸货优先级(MATERIAL_PRIORITY,DECIMAL,38)
+     */
+    @ApiModelProperty(value="物资装卸货优先级",required=false)
+    private BigDecimal materialPriority;
+
+    /**
+     * 物资委托发送状态:1:已发送(MATERIAL_MEASSION,DECIMAL,0)
+     */
+    @ApiModelProperty(value="物资委托发送状态:1:已发送",required=false)
+    private BigDecimal materialMeassion;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -175,6 +186,22 @@ public class OmstruckOrderMaterial implements IBasePO<BigDecimal> {
         this.materialDirection = materialDirection;
     }
 
+    public BigDecimal getMaterialPriority() {
+        return materialPriority;
+    }
+
+    public void setMaterialPriority(BigDecimal materialPriority) {
+        this.materialPriority = materialPriority;
+    }
+
+    public BigDecimal getMaterialMeassion() {
+        return materialMeassion;
+    }
+
+    public void setMaterialMeassion(BigDecimal materialMeassion) {
+        this.materialMeassion = materialMeassion;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -192,6 +219,8 @@ public class OmstruckOrderMaterial implements IBasePO<BigDecimal> {
         sb.append(", updateTime=").append(updateTime);
         sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
         sb.append(", materialDirection=").append(materialDirection);
+        sb.append(", materialPriority=").append(materialPriority);
+        sb.append(", materialMeassion=").append(materialMeassion);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -38,4 +38,7 @@ public interface IOmstruckOrderSeparateService {
 
     // 批量关闭运输订单
     int batchCloseOrder(List<Map<String, Object>> mapList);
+    List<Map<String,Object>> getOrderMaterial(Integer orderId);
+
+    int closeInwardOrder(Integer orderId);
 }

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

@@ -271,6 +271,36 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
         return segmentList;
     }
 
+    /**
+     * 查询运输进程，通过实绩ID
+     * @Author TXF
+     * @Date 2022/2/18 16:46
+     * @param orderId
+     * @return
+     **/
+    public List<Map<String, Object>> getAllOrderResult(BigDecimal orderId){
+        //通过订单Id查询总实绩Id
+        Integer resultTotalId = omstruckOrderSeparateMapper.getTotalIdByOrderId(orderId);
+        //通过总实绩ID查询所有的实绩：包括进厂、出厂、计重、装卸货
+        List<Map<String, Object>> allMesList = new ArrayList<>(20);
+        allMesList.addAll(omstruckOrderSeparateMapper.getAllEnFactoryResultMesByTotalId(resultTotalId));
+        allMesList.addAll(omstruckOrderSeparateMapper.getAllOutFactoryResultMesByTotalId(resultTotalId));
+        allMesList.addAll(omstruckOrderSeparateMapper.getAllLoadResultMesByTotalId(resultTotalId));
+        allMesList.addAll(omstruckOrderSeparateMapper.getAllUnloadResultMesByTotalId(resultTotalId));
+        allMesList.addAll(omstruckOrderSeparateMapper.getAllMaoWeightResultMesByTotalId(resultTotalId));
+        allMesList.addAll(omstruckOrderSeparateMapper.getAllPiWeightResultMesByTotalId(resultTotalId));
+        //对列表中数据路段顺序号进行排序
+        allMesList.sort(new Comparator<Map<String, Object>>() {
+            @Override
+            public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+                BigDecimal segmenSqe1 = DataChange.dataToBigDecimal(o1.get("segmenSqe"));
+                BigDecimal segmenSqe2 = DataChange.dataToBigDecimal(o2.get("segmenSqe"));
+                return segmenSqe1.compareTo(segmenSqe2);
+            }
+        });
+        return allMesList;
+    }
+
     /**
      * 通过运输订单号查询实绩位置
      * @param orderNumber
@@ -575,4 +605,25 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
         List<Map<String, Object>> allLoaderLoadingOrder = omstruckOrderSeparateMapper.getAllLoaderLoadingOrder(map);
         return allLoaderLoadingOrder;
     }
+
+    @Override
+    public List<Map<String,Object>> getOrderMaterial(Integer orderId) {
+        List<Map<String,Object>>maplist =  omstruckOrderMaterialMapper.getOrderMaterial(orderId);
+        for (Map<String,Object>map:maplist
+             ) {
+            if(map.get("materialModel") == null){
+                String materialName = (String)map.get("materialName");
+                String materialName1 = materialName.replace("()","");
+                map.replace("materialName",materialName,materialName1);
+            }
+        }
+        return maplist;
+    }
+
+    @Override
+    public int closeInwardOrder(Integer orderId) {
+      int i = omstruckOrderSeparateMapper.closeInwardOrder(orderId);
+      return i;
+
+    }
 }

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

@@ -152,13 +152,20 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         Object materialId = map.get("materialId");
         BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderType"));
         //预计进厂时间
-        Date orderEntryTime = new Date((long) map.get("orderEntryTime"));
+        Date orderEntryTime = null;
+        if(map.get("orderEntryTime") != null){
+            try {
+                orderEntryTime = new Date((long) map.get("orderEntryTime"));
+            } catch (Exception e) {
+                System.out.println("预估进厂日期转换失败");
+            }
+        }
         int count = 0;
         for (Map<String, Object> capacityMap : driverCapacityIdList) {
             //添加运输订单
             OmstruckOrder omstruckOrder = generateOmsTruckOrder(map);
             omstruckOrder.setOrderPlanId(purchaseOrderId);
-            omstruckOrder.setCapacityId(DataChange.dataToBigDecimal(capacityMap.get("capacityId"))); //添加运力排班ID
+            omstruckOrder.setCapacityId(DataChange.dataToBigDecimal(capacityMap.get("capacityId"))); //添加运力ID
             omstruckOrder.setOrderEntryTime(orderEntryTime);
             count += omstruckOrderMapper.insertSelective(omstruckOrder);
             BigDecimal orderId = omstruckOrder.getOrderId();
@@ -539,6 +546,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         switch (orderType) {
             case 13:
             case 12:
+            case 20:
                 if (transStatus.intValue()==1){
                     amsFeign.addSporadicOrderTimes(addMapSporadicOrder);
                 }
@@ -560,11 +568,19 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         Integer orderId =(Integer) map.get("orderId");
         OmstruckOrder omstruckOrder=new OmstruckOrder();
         omstruckOrder.setOrderId(DataChange.dataToBigDecimal(orderId));
+        Integer orderTypee = omstruckOrderMapper.getOrderTypeByOrderNumber(new BigDecimal(orderId));
+        if(orderTypee == 11 ){
+            omstruckOrder.setOrderStatus(new BigDecimal(4));
+            result += omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
+            return result ;
+        }
         //根据运输订单号获取planId
         Map<String, Object> messageMap = omstruckOrderSeparateMapper.getOmstruckOrderResult(new BigDecimal(orderId));
         BigDecimal orderPlanId =(BigDecimal) messageMap.get("orderPlanId");
         //将订单状态设为未接收
         omstruckOrder.setOrderStatus(new BigDecimal(4));
+        //讲路段顺序号设为空，适应进厂以后扫码
+        omstruckOrder.setOrderLineSequence(null);
         result += omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
         List<Map<String, Object>> allResultIdList = omstruckOrderMapper.getAllResultId(DataChange.dataToBigDecimal(orderId));
         for (Map<String,Object> allResultId:allResultIdList
@@ -587,8 +603,9 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         //删除所有实绩
         Integer orderType = omstruckOrderMapper.getOrderTypeByOrderNumber(new BigDecimal(orderId));
         switch (orderType){
-            case 12:
-            case 13:
+//            case 12:
+//            case 13:
+//            case 20:
             case 15:
             case 16:
                     Map<String, Object> sporadicOrderTimes = omstruckOrderMapper.getSporadicOrderTimes(new BigDecimal(orderId));
@@ -801,10 +818,12 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             if(orderStatus == 5 || orderStatus == 6) {
                 throw new RuntimeException("订单已被接收或已被拒绝!");
             }
+            BigDecimal orderType = (BigDecimal) orderMessage.get("orderType");
             //添加各个实绩
-            omstruckOrderSeparateService.addAllSonResult(orderMessage);
+            if(orderType.intValue() != 11){
+                omstruckOrderSeparateService.addAllSonResult(orderMessage);
+            }
             //判断订单是否是一车多单
-            BigDecimal orderType = (BigDecimal) orderMessage.get("orderType");
             if (orderType.intValue()==15 || orderType.intValue()==16 ) {
                 //通过订单查询趟次
                 Map<String, Object> sporadicOrderTimes = omstruckOrderMapper.getSporadicOrderTimes(orderId);
@@ -1441,12 +1460,10 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         AmstruckInwardPlan amstruckInwardPlan = amstruckInwardPlanMapper.selectByPrimaryKey(new BigDecimal(planId));
         amstruckInwardPlan.setPlanStatus(new BigDecimal(3));
         result += amstruckInwardPlanMapper.updateByPrimaryKeySelective(amstruckInwardPlan);
-        BigDecimal materialId = omstruckOrderMapper.getInwardMaterial(new BigDecimal(planId));
         for (Map<String,Object> orderMap : mapList) {
             OmstruckOrder omstruckOrder = new OmstruckOrder();
             String capacityNumber = (String)orderMap.get("capacityNumber");
-            BigDecimal materialNumber = DataChange.dataToBigDecimal(orderMap.get("materialNumber")) ;
-            BigDecimal materialWeight = DataChange.dataToBigDecimal(orderMap.get("materialWeight"));
+            List<Map<String,Object>>orderMaterialList = (List<Map<String,Object>>)orderMap.get("orderMaterialList");
             Map<String,Object> capacityMap = new HashMap<>();
             capacityMap.put("capacityNumber",capacityNumber);
             List<RmsCapacity> rmsCapacities = rmsCapacityMapper.selectByParameters(capacityMap);
@@ -1466,7 +1483,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             String orderNumber = DataChange.generateEightDigitsNumber("WYSDD", orderId.intValue());
             omstruckOrder.setOrderNumber(orderNumber);
             omstruckOrder.setOrderIssueTime(new Date());
-            omstruckOrder.setOrderStatus(new BigDecimal(3));
+            omstruckOrder.setOrderStatus(new BigDecimal(4));
             omstruckOrder.setCapacityId(capacityId);
             omstruckOrder.setInsertTime(new Date());
             omstruckOrder.setUpdateTime(new Date());
@@ -1475,21 +1492,31 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             omstruckOrder.setInsertUpdateRemark("无");
             omstruckOrder.setDeleted(new BigDecimal(0));
             omstruckOrder.setOrderType(new BigDecimal(orderType));
-            omstruckOrder.setLineId(new BigDecimal(lineId));
+            if(lineId != null){
+                omstruckOrder.setLineId(new BigDecimal(lineId));
+            }
+            omstruckOrder.setCarrierId(new BigDecimal(carrierId));
             result +=omstruckOrderMapper.insertSelective(omstruckOrder);
-            OmstruckOrderMaterial omstruckOrderMaterial = new OmstruckOrderMaterial();
-            BigDecimal orderMaterialId = omstruckOrderMaterialMapper.selectMaxId();
-            omstruckOrderMaterial.setOrderMaterialId(orderMaterialId);
-            omstruckOrderMaterial.setOrderId(orderId);
-            omstruckOrderMaterial.setMaterialId(materialId);
-            omstruckOrderMaterial.setOrderMaterialNumber(materialNumber);
-            omstruckOrderMaterial.setInsertTime(new Date());
-            omstruckOrderMaterial.setUpdateTime(new Date());
-            omstruckOrderMaterial.setInsertUsername("admin");
-            omstruckOrderMaterial.setUpdateUsername("admin");
-            omstruckOrderMaterial.setInsertUpdateRemark("无");
-            omstruckOrderMaterial.setOrderMaterialWeight(materialWeight);
-            result +=omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
+
+            for (Map<String,Object>orderMaterial:orderMaterialList
+            ) {
+                OmstruckOrderMaterial omstruckOrderMaterial = new OmstruckOrderMaterial();
+                BigDecimal orderMaterialId = omstruckOrderMaterialMapper.selectMaxId();
+                BigDecimal materialId = DataChange.dataToBigDecimal(orderMaterial.get("materialId"));
+                BigDecimal materialWeight = DataChange.dataToBigDecimal(orderMaterial.get("materialWeight"));
+                BigDecimal materialCount = DataChange.dataToBigDecimal(orderMaterial.get("materialCount"));
+                omstruckOrderMaterial.setOrderMaterialId(orderMaterialId);
+                omstruckOrderMaterial.setOrderId(orderId);
+                omstruckOrderMaterial.setMaterialId(materialId);
+                omstruckOrderMaterial.setOrderMaterialNumber(materialCount);
+                omstruckOrderMaterial.setInsertTime(new Date());
+                omstruckOrderMaterial.setUpdateTime(new Date());
+                omstruckOrderMaterial.setInsertUsername("admin");
+                omstruckOrderMaterial.setUpdateUsername("admin");
+                omstruckOrderMaterial.setInsertUpdateRemark("无");
+                omstruckOrderMaterial.setOrderMaterialWeight(materialWeight);
+                result +=omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
+            }
         }
         return result;
     }
@@ -1912,11 +1939,21 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 break;
             case 9:
             case 10:
+            case 20:
                 mesMap = omstruckOrderMapper.getNZOrderMessageToApp(map);
                 mesMap.put("loadName","化工园区铁专线");
+                BigDecimal organizationId =(BigDecimal) mesMap.get("organizationId");
+                if (organizationId.intValue()==1){
+//                    mesMap.remove(organizationId);
+                    mesMap.put("organizationCode","一厂");
+                }else if (organizationId.intValue()==2){
+                    mesMap.put("organizationCode","二厂");
+                }
                 break;
             case 11:
-                mesMap = omstruckOrderMapper.getNZOrderMessageToApp(map);
+                mesMap = omstruckOrderMapper.getInwardOrderMessageToApp(map);
+                mesMap.put("shipperName","四川省达州钢铁集团有限责任公司");
+                mesMap.put("consigneeCompanyName","四川省达州钢铁集团有限责任公司");
                 break;
             case 12:
             case 13:
@@ -1948,7 +1985,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                     continue;
                 }
             }
-            if(DataChange.dataToBigDecimal(orderMesMap.get("orderType")).intValue() == 10){
+            if(DataChange.dataToBigDecimal(orderMesMap.get("orderType")).intValue() == 10||DataChange.dataToBigDecimal(orderMesMap.get("orderType")).intValue() == 20){
                 Integer planEnable = omstruckOrderSeparateMapper.getOrderPlanEnable(orderMesMap.get("orderId"));
                 if(planEnable == 0){ // 数据为0则失效
                     continue;

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

@@ -1604,14 +1604,18 @@
         select *
         from (
         select apo.PURCHASE_ORDER_NO "purchaseOrderNo",
-                apo.PURCHASE_ORDER_ID "purchaseOrderId",
-                db.RESULT_FOREIGN_SHIP_NAME "remark",
-                apo.RECEIVE_UNIT_ID     "receiveUnitId"
+        apo.PURCHASE_ORDER_ID "purchaseOrderId",
+        db.RESULT_FOREIGN_SHIP_NAME "remark",
+        apo.RECEIVE_UNIT_ID     "receiveUnitId",
+        apo.purchasing_organization_id "purchaseOrgId"
         from AMS_PURCHASE_ORDER APO
         join DIL_BATCH DB on apo.BATCH_ID = db.BATCH_ID
         where db.MATERIAL_ID = #{materialId}
         and apo.SUPPLIER_UNIT_ID = #{supplierId}
         and apo.deleted = 0
+        <if test="purchaseOrgId != null">
+            and apo.purchasing_organization_id = #{purchaseOrgId}
+        </if>
         <if test="remark != null">
             and instr(db.RESULT_FOREIGN_SHIP_NAME, #{remark}) > 0
         </if>
@@ -2418,10 +2422,7 @@
     <!-- 查询分解运输计划 -->
     <select id="getInwardOrderList" resultType="java.util.Map" parameterType="java.util.Map">
         SELECT *
-        FROM (SELECT APO.PURCHASE_ORDER_NO              AS "purchaseOrderNo",
-        RM.MATERIAL_NAME                   AS "materialName",
-        DB.RESULT_FOREIGN_SHIP_NAME        AS "resultForeignShipName",
-        AIP.PLAN_NUMBER                    AS "planNumber",
+        FROM (SELECT AIP.PLAN_NUMBER                    AS "planNumber",
         RCA.CARRIER_NAME                   AS "carrierName",
         AIP.CARRIER_ID                     AS "carrierId",
         RC.CAPACITY_NUMBER                 AS "capacityNumber",
@@ -2430,16 +2431,12 @@
         AIP.PLAN_ISSUE_TIME                AS "planIssueTime",
         AIP.PLAN_ISSUE_NAME                AS "planIssueName",
         AIR.REQUIREMENT_TYPE               AS "requirementType",
-        RCT.CAPACITY_TYPE_NAME             AS "capacityTypeName",
-        ARM.MATERIAL_COUNT                 AS "materialNumber",
-        ARM.MATERIAL_WEIGHT                AS "materialWeight",
         AIR.REQUIREMENT_TRUCK_TIME         AS "requirementTruckTime",
-        RW.WAREHOUSE_NAME                  AS "wareHouseName",
+        AIR.REQUIREMENT_ID                 AS "requirementId",
         AIR.REQUIREMENT_WORK_TYPE          AS "requirementWorkType",
         AIR.REQUIREMENT_WORK_CONTENT       AS "requirementWorkContent",
         AIR.REQUIREMENT_WORK_ENVIRONMENT   AS "requirementWorkEnvironment",
         AIR.REQUIREMENT_ESTIMATED_DURATION AS "requirementEstimatedDuration",
-        RW1.WAREHOUSE_NAME                 "unloadWarehouseName",
         OO.ORDER_ID                        AS "orderId",
         AIP.INSERT_TIME                    AS "insertTime"
         FROM OMSTRUCK_ORDER OO
@@ -2455,22 +2452,10 @@
         ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
         LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
         ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
-        LEFT JOIN AMS_PURCHASE_ORDER APO
-        ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
-        LEFT JOIN DIL_BATCH DB
-        ON APO.BATCH_ID = DB.BATCH_ID
-        LEFT JOIN RMS_MATERIAL RM
-        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
-        LEFT JOIN RMS_WAREHOUSE RW
-        ON RW.WAREHOUSE_ID = AIR.REQUIREMNT_UNIT_ID
-        LEFT JOIN RMS_WAREHOUSE RW1
-        ON RW1.WAREHOUSE_ID = AIR.REQUIREMENT_UNLOAD_UNIT_ID
         LEFT JOIN RMS_CARRIER RCA
         ON RCA.CARRIER_ID = AIP.CARRIER_ID
-        LEFT JOIN RMS_CAPACITY_TYPE RCT
-        ON RCT.CAPACITY_TYPE_ID = AIR.CAPACITY_TYPE_ID
         WHERE AIP.DELETED = 0
-        AND OO.ORDER_TYPE IN (4, 9, 10, 11)
+        AND OO.ORDER_TYPE = 11
         <if test="carrierId != null">
             AND AIP.CARRIER_ID = (select rc.carrier_id from rms_carrier rc
             where rc.carrier_sso_id =  #{carrierId})
@@ -2480,30 +2465,12 @@
         </if>
         )
         <where>
-            <if test="purchaseOrderNo != null">
-                and
-                <foreach collection="purchaseOrderNo" item="item" open="(" separator="or" close=")">
-                    "purchaseOrderNo" 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="materialNumber != null">
                 and
                 <foreach collection="materialNumber" item="item" open="(" separator="or" close=")">
                     "materialNumber" like '%${item}%'
                 </foreach>
             </if>
-            <if test="resultForeignShipName != null">
-                and
-                <foreach collection="resultForeignShipName" item="item" open="(" separator="or" close=")">
-                    "resultForeignShipName" like '%${item}%'
-                </foreach>
-            </if>
             <if test="requirementNumber != null">
                 and
                 <foreach collection="requirementNumber" item="item" open="(" separator="or" close=")">
@@ -2528,12 +2495,6 @@
                     "planIssueName" like '%${item}%'
                 </foreach>
             </if>
-            <if test="capacityTypeName != null">
-                and
-                <foreach collection="capacityTypeName" item="item" open="(" separator="or" close=")">
-                    "capacityTypeName" like '%${item}%'
-                </foreach>
-            </if>
             <if test="requirementTruckTime != null">
                 and
                 <foreach collection="requirementTruckTime" item="item" open="(" separator="or" close=")">
@@ -2546,30 +2507,6 @@
                     "requirementWorkType" like '%${item}%'
                 </foreach>
             </if>
-            <if test="requirementWorkContent != null">
-                and
-                <foreach collection="requirementWorkContent" item="item" open="(" separator="or" close=")">
-                    "requirementWorkContent" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="requirementWorkEnvironment != null">
-                and
-                <foreach collection="requirementWorkEnvironment" item="item" open="(" separator="or" close=")">
-                    "requirementWorkEnvironment" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="requirementEstimatedDuration != null">
-                and
-                <foreach collection="requirementEstimatedDuration" item="item" open="(" separator="or" close=")">
-                    "requirementEstimatedDuration" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="planNumber != null">
-                and
-                <foreach collection="planNumber" item="item" open="(" separator="or" close=")">
-                    "planNumber" like '%${item}%'
-                </foreach>
-            </if>
             <if test="carrierName != null">
                 and
                 <foreach collection="carrierName" item="item" open="(" separator="or" close=")">
@@ -2582,18 +2519,6 @@
                     "capacityNumber" like '%${item}%'
                 </foreach>
             </if>
-            <if test="orderMaterialNumber != null">
-                and
-                <foreach collection="orderMaterialNumber" item="item" open="(" separator="or" close=")">
-                    "orderMaterialNumber" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="wareHouseName != null">
-                and
-                <foreach collection="wareHouseName" item="item" open="(" separator="or" close=")">
-                    "wareHouseName" like '%${item}%'
-                </foreach>
-            </if>
         </where>
         <include refid="orderBy"></include>
     </select>
@@ -2819,7 +2744,12 @@
                RS.SUPPLIER_NAME   "shipperName",
                RCON.CONSIGNEE_COMPANY_NAME  "consigneeCompanyName",
                RW.WAREHOUSE_NAME  "unloadName",
-               OO.ORDER_TYPE      "orderType"
+               OO.ORDER_TYPE      "orderType",
+               (case when APO.PURCHASING_ORGANIZATION_ID = 1
+                     then '一厂'
+                     when APO.PURCHASING_ORGANIZATION_ID = 2
+                     then '二厂'
+               end) "organizationCode"
         FROM OMSTRUCK_ORDER OO
                  LEFT JOIN RMS_CAPACITY RC
                            ON RC.CAPACITY_ID = OO.CAPACITY_ID
@@ -2875,7 +2805,6 @@
 
     <!--  查询内转运输订单给APP 9 10 11-->
     <select id="getNZOrderMessageToApp" parameterType="java.util.Map" resultType="java.util.Map">
-
         SELECT OO.ORDER_ID "orderId",
         OO.ORDER_NUMBER "orderNumber",
         OO.ORDER_LINE_SEQUENCE "orderLineSequence",
@@ -2884,7 +2813,8 @@
         OO.ORDER_TYPE "orderType",
         OO.ORDER_STATUS "orderStatus",
         RS.SUPPLIER_NAME "shipperName",
-        RCG.CONSIGNEE_COMPANY_NAME "consigneeCompanyName"
+        RCG.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
+        APO.PURCHASING_ORGANIZATION_ID "organizationId"
         FROM OMSTRUCK_ORDER OO
         LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
         ON OO.ORDER_PLAN_ID = AIP.PLAN_ID
@@ -3159,7 +3089,7 @@
         LEFT JOIN RMS_CONSIGNEE RCE
         ON RCE.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
         WHERE AIP.DELETED = 0
-        AND OO.ORDER_TYPE IN (4, 9, 10, 11)
+        AND OO.ORDER_TYPE IN (4, 9, 10, 11 , 20)
         AND OO.ORDER_STATUS = #{orderStatus}
         <if test="carrierId !=null">
             AND AIP.CARRIER_ID = (SELECT RCR.CARRIER_ID FROM RMS_CARRIER RCR WHERE RCR.CARRIER_SSO_ID = #{carrierId})
@@ -3271,5 +3201,36 @@
             on ASOM.SALE_ORDER_MATERIAL_ID = ADSO.SALE_ORDER_MATERIAL_ID
         where ADSO.DISPATCH_ID  = #{dispatchId}
     </select>
+    <select id="getInwardOrderMessageToApp" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT OO.ORDER_ID            "orderId",
+               OO.ORDER_NUMBER        "orderNumber",
+               OO.ORDER_LINE_SEQUENCE "orderLineSequence",
+               RC.CAPACITY_NUMBER     "capacityNumber",
+               OO.ORDER_TYPE          "orderType",
+               OO.ORDER_STATUS        "orderStatus",
+               RS.SHIPPER_NAME        "shipperUnitName",
+               AIR.REQUIREMENT_ID     "requirementId"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
+                           ON OO.ORDER_PLAN_ID = AIP.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 RMS_SHIPPER RS
+                           ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        where oo.order_id = #{orderId}
+        <if test="status == null">
+            AND OO.ORDER_STATUS in (4, 5, 6)
+        </if>
+        <if test="status == 2">
+            AND OO.ORDER_STATUS = 2
+        </if>
+        <if test="status == 22">
+            AND OO.ORDER_STATUS in (2, 4, 5, 6)
+        </if>
+    </select>
 
 </mapper>

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

@@ -13,22 +13,24 @@
     <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
     <result column="MATERIAL_DIRECTION" jdbcType="DECIMAL" property="materialDirection" />
+    <result column="MATERIAL_PRIORITY" jdbcType="DECIMAL" property="materialPriority" />
+    <result column="MATERIAL_MEASSION" jdbcType="DECIMAL" property="materialMeassion" />
   </resultMap>
   <sql id="columns">
-    ORDER_MATERIAL_ID, ORDER_ID, MATERIAL_ID, ORDER_MATERIAL_NUMBER, ORDER_MATERIAL_WEIGHT, 
-    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, 
-    MATERIAL_DIRECTION
+    ORDER_MATERIAL_ID, ORDER_ID, MATERIAL_ID, ORDER_MATERIAL_NUMBER, ORDER_MATERIAL_WEIGHT,
+    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
+    MATERIAL_DIRECTION, MATERIAL_PRIORITY, MATERIAL_MEASSION
   </sql>
   <sql id="columns_alias">
-    t.ORDER_MATERIAL_ID, t.ORDER_ID, t.MATERIAL_ID, t.ORDER_MATERIAL_NUMBER, t.ORDER_MATERIAL_WEIGHT, 
-    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, 
-    t.MATERIAL_DIRECTION
+    t.ORDER_MATERIAL_ID, t.ORDER_ID, t.MATERIAL_ID, t.ORDER_MATERIAL_NUMBER, t.ORDER_MATERIAL_WEIGHT,
+    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK,
+    t.MATERIAL_DIRECTION, t.MATERIAL_PRIORITY, t.MATERIAL_MEASSION
   </sql>
   <sql id="select">
-    SELECT <include refid="columns"/> FROM OMSTRUCK_ORDER_MATERIAL
+    SELECT <include refid="columns" /> FROM OMSTRUCK_ORDER_MATERIAL
   </sql>
   <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM OMSTRUCK_ORDER_MATERIAL t
+    SELECT <include refid="columns_alias" /> FROM OMSTRUCK_ORDER_MATERIAL t
   </sql>
   <sql id="where">
     <where>
@@ -65,6 +67,12 @@
       <if test="materialDirection != null">
         and MATERIAL_DIRECTION = #{materialDirection}
       </if>
+      <if test="materialPriority != null">
+        and MATERIAL_PRIORITY = #{materialPriority}
+      </if>
+      <if test="materialMeassion != null">
+        and MATERIAL_MEASSION = #{materialMeassion}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -102,9 +110,15 @@
       <if test="materialDirection != null">
         and MATERIAL_DIRECTION = #{materialDirection}
       </if>
+      <if test="materialPriority != null">
+        and MATERIAL_PRIORITY = #{materialPriority}
+      </if>
+      <if test="materialMeassion != null">
+        and MATERIAL_MEASSION = #{materialMeassion}
+      </if>
     </where>
   </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
     delete from OMSTRUCK_ORDER_MATERIAL
     where ORDER_MATERIAL_ID = #{orderMaterialId,jdbcType=DECIMAL}
   </delete>
@@ -141,18 +155,24 @@
     <if test="materialDirection != null">
       or MATERIAL_DIRECTION = #{materialDirection}
     </if>
+    <if test="materialPriority != null">
+      or MATERIAL_PRIORITY = #{materialPriority}
+    </if>
+    <if test="materialMeassion != null">
+      or MATERIAL_MEASSION = #{materialMeassion}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.OmstruckOrderMaterial">
     insert into OMSTRUCK_ORDER_MATERIAL (ORDER_MATERIAL_ID, ORDER_ID, MATERIAL_ID,
                                          ORDER_MATERIAL_NUMBER, ORDER_MATERIAL_WEIGHT,
                                          INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
-                                         UPDATE_TIME, INSERT_UPDATE_REMARK, MATERIAL_DIRECTION
-    )
+                                         UPDATE_TIME, INSERT_UPDATE_REMARK, MATERIAL_DIRECTION,
+                                         MATERIAL_PRIORITY, MATERIAL_MEASSION)
     values (#{orderMaterialId,jdbcType=DECIMAL}, #{orderId,jdbcType=DECIMAL}, #{materialId,jdbcType=DECIMAL},
             #{orderMaterialNumber,jdbcType=DECIMAL}, #{orderMaterialWeight,jdbcType=DECIMAL},
             #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR},
-            #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{materialDirection,jdbcType=DECIMAL}
-           )
+            #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{materialDirection,jdbcType=DECIMAL},
+            #{materialPriority,jdbcType=DECIMAL}, #{materialMeassion,jdbcType=DECIMAL})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.OmstruckOrderMaterial">
     insert into OMSTRUCK_ORDER_MATERIAL
@@ -190,6 +210,12 @@
       <if test="materialDirection != null">
         MATERIAL_DIRECTION,
       </if>
+      <if test="materialPriority != null">
+        MATERIAL_PRIORITY,
+      </if>
+      <if test="materialMeassion != null">
+        MATERIAL_MEASSION,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="orderMaterialId != null">
@@ -225,6 +251,12 @@
       <if test="materialDirection != null">
         #{materialDirection,jdbcType=DECIMAL},
       </if>
+      <if test="materialPriority != null">
+        #{materialPriority,jdbcType=DECIMAL},
+      </if>
+      <if test="materialMeassion != null">
+        #{materialMeassion,jdbcType=DECIMAL},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.OmstruckOrderMaterial">
@@ -238,7 +270,9 @@
         UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
         UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
         INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
-        MATERIAL_DIRECTION = #{materialDirection,jdbcType=DECIMAL}
+        MATERIAL_DIRECTION = #{materialDirection,jdbcType=DECIMAL},
+        MATERIAL_PRIORITY = #{materialPriority,jdbcType=DECIMAL},
+        MATERIAL_MEASSION = #{materialMeassion,jdbcType=DECIMAL}
     where ORDER_MATERIAL_ID = #{orderMaterialId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.OmstruckOrderMaterial">
@@ -274,20 +308,26 @@
       <if test="materialDirection != null">
         MATERIAL_DIRECTION = #{materialDirection,jdbcType=DECIMAL},
       </if>
+      <if test="materialPriority != null">
+        MATERIAL_PRIORITY = #{materialPriority,jdbcType=DECIMAL},
+      </if>
+      <if test="materialMeassion != null">
+        MATERIAL_MEASSION = #{materialMeassion,jdbcType=DECIMAL},
+      </if>
     </set>
     where ORDER_MATERIAL_ID = #{orderMaterialId,jdbcType=DECIMAL}
   </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select"/>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+    <include refid="select" />
     where ORDER_MATERIAL_ID = #{orderMaterialId,jdbcType=DECIMAL}
   </select>
   <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="where"/>
+    <include refid="select" />
+    <include refid="where" />
   </select>
   <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-    <include refid="select"/>
-    <include refid="whereLike"/>
+    <include refid="select" />
+    <include refid="whereLike" />
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
     insert into OMSTRUCK_ORDER_MATERIAL
@@ -296,7 +336,8 @@
     ORDER_MATERIAL_WEIGHT, INSERT_USERNAME,
     INSERT_TIME, UPDATE_USERNAME,
     UPDATE_TIME, INSERT_UPDATE_REMARK,
-    MATERIAL_DIRECTION)
+    MATERIAL_DIRECTION, MATERIAL_PRIORITY,
+    MATERIAL_MEASSION)
     ( <foreach collection="list" item="item" separator="union all">
     select
     #{item.orderMaterialId,jdbcType=DECIMAL},
@@ -304,69 +345,81 @@
     #{item.orderMaterialWeight,jdbcType=DECIMAL}, #{item.insertUsername,jdbcType=VARCHAR},
     #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
     #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
-    #{item.materialDirection,jdbcType=DECIMAL} from dual
+    #{item.materialDirection,jdbcType=DECIMAL}, #{item.materialPriority,jdbcType=DECIMAL},
+    #{item.materialMeassion,jdbcType=DECIMAL} from dual
   </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
     update OMSTRUCK_ORDER_MATERIAL
     set
     ORDER_MATERIAL_ID=
-    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_MATERIAL_ID" separator=" ">
       when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.orderMaterialId,jdbcType=DECIMAL}
     </foreach>
     ,ORDER_ID=
-    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_MATERIAL_ID" separator=" ">
       when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.orderId,jdbcType=DECIMAL}
     </foreach>
     ,MATERIAL_ID=
-    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_MATERIAL_ID" separator=" ">
       when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.materialId,jdbcType=DECIMAL}
     </foreach>
     ,ORDER_MATERIAL_NUMBER=
-    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_MATERIAL_ID" separator=" ">
       when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.orderMaterialNumber,jdbcType=DECIMAL}
     </foreach>
     ,ORDER_MATERIAL_WEIGHT=
-    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_MATERIAL_ID" separator=" ">
       when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.orderMaterialWeight,jdbcType=DECIMAL}
     </foreach>
     ,INSERT_USERNAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_MATERIAL_ID" separator=" ">
       when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
     </foreach>
     ,INSERT_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_MATERIAL_ID" separator=" ">
       when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
     </foreach>
     ,UPDATE_USERNAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_MATERIAL_ID" separator=" ">
       when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
     </foreach>
     ,UPDATE_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_MATERIAL_ID" separator=" ">
       when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
     </foreach>
     ,INSERT_UPDATE_REMARK=
-    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_MATERIAL_ID" separator=" ">
       when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
     </foreach>
     ,MATERIAL_DIRECTION=
-    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_MATERIAL_ID" separator=" ">
       when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.materialDirection,jdbcType=DECIMAL}
     </foreach>
+    ,MATERIAL_PRIORITY=
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_MATERIAL_ID" separator=" ">
+      when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.materialPriority,jdbcType=DECIMAL}
+    </foreach>
+    ,MATERIAL_MEASSION=
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_MATERIAL_ID" separator=" ">
+      when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.materialMeassion,jdbcType=DECIMAL}
+    </foreach>
     where ORDER_MATERIAL_ID in
-    <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
       #{item.orderMaterialId,jdbcType=DECIMAL}
     </foreach>
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from OMSTRUCK_ORDER_MATERIAL
     where ORDER_MATERIAL_ID in
-    <foreach collection="list" item="id" open="(" close=")" separator=",">
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
       #{id}
     </foreach>
   </delete>
-
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
   <sql id="orderBy">
@@ -377,8 +430,6 @@
       </if>
     </if>
   </sql>
-
-
 <!--  通过orderId获取子表主键 -->
   <select id="getOrderMaterialIdByOrderId" parameterType="java.math.BigDecimal" resultType="java.math.BigDecimal">
     select OOM.ORDER_MATERIAL_ID from OMSTRUCK_ORDER_MATERIAL OOM where OOM.ORDER_ID = #{orderId}
@@ -406,8 +457,19 @@
     <include refid="select"/>
     where ORDER_ID = #{orderId,jdbcType=DECIMAL}
   </select>
+  <select id="getOrderMaterial" resultType="java.util.Map" parameterType="java.lang.Integer">
+    select
+    OOM.MATERIAL_MEASSION "materialMeassion",
+    RM.MATERIAL_MODEL "materialModel",
+    RM.MATERIAL_NAME ||RM.MATERIAL_SPECIFICATION ||'('|| RM.MATERIAL_MODEL ||')'"materialName",
+    OOM.MATERIAL_ID  "materialId"
+    from OMSTRUCK_ORDER_MATERIAL OOM
+    LEFT JOIN RMS_MATERIAL RM
+    ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+    WHERE OOM.ORDER_ID = #{orderId}
+  </select>
 
-<!-- 批量删除物资子表 -->
+  <!-- 批量删除物资子表 -->
   <delete id="batchByOrderIdDelete" parameterType="java.util.List">
     delete from OMSTRUCK_ORDER_MATERIAL OOM
     where OOM.ORDER_ID in

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

@@ -424,7 +424,7 @@
            </if>
 
             <if test="type == 1">
-                and OO.ORDER_TYPE in (12, 13)
+                and OO.ORDER_TYPE in (12, 13 , 20)
             </if>
             <if test="type == 2">
                 and OO.ORDER_TYPE = 14
@@ -583,9 +583,12 @@
         set APO.IS_MORE_TRIPS = 1
         where APO.PURCHASE_ORDER_ID = #{purchaseOrderId}
     </update>
-
-
-<!--  通过装卸工SSOID查询装过的订单信息  -->
+    <update id="closeInwardOrder" parameterType="java.lang.Integer">
+        update OMSTRUCK_ORDER OO
+        set oo.ORDER_STATUS = 2
+        where oo.ORDER_ID = #{orderId}
+    </update>
+    <!--  通过装卸工SSOID查询装过的订单信息  -->
     <select id="getAllLoaderLoadingOrder" parameterType="map" resultType="java.util.Map">
         select OO.ORDER_ID  "orderId",
                OO.ORDER_NUMBER "orderNumber",
@@ -632,4 +635,104 @@
 	    ON AIP.PLAN_ID = OO.ORDER_PLAN_ID
         WHERE	OO.ORDER_ID = #{orderId}
     </select>
+
+    <select id="getAllEnFactoryResultMesByTotalId" parameterType="int" resultType="java.util.Map">
+        select *
+        from (
+            select TER.SEGMEN_SQE             "segmenSqe",
+            TER.RESULT_ENTRY_GATE_TIME "pointDate",
+            RG.GATEPOST_NAME           "pointName",
+            '进厂'                     "linkName"
+            from TMSTRUCK_ENFACTORY_RESULT TER
+            left join RMS_GATEPOST RG
+            on RG.GATEPOST_ID = TER.GATEPOST_ID
+            where TER.RESULT_TOTAL_ID = #{resultTotalId}
+            )
+        where "pointDate" is not null
+    </select>
+
+    <select id="getAllOutFactoryResultMesByTotalId" parameterType="int" resultType="java.util.Map">
+        select *
+        from (
+                 select TLFR.SEGMENT_SQE             "segmenSqe",
+                        TLFR.RESULT_OUT_GATE_TIME "pointDate",
+                        RG.GATEPOST_NAME           "pointName",
+                        '出厂'                     "linkName"
+                 from TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+                          left join RMS_GATEPOST RG
+                                    on RG.GATEPOST_ID = TLFR.GATEPOST_ID
+                 where TLFR.RESULT_TOTAL_ID = #{resultTotalId}
+             )
+        where "pointDate" is not null
+    </select>
+
+    <select id="getAllLoadResultMesByTotalId" parameterType="int" resultType="java.util.Map">
+        select *
+        from (
+                 select TLR.SEGMENT_SQE "segmenSqe",
+                        TLR.RESULT_LOAD_END_TIME "pointDate",
+                        RW.WAREHOUSE_NAME   "pointName",
+                        RM.MATERIAL_NAME    "materialName",
+                        '装货'                "linkName"
+                 from TMSTRUCK_LOAD_RESULT TLR
+                    left join RMS_WAREHOUSE RW on TLR.LOADING_ID = RW.WAREHOUSE_ID
+                    left join RMS_MATERIAL RM on TLR.MATERIAL_ID = RM.MATERIAL_ID
+                 where TLR.RESULT_TOTAL_ID = #{resultTotalId}
+             )
+        where "pointDate" is not null
+    </select>
+
+    <select id="getAllUnloadResultMesByTotalId" parameterType="int" resultType="java.util.Map">
+        select *
+        from (
+                 select TUR.SEGMENT_SQE "segmenSqe",
+                        TUR.RESULT_END_TIME "pointDate",
+                        RW.WAREHOUSE_NAME   "pointName",
+                        RM.MATERIAL_NAME    "materialName",
+                        '卸货'            "linkName"
+                 from TMSTRUCK_UNLOAD_RESULT TUR
+                          left join RMS_WAREHOUSE RW on TUR.RESULT_UNLOAD_PLACE_ID = RW.WAREHOUSE_ID
+                          left join RMS_MATERIAL RM on TUR.MATERIAL_ID = RM.MATERIAL_ID
+                 where TUR.RESULT_TOTAL_ID = #{resultTotalId}
+             )
+        where "pointDate" is not null
+    </select>
+
+    <select id="getAllMaoWeightResultMesByTotalId" parameterType="int" resultType="java.util.Map">
+        select *
+        from (
+                 select TWR.GROSS_SEGMENT_SQE "segmenSqe",
+                        TWR.RESULT_GROSS_WEIGHT_TIME "pointDate",
+                        RTC.TRUCK_CALCULATE_NUMBER   "pointName",
+                        TWR.RESULT_GROSS_WEIGHT     "weight",
+                        TWR.RESULT_NET_WEIGHT        "netWeight",
+                        RM.MATERIAL_NAME            "materialName",
+                        '计量'                      "linkName"
+                 from TMSTRUCK_WEIGHT_RESULT TWR
+                          left join RMS_TRUCK_CALCULATE RTC on TWR.RESULT_GROSS_PLACE_ID = RTC.TRUCK_CALCULATE_ID
+                          left join RMS_MATERIAL RM on TWR.MATERIAL_ID = RM.MATERIAL_ID
+                 where TWR.RESULT_TOTAL_ID = #{resultTotalId}
+             )
+        where "pointDate" is not null
+    </select>
+
+    <select id="getAllPiWeightResultMesByTotalId" parameterType="int" resultType="java.util.Map">
+        select *
+        from (
+                 select TWR.TARE_SEGMENT_SQE "segmenSqe",
+                        TWR.RESULT_TARE_WEIGHT_TIME "pointDate",
+                        RTC.TRUCK_CALCULATE_NUMBER   "pointName",
+                        TWR.RESULT_TARE_WEIGHT     "weight",
+                        TWR.RESULT_NET_WEIGHT        "netWeight",
+                        RM.MATERIAL_NAME            "materialName",
+                        '计量'                      "linkName"
+                 from TMSTRUCK_WEIGHT_RESULT TWR
+                          left join RMS_TRUCK_CALCULATE RTC on TWR.RESULT_TARE_PLACE_ID = RTC.TRUCK_CALCULATE_ID
+                          left join RMS_MATERIAL RM on TWR.MATERIAL_ID = RM.MATERIAL_ID
+                 where TWR.RESULT_TOTAL_ID = #{resultTotalId}
+             )
+        where "pointDate" is not null
+    </select>
+
+
 </mapper>