Merge remote-tracking branch 'origin/master'

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

@@ -306,7 +306,7 @@ public class OmstruckOrderController extends BaseRESTfulController {
         if (fuelOrder != null) {
             mapValue.put("fuelOrder", fuelOrder);
         }
-        if (con != null||"null".equals(con)) {
+        if (con != null && "null".equals(con) && !"".equals(con)) {
             mapValue.put("con", con);
         }
         if(carrierSSOId != null){
@@ -436,6 +436,7 @@ public class OmstruckOrderController extends BaseRESTfulController {
         try {
              i = omstruckOrderService.undoOrder(mapValue);
         } catch (Exception e) {
+            e.printStackTrace();
             return failed(e.getMessage());
         }
         return success(i);

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

@@ -388,4 +388,9 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     int deleteQueueResult(BigDecimal resultTotalId);
 
     int deleteQueueSpellList(BigDecimal capacityId);
+
+    Date getOrderPrintDate(BigDecimal orderId);
+
+    String getPrintFlag();
+
 }

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

@@ -116,6 +116,11 @@ public interface OmstruckOrderSeparateMapper {
     //根据订单ID查询信息
     Map<String, Object> getOrderMesByOrderId(BigDecimal orderId);
 
+    //查询是否已经过磅
+    int countWeight(BigDecimal orderId);
+    //查询老区进厂数量
+    int countEnFactory(BigDecimal orderId);
+
     int updateSporadicStatus(BigDecimal orderPlanId,int sporadicStatus);
 
     //查询计时进程
@@ -139,4 +144,6 @@ public interface OmstruckOrderSeparateMapper {
 
     Integer getSaleOrderDelete(Object orderId);
 
+    String getPrintFlag();
+
 }

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

@@ -100,11 +100,11 @@ public class OmstrainOrderServiceImpl implements IOmstrainOrderService {
             String wagonNo = map.get("wagonNo").toString();
             omstrainOrder.setOrderWagonNo(wagonNo);
         }
-        if(map.get("OutStation") != null && !"null".equals(map.get("OutStation"))){
+        if(map.get("OutStation") != null && !"null".equals(map.get("OutStation")) && !"".equals(map.get("OutStation"))){
             long OutStationTime = (long) map.get("OutStation");
             omstrainOrder.setOutstationTime(new Date(OutStationTime));
         }
-        if(map.get("EnStation") != null && !"null".equals(map.get("EnStation"))){
+        if(map.get("EnStation") != null && !"null".equals(map.get("EnStation")) && !"".equals(map.get("EnStation"))){
             long EnStationTime = (long) map.get("EnStation");
             omstrainOrder.setEnstationTime(new Date(EnStationTime));
         }

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

@@ -253,21 +253,23 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
         }else if(orderType == 21|| orderType == 26){
             return getTimeOrderResult(resultTotalId);
         }
-        //else if(orderType == 1){
-        //    //如果是钢材的订单则
-        //    Map<String,Object> steelDeliveryOrderMap = new HashMap<>();
-        //    steelDeliveryOrderMap.put("pointName","小东门自助一体机");
-        //    steelDeliveryOrderMap.put("linkName","送货单打印");
-        //    steelDeliveryOrderMap.put("pointDate",null);
-        //    List<Map<String,Object>> steelList  = getNormalOrderResult(resultTotalId);
-        //    Map<String,Object> steelLeaveFactoryMap = steelList.get(steelList.size()-1);
-        //    steelDeliveryOrderMap.put("segmenSqe",steelLeaveFactoryMap.get("segmenSqe"));
-        //    steelLeaveFactoryMap.put("segmenSqe",DataChange.dataToBigDecimal(steelLeaveFactoryMap.get("segmenSqe")).intValue() + 1);
-        //    steelList.remove(steelList.size()-1);
-        //    steelList.add(steelDeliveryOrderMap);
-        //    steelList.add(steelLeaveFactoryMap);
-        //    return steelList;
-        //}
+        else if(orderType == 1 && "true".equals(omstruckOrderSeparateMapper.getPrintFlag())){
+            //如果是钢材的订单则
+            //根据订单id,查询送货单打印时间
+            Date printDate = omstruckOrderMapper.getOrderPrintDate(orderId);
+            Map<String,Object> steelDeliveryOrderMap = new HashMap<>();
+            steelDeliveryOrderMap.put("pointName","送货单打印");
+            steelDeliveryOrderMap.put("linkName","打单");
+            steelDeliveryOrderMap.put("pointDate",printDate);
+            List<Map<String,Object>> steelList  = getNormalOrderResult(resultTotalId);
+            Map<String,Object> steelLeaveFactoryMap = steelList.get(steelList.size()-1);
+            steelDeliveryOrderMap.put("segmenSqe",steelLeaveFactoryMap.get("segmenSqe"));
+            steelLeaveFactoryMap.put("segmenSqe",DataChange.dataToBigDecimal(steelLeaveFactoryMap.get("segmenSqe")).intValue() + 1);
+            steelList.remove(steelList.size()-1);
+            steelList.add(steelDeliveryOrderMap);
+            steelList.add(steelLeaveFactoryMap);
+            return steelList;
+        }
         else{
             return getNormalOrderResult(resultTotalId);
         }
@@ -401,6 +403,7 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
      */
     @Override
     public int updateOmstruckOrder(OmstruckOrder omstruckOrder) {
+        omstruckOrder.setInsertUpdateRemark("不知名方法，omssEp方法406行");
         return omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
     }
 
@@ -508,6 +511,7 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
         OmstruckOrder omstruckOrder = new OmstruckOrder();
         omstruckOrder.setOrderId(new BigDecimal(orderId));
         omstruckOrder.setOrderStatus(new BigDecimal(8));
+        omstruckOrder.setInsertUpdateRemark("作废运单,将状态变为8,omsSep51行");
         int result = omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
         return result;
     }
@@ -588,6 +592,7 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
             OmstruckOrder omstruckOrder = new OmstruckOrder();
             omstruckOrder.setOrderId(orderId);
             omstruckOrder.setOrderStatus(new BigDecimal(7));
+            omstruckOrder.setInsertUpdateRemark("删除运单(7),omsSep595行");
             result += omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
         }
         return result;
@@ -713,6 +718,9 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
             Map<String,Object> priceMap = omstruckOrderSeparateMapper.getPriceInfo(orderId);
             Map<String,Object> priceValueMap = null;
             if(priceMap != null){
+                if(priceMap.get("rangeId") == null) {
+                    priceMap.put("rangeId",1);
+                }
                 priceValueMap = amsFeign.getInwardPriceBy(priceMap);
             }
             if(priceValueMap != null){

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

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.service.impl;
 
 import com.alibaba.druid.support.json.JSONUtils;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.api.R;
 import com.steerinfo.dil.feign.AmsFeign;
 import com.steerinfo.dil.feign.IMFeign;
@@ -473,6 +474,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         omstruckOrder.setOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
         //设置状态为逻辑删除：7
         omstruckOrder.setOrderStatus(new BigDecimal(7));
+        omstruckOrder.setInsertUpdateRemark("删除运单(7),oos476行");
         int i = omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
         //若是传来物资重量则修改已分配未分配重量
         if (map.get("orderMaterialWeight") != null) {
@@ -586,21 +588,36 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         int result=0;
         BigDecimal orderId =DataChange.dataToBigDecimal(map.get("orderId"));
         Map<String, Object> mesMap = omstruckOrderSeparateMapper.getOrderMesByOrderId(orderId);
+        int orderType = DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue();
         //if((DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue() == 1||DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue() == 4)
         //        && DataChange.dataToBigDecimal(map.get("isAdmin")).intValue() == 0){
         //    throw new Exception("钢材订单不允许撤销!");
         //}
-        if(DataChange.dataToBigDecimal(mesMap.get("lineSqe")).intValue() >= 1 && DataChange.dataToBigDecimal(map.get("isAdmin")).intValue() == 0){
-            throw new Exception("撤单失败");
+        //已计量，则不允许撤单
+        if(omstruckOrderSeparateMapper.countWeight(orderId) > 0 && DataChange.dataToBigDecimal(map.get("isAdmin")).intValue() == 0){
+            throw new Exception("已过磅，撤单失败！");
+        }
+        //如果是老区已进场或者内转，则删除计量委托
+        if(omstruckOrderSeparateMapper.countEnFactory(orderId) > 0 || orderType==11 || orderType == 21 || orderType == 15 || orderType == 16){
+            //获取运输订单号
+            String orderNumber = (String) mesMap.get("orderNumber");
+            //撤销订单的同时删除计量数据
+            String url = "http://172.16.33.122:44325/api/logistics/delEntrust";
+            String sendUrl = url + "?orderNumber=" + orderNumber;
+            String jsonData = getRequestUtils.doGet(sendUrl);
+            System.out.println(jsonData);
+            JSONObject jsonObject=null;
+            try{
+                jsonObject=JSONObject.parseObject(jsonData);
+            }catch (Exception e){
+                System.out.println("删除计量：回传解析失败");
+                e.printStackTrace();
+            }
+            //校验是否成功删除，失败则不允许撤单
+            if(jsonObject==null || "false".equals(jsonObject.getString("success"))){
+                throw new Exception("计量委托删除失败！");
+            }
         }
-        int orderType = DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue();
-        //获取运输订单号
-        String orderNumber = (String) mesMap.get("orderNumber");
-        //撤销订单的同时删除计量数据
-        String url = "http://172.16.33.122:44325/api/logistics/delEntrust";
-        String sendUrl = url + "?orderNumber=" + orderNumber;
-        String jsonData = getRequestUtils.doGet(sendUrl);
-        System.out.println(jsonData);
         BigDecimal orderPlanId = DataChange.dataToBigDecimal(mesMap.get("orderPlanId"));
         BigDecimal resultTotalId = DataChange.dataToBigDecimal(mesMap.get("resultTotalId"));
         OmstruckOrder omstruckOrder = new OmstruckOrder();
@@ -624,7 +641,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         }
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String dateStr = sdf.format(new Date());
-        omstruckOrder.setInsertUpdateRemark(map.get("capacityNumber") + "司机撤销订单将订单删除," + "撤销时间:" + dateStr + "撤销时路段顺序号为:" + mesMap.get("lineSqe"));
+        omstruckOrder.setInsertUpdateRemark(map.get("capacityNumber") + "司机撤销订单将订单删除；撤单原因:"+map.get("reason") + "；撤销时间:" + dateStr + "；撤销时路段顺序号为:" + mesMap.get("lineSqe"));
         //讲路段顺序号设为空，适应进厂以后扫码
         omstruckOrder.setOrderLineSequence(new BigDecimal(0));
         result += omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
@@ -881,20 +898,6 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             if(orderStatus == 5 || orderStatus == 6) {
                 throw new RuntimeException("订单已被接收或已被拒绝!");
             }
-            if(orderType == 1){
-                //订阅车辆 查询车牌号
-                String capacityNumber = omstruckOrderMapper.getCapacityNumberByCapacityId(DataChange.dataToBigDecimal(orderMessage.get("capacityId")));
-                Map<String, Object> subMap = new HashMap<>();
-                subMap.put("capacityNumber", capacityNumber + "_2");
-                String s = zjxlUtilService.subsCapacity(subMap, 1);
-                if(!"成功".equals(s.substring(s.length() - 2))){
-                    System.out.println("车辆订阅失败：" + capacityNumber);
-                    omstruckOrder.setInsertUpdateRemark("电子围栏订阅失败");
-                }else{
-                    omstruckOrder.setInsertUpdateRemark("电子围栏订阅成功");
-                    zjxlUtilMapper.insertSubCapacity(zjxlUtilMapper.getSubCapacityMaxId(), capacityNumber, DataChange.dataToBigDecimal(orderMessage.get("resultTotalId")));
-                }
-            }
             if(orderType == 11 || orderType == 15 || orderType == 16 ){
                 //判断是否为化专线厂区内转
                 Map<String, Object> inwardLine = omstruckOrderMapper.isInwardLine(orderId);
@@ -1569,6 +1572,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         OmstruckOrder omstruckOrder=new OmstruckOrder();
         omstruckOrder.setOrderId(DataChange.dataToBigDecimal(orderId));
         omstruckOrder.setOrderStatus(new BigDecimal(8));
+        omstruckOrder.setInsertUpdateRemark("作废运单(8),oos1559行");
         omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
         return 1;
     }
@@ -2028,6 +2032,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         //设置司机确认订单
         omstruckOrder.setDriverConfirmation(new BigDecimal(1));
         omstruckOrder.setUpdateTime(new Date());
+        omstruckOrder.setInsertUpdateRemark("司机确认订单");
         return omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
     }
 
@@ -2074,6 +2079,9 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         switch (orderType){
             case 1:
                  mesMap = omstruckOrderMapper.getSteelOrderMessageToApp(map);
+                 if("true".equals(omstruckOrderMapper.getPrintFlag()) && DataChange.dataToBigDecimal(mesMap.get("printNumber")).intValue()>0){
+                     mesMap.put("orderLineSequence",DataChange.dataToBigDecimal(mesMap.get("orderLineSequence")).intValue()+1);
+                 }
                  steelJudge = "steel";
                  break;
             case 4:
@@ -2169,6 +2177,12 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             mesMap.put("materialMesList",materialMesNew);
         } else {
             mesMap.put("materialMesList", omstruckOrderMapper.getMaterialMes(orderId, steelJudge));
+        }
+        try{
+            //尝试查询内转需求备注
+            mesMap.put("insertUpdateRemark", omstruckOrderMapper.getInwardOrderMap(orderId).get("insertUpdateRemark"));
+        }catch (Exception e){
+
         }
         return mesMap;
     }
@@ -2212,7 +2226,8 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             }
             if(orderType == 23 || orderType == 24){
                 Integer planEnable = omstruckOrderSeparateMapper.getOrderPlanEnable(orderMesMap.get("orderId"));
-                if(planEnable == 0){ // 数据为0则失效
+                int GoBeyondCount = omstruckOrderMapper.getGoBeyondCount(orderMesMap.get("orderId"));
+                if(planEnable == 0 || GoBeyondCount == 0){ // 数据为0则失效
                     omstruckOrderMapper.closeTruckOrder(DataChange.dataToBigDecimal(orderMesMap.get("orderId")));
                     continue;
                 }

src/main/resources/application-prod.yml

@@ -24,4 +24,7 @@ openfeign:
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.166:8066}
 server:
-  port: 8095
+  port: 8095
+  tomcat:
+    max-threads: 1000
+    accept-count: 800

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

@@ -14,19 +14,19 @@
     <result column="ENSTATION_TIME" jdbcType="TIMESTAMP" property="enstationTime" />
     <result column="OUTSTATION_TIME" jdbcType="TIMESTAMP" property="outstationTime" />
     <result column="BILLING_WEIGHT" jdbcType="DECIMAL" property="billingWeight" />
-    <result column="IS_ACCEPT " jdbcType="DECIMAL" property="isAccept" />
+    <result column="IS_ACCEPT" jdbcType="DECIMAL" property="isAccept" />
     <result column="WAREHOUSE_ID" jdbcType="DECIMAL" property="warehouseId" />
     <result column="STRAWMATS" jdbcType="DECIMAL" property="strawmats" />
   </resultMap>
   <sql id="columns">
     ORDER_ID, ORDER_NO, ORDER_WAGON_NO, ORDER_WAGON_WEIGHT, INSERT_USERNAME, INSERT_TIME, 
     UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, ENSTATION_TIME, OUTSTATION_TIME, 
-    BILLING_WEIGHT, "IS_ACCEPT ", WAREHOUSE_ID, STRAWMATS
+    BILLING_WEIGHT, "IS_ACCEPT", WAREHOUSE_ID, STRAWMATS
   </sql>
   <sql id="columns_alias">
     t.ORDER_ID, t.ORDER_NO, t.ORDER_WAGON_NO, t.ORDER_WAGON_WEIGHT, t.INSERT_USERNAME, 
     t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.ENSTATION_TIME, 
-    t.OUTSTATION_TIME, t.BILLING_WEIGHT, t."IS_ACCEPT ", t.WAREHOUSE_ID, t.STRAWMATS
+    t.OUTSTATION_TIME, t.BILLING_WEIGHT, t."IS_ACCEPT", t.WAREHOUSE_ID, t.STRAWMATS
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM OMSTRAIN_ORDER
@@ -73,7 +73,7 @@
         and BILLING_WEIGHT = #{billingWeight}
       </if>
       <if test="isAccept != null">
-        and IS_ACCEPT  = #{isAccept}
+        and IS_ACCEPT = #{isAccept}
       </if>
       <if test="warehouseId != null">
         and WAREHOUSE_ID = #{warehouseId}
@@ -122,7 +122,7 @@
         and BILLING_WEIGHT = #{billingWeight}
       </if>
       <if test="isAccept != null">
-        and IS_ACCEPT  = #{isAccept}
+        and IS_ACCEPT = #{isAccept}
       </if>
       <if test="warehouseId != null">
         and WAREHOUSE_ID = #{warehouseId}
@@ -173,7 +173,7 @@
       or BILLING_WEIGHT = #{billingWeight}
     </if>
     <if test="isAccept != null">
-      or IS_ACCEPT  = #{isAccept}
+      or IS_ACCEPT = #{isAccept}
     </if>
     <if test="warehouseId != null">
       or WAREHOUSE_ID = #{warehouseId}
@@ -187,7 +187,7 @@
                                 ORDER_WAGON_WEIGHT, INSERT_USERNAME, INSERT_TIME,
                                 UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
                                 ENSTATION_TIME, OUTSTATION_TIME, BILLING_WEIGHT,
-                                "IS_ACCEPT ", WAREHOUSE_ID, STRAWMATS
+                                "IS_ACCEPT", WAREHOUSE_ID, STRAWMATS
     )
     values (#{orderId,jdbcType=DECIMAL}, #{orderNo,jdbcType=VARCHAR}, #{orderWagonNo,jdbcType=VARCHAR},
             #{orderWagonWeight,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
@@ -236,7 +236,7 @@
         BILLING_WEIGHT,
       </if>
       <if test="isAccept != null">
-        "IS_ACCEPT ",
+        "IS_ACCEPT",
       </if>
       <if test="warehouseId != null">
         WAREHOUSE_ID,
@@ -306,7 +306,7 @@
         ENSTATION_TIME = #{enstationTime,jdbcType=TIMESTAMP},
         OUTSTATION_TIME = #{outstationTime,jdbcType=TIMESTAMP},
         BILLING_WEIGHT = #{billingWeight,jdbcType=DECIMAL},
-        "IS_ACCEPT " = #{isAccept,jdbcType=DECIMAL},
+        "IS_ACCEPT" = #{isAccept,jdbcType=DECIMAL},
         WAREHOUSE_ID = #{warehouseId,jdbcType=DECIMAL},
         STRAWMATS = #{strawmats,jdbcType=DECIMAL}
     where ORDER_ID = #{orderId,jdbcType=DECIMAL}
@@ -348,7 +348,7 @@
         BILLING_WEIGHT = #{billingWeight,jdbcType=DECIMAL},
       </if>
       <if test="isAccept != null">
-        "IS_ACCEPT " = #{isAccept,jdbcType=DECIMAL},
+        "IS_ACCEPT" = #{isAccept,jdbcType=DECIMAL},
       </if>
       <if test="warehouseId != null">
         WAREHOUSE_ID = #{warehouseId,jdbcType=DECIMAL},
@@ -379,7 +379,7 @@
     UPDATE_USERNAME, UPDATE_TIME,
     INSERT_UPDATE_REMARK, ENSTATION_TIME,
     OUTSTATION_TIME, BILLING_WEIGHT,
-    "IS_ACCEPT ", WAREHOUSE_ID, STRAWMATS
+    "IS_ACCEPT", WAREHOUSE_ID, STRAWMATS
     )
     ( <foreach collection="list" item="item" separator="union all">
     select
@@ -444,7 +444,7 @@
     <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
       when #{item.orderId,jdbcType=DECIMAL} then #{item.billingWeight,jdbcType=DECIMAL}
     </foreach>
-    ,"IS_ACCEPT "=
+    ,"IS_ACCEPT"=
     <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
       when #{item.orderId,jdbcType=DECIMAL} then #{item.isAccept,jdbcType=DECIMAL}
     </foreach>
@@ -600,12 +600,13 @@
                           LEFT JOIN TMSTRAIN_PLEASE_APPROVE_RESULT TPAR ON TPAR.RAIL_PLAN_ID = ASM.SALE_MATERIAL_ID
                           LEFT JOIN RMSTRAIN_ARRIVAL_SEND RAR ON RAR.ARRIVAL_ID = TPAR.SEND_STATION_ID
                           LEFT JOIN RMSTRAIN_ARRIVAL_SEND RAR1 ON RAR1.ARRIVAL_ID = TPAR.TO_THE_STATION_ID
-                          LEFT JOIN OMSTRUCK_ORDER OO ON OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                          LEFT JOIN OMSTRUCK_ORDER OO ON OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID AND OO.ORDER_STATUS=2
                           LEFT JOIN RMS_CAPACITY   R_CAPACITY ON  R_CAPACITY.CAPACITY_ID = OO.CAPACITY_ID
                           LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
                           LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
                                     AND TWR.MATERIAL_ID = RM.MATERIAL_ID
                           LEFT JOIN TMSTRUCK_UNLOAD_RESULT  TUR ON TUR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                                    AND TUR.MATERIAL_ID = RM.MATERIAL_ID
                           LEFT JOIN TMSTT_ORDER TTO ON TTO.TRUCK_ORDER_ID = OO.ORDER_ID
                           LEFT JOIN OMSTRAIN_ORDER OTO ON OTO.ORDER_ID = TTO.TRAIN_ORDER_ID
                           LEFT JOIN RMS_PWAREHOUSE_GRID RPG ON RPG.STACKING_ID = OO.ORDER_ID

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

@@ -1130,7 +1130,8 @@
 
     <update id="refuseCtrlZ">
         UPDATE OMSTRUCK_ORDER OO
-        SET OO.ORDER_STATUS = 4
+        SET OO.ORDER_STATUS = 4,
+            OO.INSERT_UPDATE_REMARK = '撤销订单状态变为4'
         WHERE OO.ORDER_ID = #{orderId}
     </update>
 
@@ -3073,7 +3074,8 @@
         SELECT AIR.REQUIREMENT_NUMBER AS "upNumber",
                OO.ORDER_NUMBER        AS "orderNumber",
                RC.CAPACITY_NUMBER     AS "capacityNumber",
-               RCA.CARRIER_NAME       AS "carrierName"
+               RCA.CARRIER_NAME       AS "carrierName",
+               AIR.INSERT_UPDATE_REMARK "insertUpdateRemark"
         FROM OMSTRUCK_ORDER OO
                  LEFT JOIN RMS_CAPACITY RC
                            ON RC.CAPACITY_ID = OO.CAPACITY_ID
@@ -3404,8 +3406,6 @@
         LEFT JOIN RMS_RECEIVE_PLACE RRP ON RRP.PLACE_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
         LEFT JOIN RMS_RECEIVE_ADDRESS RDA ON RDA.ADDRESS_ID = RRP.ADDRESS_ID
         WHERE
-        ASO.DELETED = 0
-        and
         OO.ORDER_ID = #{orderId}
         AND rownum =1
         <if test="status == null">
@@ -3736,7 +3736,8 @@
         RW1.WAREHOUSE_NAME       "shipperName",
         RW1.WAREHOUSE_NAME       "loadName",
         RW.WAREHOUSE_NAME        "unloadName",
-        RW.WAREHOUSE_NAME        "consigneeCompanyName"
+        RW.WAREHOUSE_NAME        "consigneeCompanyName",
+        OO.DELETED              "deleted"
         FROM OMSTRUCK_ORDER OO
         LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
         ON OO.ORDER_PLAN_ID = AIP.PLAN_ID
@@ -4003,7 +4004,8 @@
         OO.ORDER_STATUS "orderStatus",
         ASO.SALE_ORDER_ID   "saleOrderId",
         OO.DELETED  "orderDeleted",
-        OO.UPDATE_USERNAME "deleteReason"
+        OO.UPDATE_USERNAME "deleteReason",
+        OO.PRINTNUMBER "printNumber"
         FROM
         OMSTRUCK_ORDER OO
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
@@ -4025,8 +4027,7 @@
         RM.MATERIAL_ID||'' in (select SPECTIONS_MODEL from QMS_MODEL_UNROOLED)
         ) TEMP ON TEMP."orderId"=OO.ORDER_ID
         WHERE
-        ASO.DELETED = 0
-        AND OO.ORDER_ID = #{orderId}
+        OO.ORDER_ID = #{orderId}
         AND rownum =1
         <if test="status == null">
             AND OO.ORDER_STATUS between 4 and 6
@@ -4092,7 +4093,8 @@
         RGL.GATEPOST_NAME AS "outGatepost",
         OO.ORDER_STATUS AS "orderStatus",
         ASO.DELETED AS "deleted",
-        OO.ORDER_LINE_SEQUENCE AS "lineSequence"
+        OO.ORDER_LINE_SEQUENCE AS "lineSequence",
+        oo.ORDER_ID "orderId"
         FROM AMS_SALE_ORDER ASO
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
         ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
@@ -4420,4 +4422,12 @@
         delete from QMS_QUEUE_SPELLING_LIST QQSL where QQSL.QUEUE_RESULT_ID =
         (SELECT QQR.RESULT_ID FROM QMS_QUEUE_RESULT QQR WHERE QQR.RESULT_TOTAL_ID = #{resultTotalId})
     </delete>
+    <select id="getOrderPrintDate" resultType="java.util.Date" parameterType="java.math.BigDecimal">
+        SELECT OO.PRINTDATE FROM OMSTRUCK_ORDER OO
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
+    <select id="getPrintFlag" resultType="java.lang.String">
+        SELECT DILV.VERSION_VALUE FROM DIL_VERSION DILV
+        WHERE DILV.VERSION_ID = 7
+    </select>
 </mapper>

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

@@ -602,7 +602,8 @@
   </update>
     <update id="updateSteelOrderType4" parameterType="decimal">
       update OMSTRUCK_ORDER OO
-        SET OO.ORDER_STATUS = 2
+        SET OO.ORDER_STATUS = 2,
+            OO.INSERT_UPDATE_REMARK = '内转钢材到异地库关闭订单'
         WHERE OO.ORDER_ID = #{orderId}
     </update>
 

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

@@ -44,7 +44,8 @@
     <!--  通过运输订单号改变订单状态  -->
     <update id="updateOrderStatusByOrderNum" parameterType="map">
         update OMSTRUCK_ORDER OO
-        set OO.ORDER_STATUS = #{orderStatus}
+        set OO.ORDER_STATUS = #{orderStatus},
+            OO.INSERT_UPDATE_REMARK = '退货将状态变为9'
         where OO.ORDER_ID = #{orderId}
     </update>
 <!--    修改运输订单趟次-->
@@ -148,6 +149,7 @@
         SELECT OO.ORDER_ID AS "orderId"
         FROM OMSTRUCK_ORDER OO
         WHERE OO.ORDER_NUMBER = #{orderNumber}
+        AND OO.ORDER_STATUS = 5
     </select>
 
 
@@ -533,12 +535,14 @@
     </update>
     <update id="closeInwardOrder" parameterType="java.lang.Integer">
         update OMSTRUCK_ORDER OO
-        set oo.ORDER_STATUS = 2
+        set oo.ORDER_STATUS = 2,
+        OO.INSERT_UPDATE_REMARK = '关闭内转订单'
         <if test="sqe != null">
             , OO.ORDER_LINE_SEQUENCE = #{sqe}
         </if>
         where
         OO.ORDER_STATUS = 5
+        AND OO.ORDER_TYPE IN (11,15,16,21,25)
         AND oo.ORDER_ID = #{orderId}
     </update>
     <update id="updateSporadicStatus">
@@ -814,7 +818,7 @@
         select
             TER.RESULT_ENTRY_GATE_TIME   "pointDate",
             RG.GATEPOST_NAME             "pointName",
-            TER.SEGMEN_SQE                "segmenSqe",
+            nvl(TER.SEGMEN_SQE,0)                "segmenSqe",
             '进厂'                          "linkName"
         from TMSTRUCK_ENFACTORY_RESULT TER
                  left join RMS_GATEPOST RG
@@ -834,7 +838,7 @@
     <select id="getFourDateMes" parameterType="java.math.BigDecimal" resultType="java.util.Map">
         select RTC.TRUCK_CALCULATE_NUMBER   "pointName",
                TWR.RESULT_TARE_WEIGHT_TIME "pointDate",
-               TWR.TARE_SEGMENT_SQE         "segmenSqe",
+               NVL(TWR.TARE_SEGMENT_SQE,0)         "segmenSqe",
                '计皮'                        "linkName",
                TWR.RESULT_TARE_WEIGHT       "weight",
                RM.MATERIAL_NAME             "materialName",
@@ -874,7 +878,7 @@
         select TUR.RESULT_END_TIME    "pointDate",
                RW.WAREHOUSE_NAME    "pointName",
                RM.MATERIAL_NAME ||  RM.MATERIAL_SPECIFICATION  || RM.MATERIAL_MODEL  "materialName",
-               TUR.SEGMENT_SQE             "segmenSqe",
+               NVL(TUR.SEGMENT_SQE,0)             "segmenSqe",
                '卸货'                          "linkName"
         from TMSTRUCK_UNLOAD_RESULT TUR
                  left join RMS_WAREHOUSE RW
@@ -942,4 +946,21 @@
         WHERE
             OO.ORDER_ID = #{orderId}
     </select>
+    <select id="getPrintFlag" resultType="java.lang.String">
+        SELECT DILV.VERSION_VALUE FROM DIL_VERSION DILV
+        WHERE DILV.VERSION_ID = 7
+    </select>
+    <select id="countWeight" resultType="java.lang.Integer">
+    SELECT COUNT(TWR.WEIGHT_TASK_RESULT_ID) FROM TMSTRUCK_WEIGHT_RESULT TWR
+    LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+    WHERE	(TWR.RESULT_TARE_WEIGHT IS NOT NULL OR TWR.RESULT_GROSS_WEIGHT IS NOT NULL) AND TTR.ORDER_ID = #{orderId}
+    </select>
+    <select id="countEnFactory" resultType="java.lang.Integer">
+    SELECT
+        COUNT(TER.RESULT_ID)
+    FROM TMSTRUCK_ENFACTORY_RESULT TER
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN RMS_GATEPOST RG ON RG.GATEPOST_ID = TER.GATEPOST_ID
+    WHERE	TER.RESULT_ENTRY_GATE_TIME IS NOT NULL AND RG.SHIPPER_ID = 1 AND TTR.ORDER_ID = #{orderId}
+    </select>
 </mapper>