'111'

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

@@ -712,21 +712,21 @@ public class AmsSaleOrderController extends BaseRESTfulController {
             return failed("匹配不到车牌号！");
         }
         else {
-            for (Map<String, Object> map : mapList) {
-                // 调用EAS接口将车牌号传给金蝶
-                BigDecimal saleOrderMaterialId = new BigDecimal((Integer) map.get("saleOrderMaterialId")) ;
-                Map<String,Object> input = joinFeign.findCarNumberByOrderId(saleOrderMaterialId);
-                Map<String, Object> totalMap = easCapacityTestUtil.getTotalMap();
-                totalMap.put("input",input);
-                System.out.println(totalMap);
-                String json = JSONUtils.toJSONString(totalMap);
-                System.out.println(json);
-                Map<String,Object> s = joinFeign.pushCarNumberToEas(totalMap);
-                if (s == null || s.size() == 0) {
-                    throw new Exception("登录金蝶失败");
-                }
-                System.out.println(s);
-            }
+//            for (Map<String, Object> map : mapList) {
+//                // 调用EAS接口将车牌号传给金蝶
+//                BigDecimal saleOrderMaterialId = new BigDecimal((Integer) map.get("saleOrderMaterialId")) ;
+//                Map<String,Object> input = joinFeign.findCarNumberByOrderId(saleOrderMaterialId);
+//                Map<String, Object> totalMap = easCapacityTestUtil.getTotalMap();
+//                totalMap.put("input",input);
+//                System.out.println(totalMap);
+//                String json = JSONUtils.toJSONString(totalMap);
+//                System.out.println(json);
+//                Map<String,Object> s = joinFeign.pushCarNumberToEas(totalMap);
+//                if (s == null || s.size() == 0) {
+//                    throw new Exception("登录金蝶失败");
+//                }
+//                System.out.println(s);
+//            }
             return success(result);
         }
     }
@@ -1156,19 +1156,26 @@ public class AmsSaleOrderController extends BaseRESTfulController {
             return failed("已装货车辆不允许修改车牌");
         }
         else {
-            // 调用EAS接口将车牌号传给金蝶
-            BigDecimal saleOrderMaterialId = new BigDecimal((Integer) mapValue.get("saleOrderMaterialId"));
-            Map<String, Object> input = joinFeign.findCarNumberByOrderId(saleOrderMaterialId);
-            Map<String, Object> totalMap = easCapacityTestUtil.getTotalMap();
-            totalMap.put("input", input);
-            System.out.println(totalMap);
-            String json = JSONUtils.toJSONString(totalMap);
-            System.out.println(json);
-            Map<String, Object> s = joinFeign.pushCarNumberToEas(totalMap);
-            System.out.println("-------------------------------------");
-            System.out.println(s);
-            System.out.println("-------------------------------------");
+//            // 调用EAS接口将车牌号传给金蝶
+//            BigDecimal saleOrderMaterialId = new BigDecimal((Integer) mapValue.get("saleOrderMaterialId"));
+//            Map<String, Object> input = joinFeign.findCarNumberByOrderId(saleOrderMaterialId);
+//            Map<String, Object> totalMap = easCapacityTestUtil.getTotalMap();
+//            totalMap.put("input", input);
+//            System.out.println(totalMap);
+//            String json = JSONUtils.toJSONString(totalMap);
+//            System.out.println(json);
+//            Map<String, Object> s = joinFeign.pushCarNumberToEas(totalMap);
+//            System.out.println("-------------------------------------");
+//            System.out.println(s);
+//            System.out.println("-------------------------------------");
             return success(result);
         }
     }
+
+    @ApiModelProperty(value = "展示下发给承运商的车序号和物资")
+    @PostMapping("/getCarrierTruckNoAndMaterialList")
+    public RESTfulResult getCarrierTruckNoAndMaterialList(@RequestBody Map<String,Object> map) {
+        List<Map<String,Object>> mapList = amsSaleOrderService.getCarrierTruckNoAndMaterialList(map);
+        return success(mapList);
+    }
 }

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

@@ -78,7 +78,7 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
     // 得到销售订单已分配的车数
     BigDecimal getCarNum(BigDecimal saleOrderId);
     // 查询销售订单下的车序号和物资
-    List<Map<String, Object>> getTruckNoAndMaterial(BigDecimal saleOrderId);
+    List<Map<String, Object>> getTruckNoAndMaterial(Map<String,Object> map);
     // 根据详细地址匹配省市县
     BigDecimal getAddressByPlace(BigDecimal placeId);
     // 根据省市县匹配承运商

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

