修改

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

@@ -1308,4 +1308,22 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         List<Map<String,Object>> mapList = amsSaleOrderService.getKucunList(map);
         return success(mapList);
     }
+
+
+    @ApiOperation("批量新增销售订单")
+    @PostMapping("addSteelSaleOrderList")
+    public RESTfulResult addSteelSaleOrderList(@RequestBody List<Map<String,Object>> mapList){
+        int count = 0;
+        String saleOrderNo = null;
+        try {
+            for (Map<String,Object> map:mapList
+                 ) {
+                saleOrderNo = map.get("saleOrderNo").toString();
+                    count += amsSaleOrderService.addSteelSaleOrder(map);
+                }
+        } catch (Exception e) {
+            return failed("销售订单编号为:" + saleOrderNo + e.getMessage());
+        }
+        return success(count);
+    }
 }

src/main/resources/application-prod.yml

@@ -13,7 +13,7 @@ openfeign:
    ESFeign:
      url: ${ESFEIGN_URL:172.16.33.166:8089}
    ColumnDataFeign:
-     url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
+     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
    TmsTruckFeign:
       url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
    ImFeign:

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

@@ -1499,14 +1499,11 @@
 
   <select id="getSaleOrderInfoes" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
     select * from(
-    select a_s_order.SALE_ORDER_ID "saleOrderId",
+    SELECT a_s_order.SALE_ORDER_ID "saleOrderId",
     a_s_order.SALE_NUMBER "saleNumber",
     r_shipper.SHIPPER_NAME "shipperName",
     r_consignee.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
     a_s_order.SALE_ORDER_ISSELF_MENTION "saleOrderIsselfMention",
-    a_s_order.SALE_ACCOUNT_BALANCE "saleAccountBalance",
-    a_s_order.SALE_CURRENT_ORDER_AMOUNT "saleCurrentOrderAmount",
-    a_s_order.SALE_HISTORICAL_ORDER_AMOUNT "saleHistoricalOrderAmout",
     a_s_order.SALE_ORDER_RECEIVE_CUSTOMER "saleOrderReceiveCustomer",
     a_s_order.SALE_UNIT_PRICE "saleUnitPrice",
     a_s_order.SALE_ORDER_TAX "saleOrderTax",
@@ -1518,13 +1515,17 @@
     ASM.MATERIAL_NUMBER "materialNumber",
     RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "specificationModel",
     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",
-    ASOM.SALE_ORDER_MATERIAL_ID AS "saleOrderMaterialId"
-    from AMS_SALE_ORDER a_s_order
-    left join RMS_SHIPPER r_shipper
-    on a_s_order.SHIPPER_ID=r_shipper.SHIPPER_ID
-    left join RMS_CONSIGNEE r_consignee
-    on a_s_order.RECEIVE_ID=r_consignee.CONSIGNEE_ID
+    RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN ||
+    RRP.ADDRESS_DELIVERY_ADDRESS AS "addressPlace",
+    ASOM.SALE_ORDER_MATERIAL_ID AS "saleOrderMaterialId",
+    decode(ASM.IS_POUND_SALE, 0, '是' , '否') "isPoundSale",
+    ASOM.TRUCK_REMARK "trucRemark",
+    ASOM.SALE_ORDER_CONSIGNEE_TEL "consigneeTel"
+    FROM AMS_SALE_ORDER a_s_order
+    LEFT JOIN RMS_SHIPPER r_shipper
+    ON a_s_order.SHIPPER_ID = r_shipper.SHIPPER_ID
+    LEFT JOIN RMS_CONSIGNEE r_consignee
+    ON a_s_order.RECEIVE_ID = r_consignee.CONSIGNEE_ID
     LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
     ON ASOM.SALE_ORDER_ID = a_s_order.SALE_ORDER_ID
     LEFT JOIN RMS_RECEIVE_PLACE RRP
@@ -1539,8 +1540,9 @@
     ON RM.MATERIAL_ID = ASM.MATERIAL_ID
     LEFT JOIN RMS_SALER R_SALER
     ON R_SALER.SALER_ID = a_s_order.SALER_ID
-    where a_s_order.SALE_ORDER_STATUS=0 and a_s_order.DELETED=0
-    and ASM.DELETED IS NULL
+    WHERE a_s_order.SALE_ORDER_STATUS = 0
+    AND a_s_order.DELETED = 0
+    AND ASM.DELETED IS NULL
     <if test="con != null">
       and (instr(r_consignee.CONSIGNEE_COMPANY_NAME, #{con}) > 0 or instr(a_s_order.SALE_NUMBER, #{con}) > 0)
     </if>
@@ -1601,42 +1603,12 @@
           "saleOrderIsselfMention" like '%${item}%'
         </foreach>
       </if>
-      <if test="saleAccountBalance != null">
-        and
-        <foreach collection="saleAccountBalance" item="item" open="(" separator="or" close=")">
-          "saleAccountBalance" like '%${item}%'
-        </foreach>
-      </if>
-      <if test="saleCurrentOrderAmount != null">
-        and
-        <foreach collection="saleCurrentOrderAmount" item="item" open="(" separator="or" close=")">
-          "saleCurrentOrderAmount" like '%${item}%'
-        </foreach>
-      </if>
-      <if test="saleHistoricalOrderAmout != null">
-        and
-        <foreach collection="saleHistoricalOrderAmout" item="item" open="(" separator="or" close=")">
-          "saleHistoricalOrderAmout" like '%${item}%'
-        </foreach>
-      </if>
       <if test="saleOrderReceiveCustomer != null">
         and
         <foreach collection="saleOrderReceiveCustomer" item="item" open="(" separator="or" close=")">
           "saleOrderReceiveCustomer" like '%${item}%'
         </foreach>
       </if>
-      <if test="saleUnitPrice != null">
-        and
-        <foreach collection="saleUnitPrice" item="item" open="(" separator="or" close=")">
-          "saleUnitPrice" like '%${item}%'
-        </foreach>
-      </if>
-      <if test="saleOrderTax != null">
-        and
-        <foreach collection="saleOrderTax" item="item" open="(" separator="or" close=")">
-          "saleOrderTax" like '%${item}%'
-        </foreach>
-      </if>
       <if test="saleRemark != null">
         and
         <foreach collection="saleRemark" item="item" open="(" separator="or" close=")">

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

@@ -1349,10 +1349,10 @@
         <if test="planStatus != null">
             and AIP.PLAN_STATUS = #{planStatus}
         </if>
-        <if test="oneDate != null and planStatus !=3">
+        <if test="oneDate != null and planStatus not in(2, 3) ">
             and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= AIR.INSERT_TIME
         </if>
-        <if test="startDate != null and planStatus !=3">
+        <if test="startDate != null and planStatus not in(2, 3)">
             and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= AIR.INSERT_TIME
             and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= AIR.INSERT_TIME
         </if>