Merge remote-tracking branch 'origin/master'

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

@@ -245,8 +245,6 @@ public class AmsContractTruckPriceController extends BaseRESTfulController {
         List<Map<String, Object>> saleOrderList = amsContractTruckPriceService.getAddressDeliveryAddress(mapValue);
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,saleOrderList);
         return success(pageList);
-
-
     }
 
     /**

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

@@ -496,10 +496,44 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsSaleOrder1 = amsSaleOrderService.getSaleOrderInfoes(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData4(apiId, null,amsSaleOrder1);
+        //调整列宽
+        List<Map<String, Object>> columnDataList = columnDataFeign.getColumnData(apiId);
+        int i=0;
+        for (Map<String, Object> columnData : columnDataList) {
+            //每个表头字段的过滤条件
+            if (i==0){
+                columnData.put("min-width","155px");
+            }else if (i==1){
+                columnData.put("min-width","127px");
+            }else if (i==2){
+                columnData.put("min-width","88px");
+            }else if (i==3){
+                columnData.put("min-width","98px");
+            }
+            columnData.put("filters", setListMap(amsSaleOrder1, columnData.get("prop").toString()));
+            i++;
+        }
+        PageListAdd pageList = new PageListAdd(amsSaleOrder1);
+        pageList.setColumnData(columnDataList);
+        //PageListAdd pageList = columnDataUtil.tableColumnData4(apiId, null,amsSaleOrder1);
         return success(pageList);
     }
 
+    //列宽调整条件
+    private Set<Map<String, Object>> setListMap(List<Map<String, Object>> list, String name) {
+        Set<Map<String, Object>> setString = new HashSet<>();
+        for (Map<String, Object> map : list) {//遍历每条数据
+            Map<String, Object> map1 = new HashMap<>();
+            //map.get(name)获取每条数据中对应表头字段的数据
+            map1.put("text", map.get(name));
+            if (map.get(name) != null) {
+                map1.put("value", map.get(name));
+                setString.add(map1);
+            }
+        }
+        return setString;
+    }
+
     @ApiOperation(value="查询已上报销售订单信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId(408)", value = "表头", required = false, dataType = "Interger")
@@ -578,7 +612,26 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> saleOrderList = amsSaleOrderService.getSaleOrderListBySaleCompanyes(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData4(apiId, null,saleOrderList);
+        //调整列宽
+        List<Map<String, Object>> columnDataList = columnDataFeign.getColumnData(apiId);
+        int i=0;
+        for (Map<String, Object> columnData : columnDataList) {
+            //每个表头字段的过滤条件
+            if (i==0){
+                columnData.put("min-width","155px");
+            }else if (i==1){
+                columnData.put("min-width","127px");
+            }else if (i==2){
+                columnData.put("min-width","88px");
+            }else if (i==3){
+                columnData.put("min-width","96px");
+            }
+            columnData.put("filters", setListMap(saleOrderList, columnData.get("prop").toString()));
+            i++;
+        }
+        PageListAdd pageList = new PageListAdd(saleOrderList);
+        pageList.setColumnData(columnDataList);
+        //PageListAdd pageList = columnDataUtil.tableColumnData4(apiId, null,saleOrderList);
         return success(pageList);
     }
 

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

@@ -164,4 +164,7 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
     BigDecimal selectSaleAreaIdByName(String saleArea);
 
     int bindSaleArea(@Param("receiveId") BigDecimal receiveId, @Param("saleAreaId") BigDecimal saleAreaId);
+
+    BigDecimal getMoreCarrier(String place);
+
 }

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

@@ -74,6 +74,8 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     @Autowired
     EASDeleteTestUtil easDeleteTestUtil;
     @Autowired
+    EASDeleteApproveUtil easDeleteApproveUtil;
+    @Autowired
     RmsMaterialMapper rmsMaterialMapper;
     @Autowired
     TmstrainPleaseApproveResultMapper tmstrainPleaseApproveResultMapper;
@@ -645,8 +647,12 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 if (amsSaleOrderMaterial.getSaleShippingAddressId() != null && isSelfMention.equals("否")) {
                     // 自动匹配承运商
                     List<Map<String, Object>> carrierList = getCarrierByAddress(amsSaleOrderMaterial.getSaleShippingAddressId());
+                    BigDecimal carrierCount = null;
+                    if(place != null && !"null".equals(place)){
+                        carrierCount = amsSaleOrderMapper.getMoreCarrier("%" + place + "%");
+                    }
                     // 单一承运商才进行匹配
-                    if (carrierList != null && carrierList.size() == 1) {
+                    if (carrierList != null && carrierList.size() == 1 && carrierCount.intValue() == 0) {
                         List<Map<String, Object>> list = new ArrayList<>();
                         Map<String, Object> map1 = carrierList.get(0);
                         // 传入车序号主键和承运商id
@@ -1057,7 +1063,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         amsSaleOrder.setDeleted(new BigDecimal(2));
         // 如果是已经上传金蝶的销售订单，则同步删除
         AmsSaleOrder amsSaleOrder1 = amsSaleOrderMapper.selectByPrimaryKey(saleOrderId);
-        if (amsSaleOrder1.getSaleOrderStatus().intValue() == 1 || amsSaleOrder1.getSaleOrderStatus().intValue() == 2 || amsSaleOrder1.getSaleOrderStatus().intValue() == 4) {
+        if (amsSaleOrder1.getSaleOrderStatus().intValue() == 4) {
             String reason = "修改物资关闭上一条销售订单";
             String number = amsSaleOrder1.getSaleNumber();
             String wholeOrder = "1";
@@ -1068,7 +1074,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             head.put("wholeOrder",wholeOrder);
             head.put("status",status);
             Map<String,Object> input = new HashMap<>();
-            Map<String, Object> totalMap = easDeleteUtil.getTotalMap();
+            Map<String, Object> totalMap = easDeleteApproveUtil.getTotalMap();
             input.put("head",head);
             totalMap.put("input",input);
             // 调用金蝶关闭接口
@@ -1076,6 +1082,14 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             System.out.println(json);
             Map<String,Object> resultMap = joinFeign.deleteSaleOrderToEas(totalMap);
             System.out.println(resultMap);
+        }else if(amsSaleOrder1.getSaleOrderStatus().intValue() == 1 || amsSaleOrder1.getSaleOrderStatus().intValue() == 2){
+            String reason = "修改物资关闭上一条销售订单";
+            String number = amsSaleOrder1.getSaleNumber();
+            Map<String, Object> deleteMap = new HashMap<>();
+            deleteMap.put("saleOrderId",saleOrderId);
+            deleteMap.put("reason",reason);
+            deleteMap.put("number",number);
+            deleteSaleOrderSame(deleteMap);
         }
         // 如果是副产品订单则关闭时同步关闭未进厂的运单
         Map<String,Object> map = new HashMap<>();
@@ -1643,29 +1657,20 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     @Override
     public int deleteSaleOrderSame(Map<String, Object> mapValue) {
         int result = 0;
+        BigDecimal saleOrderId = DataChange.dataToBigDecimal(mapValue.get("saleOrderId"));
         String reason = (String) mapValue.get("reason");
         String number = (String) mapValue.get("number");
-        String wholeOrder = "1";
-        String status = "close";
         Map<String,Object> head = new HashMap<>();
-        // 销售订单号
-        head.put("number",number);
-        // 关闭原因
-        head.put("reason",reason);
-        // 是否整单
-        head.put("wholeOrder",wholeOrder);
-        // 发送状态
-        head.put("status",status);
         Map<String,Object> input = new HashMap<>();
+        // 销售订单号
+        input.put("number",number);
         Map<String, Object> totalMap = easDeleteUtil.getTotalMap();
-        input.put("head",head);
         totalMap.put("input",input);
         // 调用金蝶关闭接口
         String json = JSONUtils.toJSONString(totalMap);
         System.out.println(json);
         Map<String,Object> resultMap = joinFeign.deleteSaleOrderToEas(totalMap);
         System.out.println(resultMap);
-        BigDecimal saleOrderId = DataChange.dataToBigDecimal(mapValue.get("saleOrderId"));
         AmsSaleOrder amsSaleOrder = new AmsSaleOrder();
         amsSaleOrder.setSaleOrderId(saleOrderId);
         amsSaleOrder.setDeleted(new BigDecimal(2));

src/main/java/com/steerinfo/dil/util/EASDeleteApproveUtil.java

@@ -0,0 +1,72 @@
+package com.steerinfo.dil.util;
+
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 配置金蝶正式环境连接常量Map
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/11/15 19:44
+ * @Version:V2.0
+ */
+@Component
+public class EASDeleteApproveUtil {
+    // totalMap
+    public final Map<String,Object> totalMap = new HashMap<>();
+    // context
+    public final Map<String,Object> context = new HashMap<>();
+    public final boolean logError = true;
+    public final boolean logData = true;
+    // context
+    public final Map<String,Object> login = new HashMap<>();
+    public final String password = "dgjt@kingdee";
+    public final String dcName = "FDDGEAS85";
+    public final String dbType = "0";
+    public final String userName = "user";
+    // context
+    public final String command = "saveSaleOrderBillHandler";
+
+    /**
+     * 得到context的map
+     * @return
+     */
+    public Map<String,Object> getContext(){
+        this.context.put("logError",logError);
+        this.context.put("logData",logData);
+        return this.context;
+    }
+
+    /**
+     * 得到login的map
+     * @return
+     */
+    public Map<String,Object> getLogin(){
+        this.login.put("password",password);
+        this.login.put("dcName",dcName);
+        this.login.put("dbType",dbType);
+        this.login.put("userName",userName);
+        return this.login;
+    }
+
+    /**
+     * 得到command字符串
+     * @return
+     */
+    public String getCommand(){
+        return this.command;
+    }
+
+    /**
+     * 将所有的配置放入到totalMap的map里面
+     * @return
+     */
+    public Map<String,Object> getTotalMap() {
+        totalMap.put("context",getContext());
+        totalMap.put("login",getLogin());
+        totalMap.put("command",getCommand());
+        return this.totalMap;
+    }
+}

