ytaj

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

@@ -286,4 +286,11 @@ public class OmstruckOrderSeparateController extends BaseRESTfulController {
     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/mapper/OmstruckOrderSeparateMapper.java

@@ -126,4 +126,6 @@ public interface OmstruckOrderSeparateMapper {
      //通过总实绩ID查询计毛实绩数据
     List<Map<String, Object>> getAllPiWeightResultMesByTotalId(Integer resultTotalId);
 
+    int closeInwardOrder(Integer orderId);
+
 }

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

@@ -37,4 +37,6 @@ public interface IOmstruckOrderSeparateService {
     int addNewTransportOrder(BigDecimal orderId);
 
     List<Map<String,Object>> getOrderMaterial(Integer orderId);
+
+    int closeInwardOrder(Integer orderId);
 }

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

@@ -604,4 +604,10 @@ public class OmstruckOrderSeparateServiceImpl implements IOmstruckOrderSeparateS
         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

@@ -1951,7 +1951,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 }
                 break;
             case 11:
-                mesMap = omstruckOrderMapper.getNZOrderMessageToApp(map);
+                mesMap = omstruckOrderMapper.getInwardOrderMessageToApp(map);
                 mesMap.put("shipperName","四川省达州钢铁集团有限责任公司");
                 mesMap.put("consigneeCompanyName","四川省达州钢铁集团有限责任公司");
                 break;

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

@@ -2422,28 +2422,23 @@
     <!-- 查询分解运输计划 -->
     <select id="getInwardOrderList" resultType="java.util.Map" parameterType="java.util.Map">
         SELECT *
-        FROM (SELECT RM.MATERIAL_NAME || rm.material_specification || '(' ||
-        rm.material_model || ')' AS "materialName",
-        AIP.PLAN_NUMBER AS "planNumber",
-        RCA.CARRIER_NAME AS "carrierName",
-        AIP.CARRIER_ID AS "carrierId",
-        RC.CAPACITY_NUMBER AS "capacityNumber",
-        OOM.ORDER_MATERIAL_NUMBER AS "orderMaterialNumber",
-        AIR.REQUIREMENT_NUMBER AS "requirementNumber",
-        AIP.PLAN_ISSUE_TIME AS "planIssueTime",
-        AIP.PLAN_ISSUE_NAME AS "planIssueName",
-        AIR.REQUIREMENT_TYPE AS "requirementType",
-        ARM.MATERIAL_COUNT AS "materialNumber",
-        ARM.MATERIAL_WEIGHT AS "materialWeight",
-        AIR.REQUIREMENT_TRUCK_TIME AS "requirementTruckTime",
-        RW.WAREHOUSE_NAME AS "wareHouseName",
-        AIR.REQUIREMENT_WORK_TYPE AS "requirementWorkType",
-        AIR.REQUIREMENT_WORK_CONTENT AS "requirementWorkContent",
-        AIR.REQUIREMENT_WORK_ENVIRONMENT AS "requirementWorkEnvironment",
+        FROM (SELECT AIP.PLAN_NUMBER                    AS "planNumber",
+        RCA.CARRIER_NAME                   AS "carrierName",
+        AIP.CARRIER_ID                     AS "carrierId",
+        RC.CAPACITY_NUMBER                 AS "capacityNumber",
+        OOM.ORDER_MATERIAL_NUMBER          AS "orderMaterialNumber",
+        AIR.REQUIREMENT_NUMBER             AS "requirementNumber",
+        AIP.PLAN_ISSUE_TIME                AS "planIssueTime",
+        AIP.PLAN_ISSUE_NAME                AS "planIssueName",
+        AIR.REQUIREMENT_TYPE               AS "requirementType",
+        AIR.REQUIREMENT_TRUCK_TIME         AS "requirementTruckTime",
+        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"
+        OO.ORDER_ID                        AS "orderId",
+        AIP.INSERT_TIME                    AS "insertTime"
         FROM OMSTRUCK_ORDER OO
         LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
         ON OOM.ORDER_ID = OO.ORDER_ID
@@ -2457,16 +2452,10 @@
         ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
         LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
         ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
-        LEFT JOIN RMS_MATERIAL RM
-        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
-        LEFT JOIN RMS_WAREHOUSE RW
-        ON RW.WAREHOUSE_ID = AIR.REQUIREMENT_PLATFORM_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
         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})
@@ -2476,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=")">
@@ -2524,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=")">
@@ -2542,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=")">
@@ -2578,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>

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

@@ -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",