'销售'

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

@@ -585,18 +585,22 @@ public class OmstruckOrderController extends BaseRESTfulController {
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
     })
     @PostMapping("/getDriverInfoForSale")
-        public RESTfulResult getDriverInfoForSale(@RequestBody(required = false) Map<String, Object> mapValue,
-                Integer apiId,
-                Integer pageNum,
-                Integer pageSize,
-                Integer orderStatus,
-                String con,
-                Integer saleOrderId
-    ) { if (saleOrderId != null ) {
-            mapValue.put("saleOrderId", saleOrderId);
+    public RESTfulResult getDriverInfoForSale(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              Integer orderType,
+                                              Integer orderStatus,
+                                              String con,
+                                              String carrierSsoId,
+                                              Integer shipperId
+    ) {
+        if (orderType != null) {
+            mapValue.put("orderTypee", orderType);
+        }
+        if (shipperId != null) {
+            mapValue.put("shipperId",shipperId);
         }
-
-
         if (orderStatus != null) {
             mapValue.put("orderStatus", orderStatus);
         }
@@ -606,7 +610,9 @@ public class OmstruckOrderController extends BaseRESTfulController {
         if (con != null && con.length() != 0) {
             mapValue.put("con", "%" + con + "%");
         }
-
+        if (carrierSsoId != null && !carrierSsoId.equals("")) {
+            mapValue.put("carrierSsoId", carrierSsoId);
+        }
         //不分页筛选数据
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
@@ -617,14 +623,14 @@ public class OmstruckOrderController extends BaseRESTfulController {
 
     @PostMapping("/getDriverInfoForSale1")
     public RESTfulResult getDriverInfoForSale1(@RequestBody(required = false) Map<String, Object> mapValue,
-                                              Integer orderStatus,
-                                              String con,
-                                              Integer saleOrderId,
+                                               Integer orderStatus,
+                                               String con,
+                                               Integer saleOrderId,
                                                String numberPlate
-    ) { if (saleOrderId != null ) {
-        mapValue.put("saleOrderId", saleOrderId);
+    ) {
+        if (saleOrderId != null) {
+            mapValue.put("saleOrderId", saleOrderId);
         }
-
         if (orderStatus != null) {
             mapValue.put("orderStatus", orderStatus);
         }
@@ -634,13 +640,10 @@ public class OmstruckOrderController extends BaseRESTfulController {
         if (con != null && con.length() != 0) {
             mapValue.put("con", "%" + con + "%");
         }
-        if (numberPlate != null&& !"".equals(numberPlate)&&!"null".equals(numberPlate)) {
-            mapValue.put("numberPlate", orderStatus);
+        if (numberPlate != null && !"".equals(numberPlate) && !"null".equals(numberPlate)) {
+            mapValue.put("numberPlate", "%" + numberPlate + "%");
         }
-
-
         List<Map<String, Object>> result = omstruckOrderService.selectTransportOrderForSale1(mapValue);
-
         return success(result);
     }
 
@@ -1167,4 +1170,35 @@ public class OmstruckOrderController extends BaseRESTfulController {
         List<Map<String, Object>> orderMaterialList = omstruckOrderMapper.getOrderMaterialList(new BigDecimal(orderId));
         return success(orderMaterialList);
     }
+
+    //销售物流接收订单，订单类型为已下发，司机接单状态为已下发，未下发。
+    @ApiOperation(value = "展示销售订单下的运输订单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(226)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getDriverInfoForSale2")
+    public RESTfulResult getDriverInfoForSale2(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              BigDecimal saleOrderId,
+                                              String con
+    ) {
+        if (con != null && (con.equals("") || con.equals("undefined"))) {
+            con = null;
+        }
+        if (con != null && con.length() != 0) {
+            mapValue.put("con", "%" + con + "%");
+        }
+        mapValue.put("saleOrderId",saleOrderId);
+        //不分页筛选数据
+        PageHelper.startPage(pageNum, pageSize);
+        //分页数据
+        List<Map<String, Object>> diverInfoForSaleorder = omstruckOrderService.getDriverInfoForSale2(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, diverInfoForSaleorder);
+        return success(pageList);
+    }
 }

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

@@ -338,4 +338,7 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     BigDecimal getLineSeq(BigDecimal orderId);
 
     String getCapacityNumberByCapacityId(BigDecimal capacityNumber);
+
+    //销售：接收运输订单展示pc端界面
+    List<Map<String, Object>> getDriverInfoForSale2(Map<String, Object> map);
 }

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

@@ -205,4 +205,5 @@ public interface IOmstruckOrderService {
 
     int refuseCtrlZ(Map<String, Object> map);
 
+    List<Map<String, Object>> getDriverInfoForSale2(Map<String, Object> mapValue);
 }

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

@@ -2119,4 +2119,75 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         }
         return result;
     }
+
+    /**
+     * 查询销售订单下的运单信息
+     * @param map
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getDriverInfoForSale2(Map<String, Object> map) {
+        List<Map<String, Object>> mapList = omstruckOrderMapper.getDriverInfoForSale2(map);
+        int count = 1;
+        String carStatus = null;
+        for (Map<String, Object> stringObjectMap : mapList) {
+            // 未接单
+            if (((BigDecimal)stringObjectMap.get("orderStatus")).intValue() == 4) {
+                carStatus = "未接单";
+                stringObjectMap.put("carStatus",carStatus);
+                stringObjectMap.put("ROW_ID",count);
+                count ++;
+                continue;
+            }
+            // 已出厂
+            if (stringObjectMap.get("outGateTime") != null) {
+                carStatus = "已出厂";
+                stringObjectMap.put("carStatus",carStatus);
+                stringObjectMap.put("ROW_ID",count);
+                count ++;
+                continue;
+            }
+            // 已计毛
+            if (stringObjectMap.get("grossWeight") != null) {
+                carStatus = "已计毛";
+                stringObjectMap.put("carStatus",carStatus);
+                stringObjectMap.put("ROW_ID",count);
+                count ++;
+                continue;
+            }
+            // 已装货
+            if (stringObjectMap.get("loadTime") != null) {
+                carStatus = "已装货";
+                stringObjectMap.put("carStatus",carStatus);
+                stringObjectMap.put("ROW_ID",count);
+                count ++;
+                continue;
+            }
+            // 已计皮
+            if (stringObjectMap.get("tareWeight") != null) {
+                carStatus = "已计皮";
+                stringObjectMap.put("carStatus",carStatus);
+                stringObjectMap.put("ROW_ID",count);
+                count ++;
+                continue;
+            }
+            // 已进厂
+            if (stringObjectMap.get("enGateTime") != null) {
+                carStatus = "已进厂";
+                stringObjectMap.put("carStatus",carStatus);
+                stringObjectMap.put("ROW_ID",count);
+                count ++;
+                continue;
+            }
+            // 未进厂
+            if (stringObjectMap.get("enGateTime") == null) {
+                carStatus = "未进厂";
+                stringObjectMap.put("carStatus",carStatus);
+                stringObjectMap.put("ROW_ID",count);
+                count ++;
+                continue;
+            }
+        }
+        return mapList;
+    }
 }

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

@@ -1858,9 +1858,15 @@
             <if test="orderStatus!=null">
                 AND OO.ORDER_STATUS = #{orderStatus}
             </if>
+            <if test="carrierSsoId!=null">
+                and RC3.CARRIER_SSO_ID = #{carrierSsoId}
+            </if>
+            <if test="orderTypee!=null">
+                and OO.ORDER_TYPE = #{orderTypee}
+            </if>
 
-            <if test="saleOrderId!=null">
-                AND ASO.SALE_ORDER_ID = #{saleOrderId}
+            <if test="shipperId!=null">
+                and ASO.SHIPPER_ID = #{shipperId}
             </if>
         </where>
         ) RRC
@@ -1926,14 +1932,29 @@
         ASOM.SALE_DATE_OF_RECEIPT "saleDateOfReceipt",
         OO.ORDER_RECEIVE_REFUSE_TIME "orderReceiveRefuseTime",
         RS.SHIPPER_NAME "shipperName",
-        OO.ORDER_ID "orderId",
         RC3.CARRIER_NAME "carrierName",
         RM.MATERIAL_NAME "materialName",
         RM.MATERIAL_SPECIFICATION "materialSpecification",
-        RM.MATERIAL_MODEL "materialModel"
+        RM.MATERIAL_MODEL "materialModel",
+        ASM.SALE_MATERIAL_ID "saleMaterialId",
+        ASM.MATERIAL_ID "materialId",
+        ASTM.TRUCKNO_MATERIAL_ID "trucknoMaterialId",
+        OO.ORDER_ID "orderId",
+        ASM.STEEL_METER "meterNumber",
+        ASM.MATERIAL_NUMBER "orderPlanWeight",
+        ASM.IS_POUND_SALE "isPound",
+        RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "Specification",
+        ASOM.SALE_ORDER_MATERIAL_ID "saleOrderMaterialId",
+        ASM.EAS_PRIMARY_ID "easId",
+        ASM.SALE_WAREHOUSE "warehouse",
+        ASM.MATERIAL_WEIGHT "materialWeight"
         FROM OMSTRUCK_ORDER OO
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
         ON ASOM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
+        LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+        ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        LEFT JOIN AMS_SALE_MATERIAL ASM
+        ON ASTM.MATERIAL_ID = ASM.SALE_MATERIAL_ID
         LEFT JOIN AMS_SALE_ORDER ASO
         ON ASO.SALE_ORDER_ID=ASOM.SALE_ORDER_ID
         LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO
@@ -1952,11 +1973,8 @@
         ON RRA.ADDRESS_ID=RRP.ADDRESS_ID
         LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE ACTP
         ON OO.PRICE_ID=ACTP.PRICE_ID
-        LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
-        ON OOM.ORDER_ID=ASO.SALE_ORDER_ID
         LEFT JOIN RMS_MATERIAL RM
-        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
-
+        ON RM.MATERIAL_ID = ASM.MATERIAL_ID
         <where>
             <if test="orderStatus!=null">
                 AND OO.ORDER_STATUS = #{orderStatus}
@@ -3777,4 +3795,48 @@
     <select id="getCapacityNumberByCapacityId" parameterType="java.math.BigDecimal" resultType="java.lang.String">
         select CAPACITY_NUMBER from RMS_CAPACITY  where CAPACITY_ID = #{capacityId}
     </select>
+
+    <select id="getDriverInfoForSale2" parameterType="java.util.Map" resultType="java.util.Map" >
+        SELECT OO.ORDER_NUMBER            AS "orderNumber",
+               RCC.CAPACITY_NUMBER        AS "capacityNumber",
+               TWR.RESULT_NET_WEIGHT      AS "netWeight",
+               TWR.RESULT_TARE_WEIGHT     AS "tareWeight",
+               TWR.RESULT_GROSS_WEIGHT    AS "grossWeight",
+               TER.RESULT_ENTRY_GATE_TIME AS "enGateTime",
+               TLFR.RESULT_OUT_GATE_TIME  AS "outGateTime",
+               TLR.RESULT_LOAD_START_TIME AS "loadTime",
+               RM.MATERIAL_NAME           AS "materialName",
+               OOM.ORDER_MATERIAL_WEIGHT  AS "materialWeight",
+               OO.ORDER_STATUS            AS "orderStatus"
+        FROM AMS_SALE_ORDER ASO
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+                 LEFT JOIN OMSTRUCK_ORDER OO
+                           ON OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                 LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
+                           ON OOM.ORDER_ID = OO.ORDER_ID
+                 LEFT JOIN RMS_MATERIAL RM
+                           ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+                 LEFT JOIN RMS_CAPACITY RCC
+                           ON RCC.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
+                 LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
+                           ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                 LEFT JOIN TMSTRUCK_LOAD_RESULT TLR
+                           ON TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                 LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+                           ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                 LEFT JOIN TMSTRUCK_RECEIPT_RESULT TRR
+                           ON TRR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        WHERE ASO.SALE_ORDER_ID = #{saleOrderId}
+          AND OO.ORDER_STATUS IS NOT NULL
+          AND OO.ORDER_TYPE IN (1,2)
+        <if test="con != null" >
+            AND RCC.CAPACITY_NUMBER LIKE #{con}
+        </if>
+        ORDER BY OO.ORDER_NUMBER DESC
+    </select>
 </mapper>