src/main/java/com/steerinfo/dil/util/EASDeleteUtil.java

@@ -27,7 +27,7 @@ public class EASDeleteUtil {
     public final String dbType = "0";
     public final String userName = "user";
     // context
-    public final String command = "saveSaleOrderBillHandler";
+    public final String command = "deleteSaleOrderHandler";
 
     /**
      * 得到context的map

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

@@ -2218,80 +2218,111 @@
   <select id="getSaleOrderAndMaterialById" resultType="java.util.Map" parameterType="java.util.Map">
     SELECT *
     FROM (
-    select ASO.SALE_ORDER_ID as "saleOrderId",
-    ASM.SALE_MATERIAL_ID as "saleMaterialId",
-    RM.MATERIAL_ID as "materialId",
-    ASO.SALE_NUMBER as "saleNumber",
-    ASO.SALE_ORDER_ISSELF_MENTION as "saleOrderIsselfMention",
-    ASO.SALE_REMARK as "saleRemark",
-    RS.SHIPPER_NAME as "shipperName",
-    RC.CONSIGNEE_COMPANY_NAME as "consigneeCompanyName",
-    RM.MATERIAL_NAME as "materialName",
-    ASM.MATERIAL_NUMBER as "materialNumber",
-    ASM.MATERIAL_WEIGHT as "materialWeight",
-    ASM.SALE_WAREHOUSE as "saleWareHouse",
-    RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL as "specificationModel",
-    RM.MATERIAL_CODE as "materialCode",
-    nvl(sumWeight.weight,0)+nvl(sumWeight2.weight,0) as "totalWeight",
-    nvl(sumWeight.weight ,0) as "netWeight",
-    nvl(sumWeight2.weight ,0) as "weight",
-    nvl(carCount.coun ,0) as "carCount"
-    from AMS_SALE_ORDER ASO
-    left join RMS_SHIPPER RS
-    on ASO.SHIPPER_ID = RS.SHIPPER_ID
-    left join RMS_CONSIGNEE RC
-    on ASO.RECEIVE_ID = RC.CONSIGNEE_ID
-    left join AMS_SALE_MATERIAL ASM
-    on ASM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
-    left join RMS_MATERIAL RM
-    on RM.MATERIAL_ID = ASM.MATERIAL_ID
-    left join (
-    select sum( t_w_result.RESULT_NET_WEIGHT) weight,a_s_o_material.SALE_ORDER_ID SALE_ORDER_ID
-    from AMS_SALE_ORDER_MATERIAL a_s_o_material
-    left join Omstruck_Order o_order
-    on a_s_o_material.SALE_ORDER_MATERIAL_ID=o_order.order_plan_id
-    left join Tmstruck_Total_Result t_t_result
-    on o_order.order_id=t_t_result.order_id
-    left join Tmstruck_Weight_Result t_w_result
-    on t_t_result.result_total_id=t_w_result.result_total_id
-    where o_order.ORDER_TYPE=2
+    SELECT
+    ASO.SALE_ORDER_ID AS "saleOrderId",
+    ASM.SALE_MATERIAL_ID AS "saleMaterialId",
+    RM.MATERIAL_ID AS "materialId",
+    ASO.SALE_NUMBER AS "saleNumber",
+    ASO.SALE_ORDER_ISSELF_MENTION AS "saleOrderIsselfMention",
+    ASO.SALE_REMARK AS "saleRemark",
+    RS.SHIPPER_NAME AS "shipperName",
+    RC.CONSIGNEE_COMPANY_NAME AS "consigneeCompanyName",
+    RM.MATERIAL_NAME AS "materialName",
+    ASM.MATERIAL_NUMBER AS "materialNumber",
+    ASM.MATERIAL_WEIGHT AS "materialWeight",
+    ASM.SALE_WAREHOUSE AS "saleWareHouse",
+    RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL AS "specificationModel",
+    RM.MATERIAL_CODE AS "materialCode",
+    nvl( sumWeight.weight, 0 ) + nvl( sumWeight2.weight, 0 ) +  + nvl( sumWeight3.weight, 0 ) AS "totalWeight",
+    nvl( sumWeight.weight, 0 ) AS "netWeight",
+    nvl( sumWeight2.weight, 0 ) AS "weight",
+    nvl( carCount.coun, 0 ) + nvl( carCount1.coun, 0 ) AS "carCount"
+    FROM
+    AMS_SALE_ORDER ASO
+    LEFT JOIN RMS_SHIPPER RS ON ASO.SHIPPER_ID = RS.SHIPPER_ID
+    LEFT JOIN RMS_CONSIGNEE RC ON ASO.RECEIVE_ID = RC.CONSIGNEE_ID
+    LEFT JOIN AMS_SALE_MATERIAL ASM ON ASM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
+    LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = ASM.MATERIAL_ID
+    LEFT JOIN (
+    SELECT
+    sum( t_w_result.RESULT_NET_WEIGHT ) weight,
+    a_s_o_material.SALE_ORDER_ID SALE_ORDER_ID
+    FROM
+    AMS_SALE_ORDER_MATERIAL a_s_o_material
+    LEFT JOIN Omstruck_Order o_order ON a_s_o_material.SALE_ORDER_MATERIAL_ID = o_order.order_plan_id
+    LEFT JOIN Tmstruck_Total_Result t_t_result ON o_order.order_id = t_t_result.order_id
+    LEFT JOIN Tmstruck_Weight_Result t_w_result ON t_t_result.result_total_id = t_w_result.result_total_id
+    WHERE
+    o_order.ORDER_TYPE = 2
     GROUP BY
     a_s_o_Material.SALE_ORDER_ID
-    ) sumWeight
-    on sumWeight.SALE_ORDER_ID=ASO.SALE_ORDER_ID
-    left join (
-    select sum( o_o_material.ORDER_MATERIAL_WEIGHT) weight,a_s_o_Material.SALE_ORDER_ID SALE_ORDER_ID
-    from AMS_SALE_ORDER_MATERIAL a_s_o_material
-    left join Omstruck_Order o_order
-    on a_s_o_material.SALE_ORDER_MATERIAL_ID=o_order.order_plan_id
-    left join Tmstruck_Total_Result t_t_result
-    on o_order.order_id=t_t_result.order_id
-    left join Tmstruck_Weight_Result t_w_result
-    on t_t_result.result_total_id=t_w_result.result_total_id
-    left join OMSTRUCK_ORDER_MATERIAL o_o_material
-    on o_order.order_id=o_o_material.ORDER_ID
-    where t_w_result.RESULT_NET_WEIGHT is null and o_order.order_status in (2,4,5)
-    AND o_order.ORDER_TYPE=2
+    ) sumWeight ON sumWeight.SALE_ORDER_ID = ASO.SALE_ORDER_ID
+    LEFT JOIN (
+    SELECT
+    sum( o_o_material.ORDER_MATERIAL_WEIGHT ) weight,
+    a_s_o_Material.SALE_ORDER_ID SALE_ORDER_ID
+    FROM
+    AMS_SALE_ORDER_MATERIAL a_s_o_material
+    LEFT JOIN Omstruck_Order o_order ON a_s_o_material.SALE_ORDER_MATERIAL_ID = o_order.order_plan_id
+    LEFT JOIN Tmstruck_Total_Result t_t_result ON o_order.order_id = t_t_result.order_id
+    LEFT JOIN Tmstruck_Weight_Result t_w_result ON t_t_result.result_total_id = t_w_result.result_total_id
+    LEFT JOIN OMSTRUCK_ORDER_MATERIAL o_o_material ON o_order.order_id = o_o_material.ORDER_ID
+    WHERE
+    t_w_result.RESULT_NET_WEIGHT IS NULL
+    AND o_order.order_status IN ( 2, 5 )
+    AND o_order.ORDER_TYPE = 2
     GROUP BY
     a_s_o_Material.SALE_ORDER_ID
-    ) sumWeight2
-    on sumWeight2.SALE_ORDER_ID=ASO.SALE_ORDER_ID
-    left join (
-    select count(o_order.order_id) coun ,a_s_o_Material.SALE_ORDER_ID SALE_ORDER_ID
-    from AMS_SALE_ORDER_MATERIAL a_s_o_material
-    left join Omstruck_Order o_order
-    on a_s_o_material.SALE_ORDER_MATERIAL_ID=o_order.order_plan_id
-    left join Tmstruck_Total_Result t_t_result
-    on o_order.order_id=t_t_result.order_id
-    left join Tmstruck_Weight_Result t_w_result
-    on t_t_result.result_total_id=t_w_result.result_total_id
-    where o_order.order_status in (2,4,5)
-    AND o_order.ORDER_TYPE=2
+    ) sumWeight2 ON sumWeight2.SALE_ORDER_ID = ASO.SALE_ORDER_ID
+    LEFT JOIN (
+    SELECT
+    sum( o_o_material.ORDER_MATERIAL_WEIGHT ) weight,
+    a_s_o_Material.SALE_ORDER_ID SALE_ORDER_ID
+    FROM
+    AMS_SALE_ORDER_MATERIAL a_s_o_material
+    LEFT JOIN Omstruck_Order o_order ON a_s_o_material.SALE_ORDER_MATERIAL_ID = o_order.order_plan_id
+    LEFT JOIN Tmstruck_Total_Result t_t_result ON o_order.order_id = t_t_result.order_id
+    LEFT JOIN Tmstruck_Weight_Result t_w_result ON t_t_result.result_total_id = t_w_result.result_total_id
+    LEFT JOIN OMSTRUCK_ORDER_MATERIAL o_o_material ON o_order.order_id = o_o_material.ORDER_ID
+    WHERE
+    t_w_result.RESULT_NET_WEIGHT IS NULL
+    AND o_order.order_status = 4
+    AND o_order.ORDER_TYPE = 2
+    AND a_s_o_material.SALE_DATE_OF_RECEIPT  &lt; SYSDATE
     GROUP BY
     a_s_o_Material.SALE_ORDER_ID
-
-    ) carCount
-    on carCount.SALE_ORDER_ID=ASO.SALE_ORDER_ID
+    ) sumWeight3 ON sumWeight3.SALE_ORDER_ID = ASO.SALE_ORDER_ID
+    LEFT JOIN (
+    SELECT
+    count( o_order.order_id ) coun,
+    a_s_o_Material.SALE_ORDER_ID SALE_ORDER_ID
+    FROM
+    AMS_SALE_ORDER_MATERIAL a_s_o_material
+    LEFT JOIN Omstruck_Order o_order ON a_s_o_material.SALE_ORDER_MATERIAL_ID = o_order.order_plan_id
+    LEFT JOIN Tmstruck_Total_Result t_t_result ON o_order.order_id = t_t_result.order_id
+    LEFT JOIN Tmstruck_Weight_Result t_w_result ON t_t_result.result_total_id = t_w_result.result_total_id
+    WHERE
+    o_order.order_status IN ( 2, 5 )
+    AND o_order.ORDER_TYPE = 2
+    GROUP BY
+    a_s_o_Material.SALE_ORDER_ID
+    ) carCount ON carCount.SALE_ORDER_ID = ASO.SALE_ORDER_ID
+    LEFT JOIN (
+    SELECT
+    count( o_order.order_id ) coun,
+    a_s_o_Material.SALE_ORDER_ID SALE_ORDER_ID
+    FROM
+    AMS_SALE_ORDER_MATERIAL a_s_o_material
+    LEFT JOIN Omstruck_Order o_order ON a_s_o_material.SALE_ORDER_MATERIAL_ID = o_order.order_plan_id
+    LEFT JOIN Tmstruck_Total_Result t_t_result ON o_order.order_id = t_t_result.order_id
+    LEFT JOIN Tmstruck_Weight_Result t_w_result ON t_t_result.result_total_id = t_w_result.result_total_id
+    WHERE
+    o_order.order_status = 4
+    AND o_order.ORDER_TYPE = 2
+    AND a_s_o_material.SALE_DATE_OF_RECEIPT  &lt; SYSDATE
+    GROUP BY
+    a_s_o_Material.SALE_ORDER_ID
+    ) carCount1 ON carCount1.SALE_ORDER_ID = ASO.SALE_ORDER_ID
     where ASO.SALE_ORDER_ID = #{saleOrderId}
     )
     <where>
@@ -4517,4 +4548,8 @@
         SELECT RSA.AREA_ID FROM RMS_SALE_AREA RSA
         WHERE RSA.AREA_NAME = #{saleAreaName}
   </select>
+  <select id="getMoreCarrier" resultType="java.math.BigDecimal" parameterType="string">
+    SELECT count(RMCP.CARRIER_PLACE_ID) FROM RMS_MORE_CARRIER_PLACE RMCP
+    WHERE RMCP.CARRIER_PLACE_VALUE LIKE #{place}
+  </select>
 </mapper>