2021年11月25日08:52:31提交修改承运商发运日计划

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

@@ -333,8 +333,7 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         }
         for (Map<String,Object> m:mapValue
         ) {
-         //Integer id=amsSaleOrderMaterialService.selectByCxh(m);
-            Integer id = Integer.parseInt(m.get("orderMaterialId").toString()) ;
+            Integer id = Integer.parseInt(m.get("saleOrderMaterialId").toString()) ;
             System.out.println(id);
             //通过主键Id获取地址id
             Integer a=amsSaleOrderMaterialService.selectById(new BigDecimal(id));

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

@@ -82,7 +82,6 @@ public class AmstruckPurplanController extends BaseRESTfulController {
         if(mapValue.size() == 1){
             //将查询结果存入索引中
             allPurPlan = amstruckPurplanService.getAllPurPlan(mapValue);
-            DataChange.changeDateToDayDate(allPurPlan, "planTruckTime", "planIncomingTime");
             Map<String, Object> map = new HashMap<>();
             //添加索引
             map.put("index","get_pur_plan_list");
@@ -100,7 +99,6 @@ public class AmstruckPurplanController extends BaseRESTfulController {
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> purPlan = amstruckPurplanService.getAllPurPlan(mapValue);
-        DataChange.changeDateToDayDate(purPlan, "planTruckTime", "planIncomingTime");
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allPurPlan,purPlan);
         return success(pageList);
     }
@@ -212,7 +210,6 @@ public class AmstruckPurplanController extends BaseRESTfulController {
         if(mapValue.size() == count){
             //将查询结果存入索引中
             allPlan = amstruckPurplanMaterialService.getDecomposedPlan(mapValue);
-            DataChange.changeDateToDayDate(allPlan, "planTruckTime", "planIncomingTime");
             Map<String, Object> map = new HashMap<>();
             //添加索引
             map.put("index","get_decomposed_list");
@@ -230,11 +227,7 @@ public class AmstruckPurplanController extends BaseRESTfulController {
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> plan = amstruckPurplanMaterialService.getDecomposedPlan(mapValue);
-        DataChange.changeDateToDayDate(plan, "planTruckTime", "planIncomingTime");
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allPlan,plan);
         return success(pageList);
     }
-
-
-
 }

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

@@ -35,6 +35,7 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
 
     List<Map<String,Object>> getSaleOrderList(Map<String,Object> mapValue);
 
+    //通过地址Id查询承运商ID
     List<Integer>  getCarrier(Integer param);
 
 }

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

@@ -1147,24 +1147,55 @@
   </select>
   <!-- 展示所有销售公司已审核的销售订单 -->
   <select id="getSaleOrderList" parameterType="java.util.Map" resultType="java.util.Map">
-    select
-      adso.DISPATCH_ID "dispatchId",
-      asom.SALE_ORDER_MATERIAL_ID "orderMaterialId",
-      asom.sale_order_id as "saleOrderId",
-      aso.SALE_NUMBER "saleNumber",
-      asom.sale_order_material_truck_no as "saleOrderMaterialTruckNo",
-      asom.sale_order_material_id,
-      rra.address_delivery_address as "addressDeliveryAddress",
-      asom.sale_date_of_receipt as "saleDateOfReceipt",
-      asom.sale_order_consignee as "saleOrderConsignee",
-      asom.sale_order_consignee_tel as "saleOrderConsigneeTel"
-    from ams_sale_order aso
-           join ams_sale_order_material asom
-               on aso.sale_order_id =asom.sale_order_id
-            left join AMS_DISPATCH_SALE_ORDER adso
-                on adso.SALE_ORDER_MATERIAL_ID = asom.SALE_ORDER_MATERIAL_ID
-           left join rms_receive_address rra on asom.sale_shipping_address_id=rra.address_id
-    where aso.sale_order_status in (2, 4) and adso.DISPATCH_STATUS = #{status} and adso.DISPATCH_TYPE=0
+    select ADSO.DISPATCH_ID                                 "dispatchId",
+           ASOM.SALE_ORDER_ID                               "saleOrderId",
+           ASOM.SALE_ORDER_MATERIAL_ID                      "saleOrderMaterialId",
+           ASO.SALE_NUMBER                                  "saleNumber",
+           ASOM.SALE_ORDER_MATERIAL_TRUCK_NO                "saleOrderMaterialTruckNo",
+           CONCAT(CONCAT(CONCAT(ADDRESS_PROVINCE, ADDRESS_DISTRICT), ADDRESS_TOWN),
+                  ADDRESS_DELIVERY_ADDRESS)                 "addressDeliveryAddress",
+           TO_CHAR(ASOM.SALE_DATE_OF_RECEIPT, 'yyyy-mm-dd') "saleDateOfReceipt",
+           ASOM.SALE_ORDER_CONSIGNEE                        "saleOrderConsignee",
+           ASOM.SALE_ORDER_CONSIGNEE_TEL                    "saleOrderConsigneeTel",
+           RS.SHIPPER_NAME                                  "shipperName",
+           RC.CONSIGNEE_COMPANY_NAME                        "consigneeCompanyName",
+           ASO.SALE_ORDER_ISSELF_MENTION                    "saleOrderIsselfMention",
+           ADSO.DISPATCH_TIME                               "dispatchTime",
+           (
+             SELECT *
+             FROM (
+                    SELECT RM.MATERIAL_NAME
+                    FROM AMS_SALE_TRUCKNO_MATERIAL ASTM
+                           LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = ASTM.MATERIAL_ID
+                    WHERE ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                    ORDER BY ASTM.TRUCKNO_MATERIAL_ID
+                  )
+             WHERE ROWNUM = 1
+           ) "materialName",
+           (
+             SELECT *
+             FROM (
+                    SELECT ASTM.MATERIAL_THEORETICAL_WEIGHT
+                    FROM AMS_SALE_TRUCKNO_MATERIAL ASTM
+                    WHERE ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                    ORDER BY ASTM.TRUCKNO_MATERIAL_ID
+                  )
+             WHERE ROWNUM = 1
+             ) "weight"
+    FROM AMS_SALE_ORDER ASO
+           JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+           LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO
+                     ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+           LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+                     ON ASOM.SALE_SHIPPING_ADDRESS_ID = RRA.ADDRESS_ID
+           LEFT JOIN RMS_SHIPPER RS
+                     ON RS.SHIPPER_ID = ASO.SHIPPER_ID
+           LEFT JOIN RMS_CONSIGNEE RC
+                     ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
+    WHERE ASO.SALE_ORDER_STATUS IN (2, 4)
+      AND ADSO.DISPATCH_STATUS = #{status}
+      AND ADSO.DISPATCH_TYPE = 0
   </select>
 
   <!-- 通过收货地址，匹配对应的承运商-->
@@ -1172,10 +1203,5 @@
     select rc.carrier_id from rms_receive_address rra join rms_carrier rc on rra.address_town = rc.carrier_bid_area
     WHERE rra.address_id = #{param}
   </select>
- <!-- 获取到站id -->
-<!--  <select id="selectReciveId" resultType="java.util.LinkedHashMap">-->
-<!--    select -->
-<!--    from-->
-<!--    where-->
-<!--  </select>-->
+
 </mapper>

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

@@ -493,8 +493,8 @@
             AP.PLAN_NO "planNo",
             RC.CARRIER_NAME "carrierName",
             AP.MATERIAL_TOTAL_WEIGHT "materialTotalWeight",
-            AP.PLAN_TRUCK_TIME "planTruckTime",
-            AP.PLAN_INCOMING_TIME "planIncomingTime"
+            to_char(AP.PLAN_TRUCK_TIME, 'yyyy-mm-dd') "planTruckTime",
+            to_char(AP.PLAN_INCOMING_TIME. 'yyyy-mm-dd') "planIncomingTime"
         from AMSTRUCK_PURPLAN AP
         left join AMS_PURCHASE_ORDER APO
         on AP.BATCH_ID = APO.BATCH_ID

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

@@ -415,9 +415,9 @@
         AP.MATERIAL_TOTAL_WEIGHT "materialTotalWeight",
         APM.MATERIAL_ALLOCATED_WEIGHT "materialAllocatedWeight",
         APM.MATERIAL_UNALLOCATED_WEIGHT "materialUnallocatedWeight",
-        AP.PLAN_TRUCK_TIME "planTruckTime",
+        to_char(AP.PLAN_TRUCK_TIME, 'yyyy-mm-dd') "planTruckTime",
         RM.MATERIAL_ID "materialId",
-        AP.PLAN_INCOMING_TIME "planIncomingTime",
+        to_char(AP.PLAN_INCOMING_TIME, 'yyyy-mm-dd') "planIncomingTime",
         AP.PLAN_ID "planId",
         AP.INSERT_TIME "insertTime"
         from AMSTRUCK_PURPLAN AP

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

@@ -507,7 +507,7 @@
     t.dayplan_truck_number as "dayplanTruckNumber",
     rs.SHIPPER_NAME "shipperName",
     rc.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
-    t.dayplan_delivery_date as "dayplanDeliveryDate",
+    to_char(t.dayplan_delivery_date, 'yyyy-mm-dd') as "dayplanDeliveryDate",
     rm.material_name as "materialName",
     t.dayplan_material_weight as "dayplanMaterialWeight",
     t.INSERT_UPDATE_REMARK "insertUpdateRemark",
@@ -581,9 +581,7 @@
         </foreach>
       </if>
     </where>
-      <include refid="orderBy"></include>
-
-
+    <include refid="orderBy"></include>
     </select>
 
   <sql id="orderBy">
@@ -608,7 +606,7 @@
     t.dayplan_truck_number as "dayplanTruckNumber",
     rs.SHIPPER_NAME "shipperName",
     rc.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
-    t.dayplan_delivery_date as "dayplanDeliveryDate",
+    to_char(t.dayplan_delivery_date, 'yyyy-mm-dd') as "dayplanDeliveryDate",
     rm.material_name as "materialName",
     t.dayplan_material_weight as "dayplanMaterialWeight",
     t.INSERT_UPDATE_REMARK "insertUpdateRemark",
@@ -681,7 +679,7 @@
         </foreach>
       </if>
     </where>
-      <include refid="orderBy"></include>
+    <include refid="orderBy"></include>
 
     </select>