@@ -159,4 +159,6 @@ public interface IAmsSaleOrderService {
     int updateCapacityNumberInFactory(Map<String, Object> mapValue);
     // 得到销售订单物资表主键
     List<Map<String, Object>> getSaleMaterialId(BigDecimal saleOrderMaterialId);
+    // 查询下发给承运商的车序号信息
+    List<Map<String, Object>> getCarrierTruckNoAndMaterialList(Map<String, Object> map);
 }

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

@@ -706,7 +706,9 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
      */
     @Override
     public List<Map<String, Object>> getTruckNoAndMaterialList(BigDecimal saleOrderId) {
-        List<Map<String,Object>> mapList = amsSaleOrderMapper.getTruckNoAndMaterial(saleOrderId);
+        HashMap<String,Object> mapValue = new HashMap<>();
+        mapValue.put("saleOrderId",saleOrderId);
+        List<Map<String,Object>> mapList = amsSaleOrderMapper.getTruckNoAndMaterial(mapValue);
         for (Map<String,Object> map : mapList) {
             BigDecimal placeId = (BigDecimal) map.get("placeId");
             if (placeId != null) {
@@ -1604,4 +1606,26 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     public List<Map<String, Object>> getSaleMaterialId(BigDecimal saleOrderMaterialId) {
         return amsSaleOrderMapper.getSaleMaterialId(saleOrderMaterialId);
     }
+
+    /**
+     * 展示下发给承运商的车序号和物资
+     * @param map
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getCarrierTruckNoAndMaterialList(Map<String,Object> map) {
+        Object carrierSsoId = map.get("carrierSsoId");
+        if (carrierSsoId != null && ("".equals(carrierSsoId)) || "null".equals(carrierSsoId) || "undefined".equals(carrierSsoId)) {
+            map.replace("carrierSsoId",null);
+        }
+        List<Map<String,Object>> mapList = amsSaleOrderMapper.getTruckNoAndMaterial(map);
+        for (Map<String,Object> mapValue : mapList) {
+            BigDecimal placeId = (BigDecimal) mapValue.get("placeId");
+            if (placeId != null) {
+                List<Map<String, Object>> carrierAndPriceList = getCarrierByPlace(placeId);
+                mapValue.put("carrierAndPriceList", carrierAndPriceList);
+            }
+        }
+        return mapList;
+    }
 }

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

@@ -1955,7 +1955,11 @@
     RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "nameSpecificationModel",
     RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS AS "addressPlace",
     ASM.SALE_WAREHOUSE "saleWareHouse",
-    a_s_order.DELETED "deleted"
+    a_s_order.DELETED "deleted",
+    a_s_order.SHIPPER_ID "shipperId",
+    a_s_order.RECEIVE_ID "receiveId",
+    a_s_order.SALE_ORDER_ISSELF_MENTION "isSelfMention",
+    a_s_order.SALER_ID "salerId"
     from AMS_SALE_ORDER a_s_order
     left join RMS_SHIPPER r_shipper
     on a_s_order.SHIPPER_ID=r_shipper.SHIPPER_ID
@@ -2448,7 +2452,7 @@
     WHERE ASOM.SALE_ORDER_ID = #{saleOrderId}
   </select>
 
-  <select id="getTruckNoAndMaterial" parameterType="DECIMAL" resultType="java.util.Map" >
+  <select id="getTruckNoAndMaterial" parameterType="java.util.Map" resultType="java.util.Map" >
     SELECT DISTINCT ASOM.SALE_ORDER_MATERIAL_TRUCK_NO              AS "truckNo",
                     RM.MATERIAL_NAME                               AS "materialName",
                     ASM.MATERIAL_ID                                AS "materialId",
@@ -2488,6 +2492,9 @@
            LEFT JOIN RMS_CARRIER RCA
                      ON RCA.CARRIER_ID = ADSO.CARRIER_ID
     WHERE ASOM.SALE_ORDER_ID = #{saleOrderId}
+      <if test="carrierSsoId != null" >
+        RCA.CARRIER_SSO_ID = #{carrierSsoId}
+      </if>
       AND OO.ORDER_ID IS NULL
       AND ADSO.DISPATCH_ID IS NOT NULL
     ORDER BY ASOM.SALE_ORDER_MATERIAL_TRUCK_NO ASC