'销售AMS'

pom.xml

@@ -112,7 +112,7 @@
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
 <!--                        <param>AMS_SALE_ORDER</param>&lt;!&ndash;销售计划&ndash;&gt;-->
-                        <param>AMSSHIP_DELIVERY_NOTICE</param><!--销售计划物资中间表-->
+                        <param>AMS_SALE_ORDER</param><!--销售计划物资中间表-->
 <!--                        <param>AMSTRUCK_RAIL_DAYP·LAN</param>&lt;!&ndash;销售计划物资中间表&ndash;&gt;-->
 <!--                        <param>AMS_CONTRACT_TRANSPORT_PRICE</param>&lt;!&ndash;销售订单&ndash;&gt;-->
 <!--                        <param>RMS_RECEIVE_PLACE</param>&lt;!&ndash;销售订单车序号表&ndash;&gt;-->

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

@@ -73,6 +73,9 @@ public class AmsSaleOrderController extends BaseRESTfulController {
     EASUtil easUtil;
     @Autowired
     JoinFeign joinFeign;
+    @Autowired
+    EASCapacityTestUtil easCapacityTestUtil;
+    private final SimpleDateFormat sdfDateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
     @ApiOperation(value="查询未上报销售订单信息")
     @ApiImplicitParams({
@@ -480,13 +483,17 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                             Integer pageNum,
                                             Integer pageSize,
                                             String consigneeSsoId,
-                                            String con){
+                                            String con,
+                                            String startTime,
+                                            String endTime
+                                            ){
         if (consigneeSsoId != null && !"".equals(consigneeSsoId) && !"null".equals(consigneeSsoId)) {
             mapValue.put("consigneeSsoId",consigneeSsoId);
         }
         if (con != null && !"".equals(con) && !"null".equals(con)) {
             mapValue.put("con",con);
         }
+        DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsSaleOrder1 = amsSaleOrderService.getSaleOrderInfoes(mapValue);
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsSaleOrder1);
@@ -503,13 +510,16 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                                 Integer pageNum,
                                                 Integer pageSize,
                                                 String consigneeSsoId,
-                                                String con){
+                                                String con,
+                                                String startTime,
+                                                String endTime){
         if (consigneeSsoId != null && !"".equals(consigneeSsoId) && !"null".equals(consigneeSsoId)) {
             mapValue.put("consigneeSsoId",consigneeSsoId);
         }
         if (con != null && !"".equals(con) && !"null".equals(con)) {
             mapValue.put("con",con);
         }
+        DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsSaleOrder1 = amsSaleOrderService.getSaleOrderReportedes(mapValue);
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsSaleOrder1);
@@ -530,9 +540,9 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                                          String con,
                                                          Integer shipperId,
                                                          @RequestParam(required = false) Integer saleType,
-                                                         String consigneeSsoId
-//                                                         String startDate,
-//                                                         String endDate
+                                                         String consigneeSsoId,
+                                                         @RequestParam(required = false) String startTime,
+                                                         @RequestParam(required = false)String endTime
                                                          ) {
         if (con != null  && !"".equals(con) && !"null".equals(con)) {
             mapValue.put("con", con);
@@ -544,6 +554,9 @@ public class AmsSaleOrderController extends BaseRESTfulController {
             mapValue.put("consigneeSsoId",consigneeSsoId);
         }
         mapValue.put("saleType",saleType);
+        if (saleType != null) {
+            DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
+        }
 //        SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd");
 //        if(startDate != null  && !"".equals(startDate) && !"null".equals(startDate)){
 //            Date startTime=new Date(Long.parseLong(startDate));
@@ -690,6 +703,18 @@ public class AmsSaleOrderController extends BaseRESTfulController {
             return failed("匹配不到车牌号！");
         }
         else {
+//            for (Map<String, Object> map : mapList) {
+//                // 调用EAS接口将车牌号传给金蝶
+//                BigDecimal saleOrderMaterialId = (BigDecimal) 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);
+//                System.out.println(s);
+//            }
             return success(result);
         }
     }
@@ -1030,7 +1055,9 @@ public class AmsSaleOrderController extends BaseRESTfulController {
                                             Integer pageSize,
                                             Integer apiId,
                                             String con,
-                                                  String consigneeSsoId
+                                                  String consigneeSsoId,
+                                                  @RequestParam(required = false) String startTime,
+                                                  @RequestParam(required = false) String endTime
     ) {
         if (con != null && !"".equals(con) && !"null".equals(con)) {
             mapValue.put("con", con);
@@ -1038,6 +1065,7 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         if (consigneeSsoId != null && !"".equals(consigneeSsoId) && !"null".equals(consigneeSsoId)) {
             mapValue.put("consigneeSsoId", consigneeSsoId);
         }
+        DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
         //不分页筛选数据
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
@@ -1045,4 +1073,51 @@ public class AmsSaleOrderController extends BaseRESTfulController {
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, saleOrderList);
         return success(pageList);
     }
+
+    @ApiModelProperty(value = "展示所有状态销售订单列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "409/475", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getAllSteelSaleOrderList")
+    public RESTfulResult getAllSteelSaleOrderList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                         Integer pageNum,
+                                                         Integer pageSize,
+                                                         Integer apiId,
+                                                         String con,
+                                                         Integer shipperId,
+                                                         @RequestParam(required = false) Integer saleType,
+                                                         String consigneeSsoId
+//                                                         String startDate,
+//                                                         String endDate
+    ) {
+        if (con != null  && !"".equals(con) && !"null".equals(con)) {
+            mapValue.put("con", con);
+        }
+        if(shipperId != null  && !"".equals(shipperId) && !"null".equals(shipperId)){
+            mapValue.put("shipperId", shipperId);
+        }
+        if (consigneeSsoId != null  && !"".equals(consigneeSsoId) && !"null".equals(consigneeSsoId)) {
+            mapValue.put("consigneeSsoId",consigneeSsoId);
+        }
+        mapValue.put("saleType",saleType);
+//        SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd");
+//        if(startDate != null  && !"".equals(startDate) && !"null".equals(startDate)){
+//            Date startTime=new Date(Long.parseLong(startDate));
+//            String startTime1=simpleDateFormat.format(startTime);
+//            mapValue.put("startTime",startTime1);
+//        }
+//        if(endDate != null  && !"".equals(endDate) && !"null".equals(endDate)){
+//            Date endTime=new Date(Long.parseLong(endDate));
+//            String endTime1=simpleDateFormat.format(endTime);
+//            mapValue.put("endTime",endTime1);
+//        }
+        //不分页筛选数据
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> saleOrderList = amsSaleOrderService.getAllSteelSaleOrderList(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,saleOrderList);
+        return success(pageList);
+    }
 }

src/main/java/com/steerinfo/dil/feign/JoinFeign.java

@@ -14,12 +14,23 @@ import java.util.Map;
  */
 @FeignClient(value = "dil-join-api-dev", url = "${openfeign.JoinFeign.url}")
 public interface JoinFeign {
+    // 得到销售订单信息
     @PostMapping("/api/v1/join/amssaleorder/getSaleOrder")
     Map<String,Object> getSaleOrder(@RequestParam BigDecimal saleOrderId);
 
+    // 推送销售订单到金蝶
     @PostMapping("/api/v1/join/wsface/pushSaleOrderToEas")
     Map<String,Object> pushSaleOrderToEas(@RequestBody Map<String,Object> map);
 
+    // 同步关闭金蝶销售订单
     @PostMapping("/api/v1/join/wsface/deleteSaleOrderToEas")
     Map<String,Object> deleteSaleOrderToEas(@RequestBody Map<String,Object> map);
+
+    // 推送车牌号到金蝶
+    @PostMapping("/api/v1/join/wsface/pushCarNumberToEas")
+    Map<String,Object> pushCarNumberToEas(@RequestBody Map<String,Object> map);
+
+    // 查询车牌号和金蝶分录
+    @PostMapping("/api/v1/join/wsface/findCarNumberByOrderId")
+    Map<String,Object> findCarNumberByOrderId(@RequestParam BigDecimal saleOrderMaterialId);
 }

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

@@ -128,4 +128,6 @@ public interface AmsSaleOrderMapper extends IBaseMapper<AmsSaleOrder, BigDecimal
     int closeOrderNotIn(BigDecimal saleOrderId);
     // 展示反审批的销售订单
     List<Map<String, Object>> getSteelOrderDeletedList();
+    // 展示所有状态销售订单列表
+    List<Map<String, Object>> getAllSteelSaleOrderList(Map<String, Object> mapValue);
 }

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

@@ -28,4 +28,6 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     BigDecimal findMaxPrice(Object addressId);
 
     List<Map<String, Object>> findMaxPriceId(Map<String, Object> priceMap);
+
+    String findCarNumberByOrderId(BigDecimal orderId);
 }

src/main/java/com/steerinfo/dil/model/AmsSaleOrder.java

@@ -147,6 +147,12 @@ public class AmsSaleOrder implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="销售订单类型：（空：化产焦炭和水渣，1：钢材，2：钒渣）",required=false)
     private BigDecimal saleType;
 
+    /**
+     * 质保书份数(WARRANTY_NUMBER,DECIMAL,0)
+     */
+    @ApiModelProperty(value="质保书份数",required=false)
+    private BigDecimal warrantyNumber;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -343,6 +349,14 @@ public class AmsSaleOrder implements IBasePO<BigDecimal> {
         this.saleType = saleType;
     }
 
+    public BigDecimal getWarrantyNumber() {
+        return warrantyNumber;
+    }
+
+    public void setWarrantyNumber(BigDecimal warrantyNumber) {
+        this.warrantyNumber = warrantyNumber;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -372,6 +386,7 @@ public class AmsSaleOrder implements IBasePO<BigDecimal> {
         sb.append(", closeStatus=").append(closeStatus);
         sb.append(", salerId=").append(salerId);
         sb.append(", saleType=").append(saleType);
+        sb.append(", warrantyNumber=").append(warrantyNumber);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -153,4 +153,6 @@ public interface IAmsSaleOrderService {
     int deleteSaleOrderSame(Map<String, Object> mapValue);
     // 展示反审批的钢材订单
     List<Map<String, Object>> getSteelOrderDeletedList(Map<String, Object> mapValue);
+    // 展示所有状态销售订单列表
+    List<Map<String, Object>> getAllSteelSaleOrderList(Map<String, Object> mapValue);
 }

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

@@ -1535,4 +1535,14 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         List<Map<String, Object>> mapList = amsSaleOrderMapper.getSteelOrderDeletedList();
         return mapList;
     }
+
+    /**
+     * 展示所有状态销售订单列表
+     * @param mapValue
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getAllSteelSaleOrderList(Map<String, Object> mapValue) {
+        return amsSaleOrderMapper.getAllSteelSaleOrderList(mapValue);
+    }
 }

src/main/java/com/steerinfo/dil/util/EASCapacityTestUtil.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 EASCapacityTestUtil {
+    // 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 = "A004";
+    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/resources/bootstrap.yml

@@ -16,7 +16,7 @@ spring:
 eureka:
   client:
     service-url:
-      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.161}:${EUREKA_PORT:8081}/eureka/
+      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.166}:${EUREKA_PORT:8081}/eureka/
   instance:
     prefer-ip-address: true
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/

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

@@ -503,11 +503,17 @@
         "addressDeliveryAddress",
         ASOM.SALE_ORDER_CONSIGNEE AS "saleOrderConsignee",
         ASOM.SALE_ORDER_CONSIGNEE_TEL AS "saleOrderConsigneeTel",
+        ASOM.SALE_DATE_OF_RECEIPT AS "receiptDate",
         RCA.CARRIER_NAME AS "carrierName",
-        OO.ORDER_ID AS "orderId"
+        OO.ORDER_ID AS "orderId",
+        ASM.SALE_WAREHOUSE AS "saleWarehouse"
         FROM AMS_DISPATCH_SALE_ORDER ADSO
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
         ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_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 ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
         LEFT JOIN OMSTRUCK_ORDER OO
         ON OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
         AND OO.ORDER_TYPE IN (1,2)
@@ -555,7 +561,9 @@
         RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS AS "addressDeliveryAddress",
         ASOM.SALE_ORDER_CONSIGNEE AS "saleOrderConsignee",
         ASOM.SALE_ORDER_CONSIGNEE_TEL AS "saleOrderConsigneeTel",
-        ADSO.INSERT_TIME AS "insertTime"
+        ADSO.INSERT_TIME AS "insertTime",
+        ASOM.SALE_DATE_OF_RECEIPT AS "receiptDate",
+        ASM.SALE_WAREHOUSE AS "saleWareHouse"
         FROM AMS_DISPATCH_SALE_ORDER ADSO
         LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
         ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
@@ -569,6 +577,10 @@
         ON ASOM.SALE_SHIPPING_ADDRESS_ID = RRP.PLACE_ID
         LEFT JOIN RMS_RECEIVE_ADDRESS RRA
         ON RRP.ADDRESS_ID = RRA.ADDRESS_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 ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
         WHERE ADSO.DISPATCH_TYPE = #{dispatchType}
         AND ADSO.DISPATCH_STATUS = 0
         AND ADSO.DISPATCH_DEAL_TIME IS NULL

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

@@ -25,20 +25,21 @@
     <result column="CLOSE_STATUS" jdbcType="DECIMAL" property="closeStatus" />
     <result column="SALER_ID" jdbcType="DECIMAL" property="salerId" />
     <result column="SALE_TYPE" jdbcType="DECIMAL" property="saleType" />
+    <result column="WARRANTY_NUMBER" jdbcType="DECIMAL" property="warrantyNumber" />
   </resultMap>
   <sql id="columns">
     SALE_ORDER_ID, PLAN_ID, SALE_NUMBER, SHIPPER_ID, RECEIVE_ID, SALE_ACCOUNT_BALANCE,
     SALE_CURRENT_ORDER_AMOUNT, SALE_HISTORICAL_ORDER_AMOUNT, SALE_ORDER_STATUS, SALE_ORDER_RECEIVE_CUSTOMER,
     SALE_ORDER_ISSELF_MENTION, SALE_UNIT_PRICE, SALE_ORDER_TAX, SALE_REMARK, INSERT_USERNAME,
     INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, CLOSE_STATUS,
-    SALER_ID, SALE_TYPE
+    SALER_ID, SALE_TYPE, WARRANTY_NUMBER
   </sql>
   <sql id="columns_alias">
     t.SALE_ORDER_ID, t.PLAN_ID, t.SALE_NUMBER, t.SHIPPER_ID, t.RECEIVE_ID, t.SALE_ACCOUNT_BALANCE,
     t.SALE_CURRENT_ORDER_AMOUNT, t.SALE_HISTORICAL_ORDER_AMOUNT, t.SALE_ORDER_STATUS,
     t.SALE_ORDER_RECEIVE_CUSTOMER, t.SALE_ORDER_ISSELF_MENTION, t.SALE_UNIT_PRICE, t.SALE_ORDER_TAX,
     t.SALE_REMARK, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME,
-    t.INSERT_UPDATE_REMARK, t.DELETED, t.CLOSE_STATUS, t.SALER_ID, t.SALE_TYPE
+    t.INSERT_UPDATE_REMARK, t.DELETED, t.CLOSE_STATUS, t.SALER_ID, t.SALE_TYPE, t.WARRANTY_NUMBER
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM AMS_SALE_ORDER
@@ -117,6 +118,9 @@
       <if test="saleType != null">
         and SALE_TYPE = #{saleType}
       </if>
+      <if test="warrantyNumber != null">
+        and WARRANTY_NUMBER = #{warrantyNumber}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -190,6 +194,9 @@
       <if test="saleType != null">
         and SALE_TYPE = #{saleType}
       </if>
+      <if test="warrantyNumber != null">
+        and WARRANTY_NUMBER = #{warrantyNumber}
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
@@ -265,6 +272,9 @@
     <if test="saleType != null">
       or SALE_TYPE = #{saleType}
     </if>
+    <if test="warrantyNumber != null">
+      or WARRANTY_NUMBER = #{warrantyNumber}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.AmsSaleOrder">
     insert into AMS_SALE_ORDER (SALE_ORDER_ID, PLAN_ID, SALE_NUMBER,
@@ -275,7 +285,8 @@
                                 SALE_ORDER_TAX, SALE_REMARK, INSERT_USERNAME,
                                 INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
                                 INSERT_UPDATE_REMARK, DELETED, CLOSE_STATUS,
-                                SALER_ID, SALE_TYPE)
+                                SALER_ID, SALE_TYPE, WARRANTY_NUMBER
+    )
     values (#{saleOrderId,jdbcType=DECIMAL}, #{planId,jdbcType=DECIMAL}, #{saleNumber,jdbcType=VARCHAR},
             #{shipperId,jdbcType=DECIMAL}, #{receiveId,jdbcType=DECIMAL}, #{saleAccountBalance,jdbcType=DECIMAL},
             #{saleCurrentOrderAmount,jdbcType=DECIMAL}, #{saleHistoricalOrderAmount,jdbcType=DECIMAL},
@@ -284,7 +295,8 @@
             #{saleOrderTax,jdbcType=VARCHAR}, #{saleRemark,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR},
             #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
             #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{closeStatus,jdbcType=DECIMAL},
-            #{salerId,jdbcType=DECIMAL}, #{saleType,jdbcType=DECIMAL})
+            #{salerId,jdbcType=DECIMAL}, #{saleType,jdbcType=DECIMAL}, #{warrantyNumber,jdbcType=DECIMAL}
+           )
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmsSaleOrder">
     insert into AMS_SALE_ORDER
@@ -358,6 +370,9 @@
       <if test="saleType != null">
         SALE_TYPE,
       </if>
+      <if test="warrantyNumber != null">
+        WARRANTY_NUMBER,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="saleOrderId != null">
@@ -429,6 +444,9 @@
       <if test="saleType != null">
         #{saleType,jdbcType=DECIMAL},
       </if>
+      <if test="warrantyNumber != null">
+        #{warrantyNumber,jdbcType=DECIMAL},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmsSaleOrder">
@@ -454,7 +472,8 @@
         DELETED = #{deleted,jdbcType=DECIMAL},
         CLOSE_STATUS = #{closeStatus,jdbcType=DECIMAL},
         SALER_ID = #{salerId,jdbcType=DECIMAL},
-        SALE_TYPE = #{saleType,jdbcType=DECIMAL}
+        SALE_TYPE = #{saleType,jdbcType=DECIMAL},
+        WARRANTY_NUMBER = #{warrantyNumber,jdbcType=DECIMAL}
     where SALE_ORDER_ID = #{saleOrderId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmsSaleOrder">
@@ -526,6 +545,9 @@
       <if test="saleType != null">
         SALE_TYPE = #{saleType,jdbcType=DECIMAL},
       </if>
+      <if test="warrantyNumber != null">
+        WARRANTY_NUMBER = #{warrantyNumber,jdbcType=DECIMAL},
+      </if>
     </set>
     where SALE_ORDER_ID = #{saleOrderId,jdbcType=DECIMAL}
   </update>
@@ -553,7 +575,7 @@
     INSERT_TIME, UPDATE_USERNAME,
     UPDATE_TIME, INSERT_UPDATE_REMARK,
     DELETED, CLOSE_STATUS, SALER_ID,
-    SALE_TYPE)
+    SALE_TYPE, WARRANTY_NUMBER)
     ( <foreach collection="list" item="item" separator="union all">
     select
     #{item.saleOrderId,jdbcType=DECIMAL},
@@ -566,7 +588,7 @@
     #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
     #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
     #{item.deleted,jdbcType=DECIMAL}, #{item.closeStatus,jdbcType=DECIMAL}, #{item.salerId,jdbcType=DECIMAL},
-    #{item.saleType,jdbcType=DECIMAL} from dual
+    #{item.saleType,jdbcType=DECIMAL}, #{item.warrantyNumber,jdbcType=DECIMAL} from dual
   </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -664,6 +686,10 @@
     <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
       when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.saleType,jdbcType=DECIMAL}
     </foreach>
+    ,WARRANTY_NUMBER=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+      when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.warrantyNumber,jdbcType=DECIMAL}
+    </foreach>
     where SALE_ORDER_ID in
     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
       #{item.saleOrderId,jdbcType=DECIMAL}
@@ -1514,6 +1540,8 @@
     RM.MATERIAL_NAME "materialName",
     RM.MATERIAL_SPECIFICATION "materialSpecification",
     RM.MATERIAL_MODEL "materialModel",
+    ASM.MATERIAL_NUMBER "materialNumber",
+    RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "specificationModel",
     RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "nameSpecificationModel"
     from AMS_SALE_ORDER a_s_order
     left join RMS_SHIPPER r_shipper
@@ -1530,6 +1558,13 @@
     </if>
     <if test="consigneeSsoId != null" >
       and r_consignee.CONSIGNEE_SSO_ID = #{consigneeSsoId}
+    </if>
+    <if test="oneDate != null">
+      and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= a_s_order.UPDATE_TIME
+    </if>
+    <if test="startDate != null">
+      and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= a_s_order.UPDATE_TIME
+      and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= a_s_order.UPDATE_TIME
     </if>
         )
     <where>
@@ -1639,6 +1674,8 @@
     RM.MATERIAL_NAME "materialName",
     RM.MATERIAL_SPECIFICATION "materialSpecification",
     RM.MATERIAL_MODEL "materialModel",
+    RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "specificationModel",
+    ASM.MATERIAL_NUMBER "materialNumber",
     RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "nameSpecificationModel"
     from AMS_SALE_ORDER a_s_order
     left join RMS_SHIPPER r_shipper
@@ -1654,6 +1691,13 @@
     <if test="con != null">
       and (instr(r_consignee.CONSIGNEE_COMPANY_NAME, #{con}) > 0 or instr(a_s_order.SALE_NUMBER, #{con}) > 0)
     </if>
+    <if test="oneDate != null">
+      and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= a_s_order.UPDATE_TIME
+    </if>
+    <if test="startDate != null">
+      and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= a_s_order.UPDATE_TIME
+      and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= a_s_order.UPDATE_TIME
+    </if>
     <if test="consigneeSsoId != null">
       and r_consignee.CONSIGNEE_SSO_ID = #{consigneeSsoId}
     </if>
@@ -1765,7 +1809,7 @@
     a_s_order.SALE_ORDER_TAX "saleOrderTax",
     a_s_order.SALE_REMARK "saleRemark",
     a_s_order.INSERT_TIME "insertTime",
-    DECODE(a_s_order.SALE_ORDER_STATUS,2,'销售已审批',4,'财务已审批') "statusStr",
+    DECODE(a_s_order.SALE_ORDER_STATUS,2,'销售已提交',4,'财务已审批') "statusStr",
     RM.MATERIAL_NAME "materialName",
     a_s_order.CLOSE_STATUS "closeStatus"
     from AMS_SALE_ORDER a_s_order
@@ -1898,10 +1942,12 @@
     a_s_order.SALE_ORDER_TAX "saleOrderTax",
     a_s_order.SALE_REMARK "saleRemark",
     a_s_order.INSERT_TIME "insertTime",
-    DECODE(a_s_order.SALE_ORDER_STATUS,2,'销售已审批',4,'财务已审批') "statusStr",
+    DECODE(a_s_order.SALE_ORDER_STATUS,2,'销售已提交',4,'财务已审批') "statusStr",
     RM.MATERIAL_NAME "materialName",
     RM.MATERIAL_SPECIFICATION "materialSpecification",
     RM.MATERIAL_MODEL "materialModel",
+    RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "specificationModel",
+    ASM.MATERIAL_NUMBER "materialNumber",
     RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "nameSpecificationModel",
     ASM.SALE_WAREHOUSE "saleWareHouse"
     from AMS_SALE_ORDER a_s_order
@@ -1919,6 +1965,10 @@
     <if test="con != null">
       and (instr(r_consignee.CONSIGNEE_COMPANY_NAME, #{con}) > 0 or instr(a_s_order.SALE_NUMBER, #{con}) > 0)
     </if>
+    <if test="startDate != null">
+      and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= a_s_order.UPDATE_TIME
+      and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= a_s_order.UPDATE_TIME
+    </if>
     <if test="shipperId != null">
       and a_s_order.SHIPPER_ID = #{shipperId}
     </if>
@@ -2055,7 +2105,7 @@
     a_s_order.SALE_CURRENT_ORDER_AMOUNT "saleCurrentOrderAmount",
     a_s_order.SALE_HISTORICAL_ORDER_AMOUNT "saleHistoricalOrderAmout",
     a_s_order.SALE_ORDER_RECEIVE_CUSTOMER "saleOrderReceiveCustomer",
-    DECODE(a_s_order.SALE_ORDER_STATUS,2,'销售已审批',4,'财务已审批') "statusStr",
+    DECODE(a_s_order.SALE_ORDER_STATUS,2,'销售已提交',4,'财务已审批') "statusStr",
     a_s_order.SALE_UNIT_PRICE "saleUnitPrice",
     a_s_order.SALE_ORDER_TAX "saleOrderTax",
     a_s_order.SALE_REMARK "saleRemark",
@@ -2474,7 +2524,7 @@
     a_s_order.SALE_ORDER_TAX "saleOrderTax",
     a_s_order.SALE_REMARK "saleRemark",
     a_s_order.INSERT_TIME "insertTime",
-    DECODE(a_s_order.SALE_ORDER_STATUS,2,'销售已审批',4,'财务已审批') "statusStr",
+    DECODE(a_s_order.SALE_ORDER_STATUS,2,'销售已提交',4,'财务已审批') "statusStr",
     a_s_order.UPDATE_TIME "updateTime",
     RM.MATERIAL_NAME "materialName",
     RM.MATERIAL_SPECIFICATION "materialSpecification",
@@ -2629,7 +2679,7 @@
     a_s_order.SALE_REMARK "saleRemark",
     a_s_order.INSERT_TIME "insertTime",
     a_s_order.SALE_ORDER_STATUS "saleOrderStatus",
-    DECODE(a_s_order.SALE_ORDER_STATUS,2,'销售已审批',4,'财务已审批') "statusStr",
+    DECODE(a_s_order.SALE_ORDER_STATUS,2,'销售已提交',4,'财务已审批') "statusStr",
     RM.MATERIAL_NAME "materialName",
     RM.MATERIAL_SPECIFICATION "materialSpecification",
     RM.MATERIAL_MODEL "materialModel",
@@ -2765,7 +2815,7 @@
     RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS AS
     "addressDeliveryAddress",
     ASOM.SALE_DATE_OF_RECEIPT AS "saleDateOfReceipt",
-    DECODE(ASO.SALE_ORDER_STATUS,2, '销售已审批',4, '财务已审批')
+    DECODE(ASO.SALE_ORDER_STATUS,2, '销售已提交',4, '财务已审批')
     AS "approvalStatus",
     ASOM.SALE_ORDER_CONSIGNEE_TEL AS "saleOrderConsigneeTel",
     RSH.SHIPPER_NAME AS "shipperName",
@@ -2777,6 +2827,8 @@
     RM.MATERIAL_NAME AS "materialName",
     RM.MATERIAL_SPECIFICATION AS "materialSpecification",
     RM.MATERIAL_MODEL AS "materialModel",
+    RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL AS "specificationModel",
+    ASM.MATERIAL_NUMBER AS "materialNumber",
     RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL AS "nameSpecificationModel"
     FROM AMS_SALE_ORDER_MATERIAL ASOM
     LEFT JOIN AMS_SALE_ORDER ASO
@@ -2908,7 +2960,7 @@
     RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS AS
     "addressDeliveryAddress",
     ASOM.SALE_DATE_OF_RECEIPT AS "saleDateOfReceipt",
-    DECODE(ASO.SALE_ORDER_STATUS,2, '销售已审批',4, '财务已审批')
+    DECODE(ASO.SALE_ORDER_STATUS,2, '销售已提交',4, '财务已审批')
     AS "approvalStatus",
     ASOM.SALE_ORDER_CONSIGNEE_TEL AS "saleOrderConsigneeTel",
     RSH.SHIPPER_NAME AS "shipperName",
@@ -2921,7 +2973,9 @@
     RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL AS "nameSpecificationModel",
     RM.MATERIAL_NAME AS "materialName",
     RM.MATERIAL_SPECIFICATION AS "materialSpecification",
-    RM.MATERIAL_MODEL AS "materialModel"
+    RM.MATERIAL_MODEL AS "materialModel",
+    RM.MATERIAL_SPECIFICATION || MATERIAL_MODEL AS "specificationModel",
+    ASM.MATERIAL_NUMBER AS "materialNumber"
     FROM AMS_SALE_ORDER_MATERIAL ASOM
     LEFT JOIN AMS_SALE_ORDER ASO
     ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
@@ -3089,7 +3143,7 @@
     RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS AS
     "addressDeliveryAddress",
     ASOM.SALE_DATE_OF_RECEIPT AS "saleDateOfReceipt",
-    DECODE(ASO.SALE_ORDER_STATUS,2, '销售已审批',4, '财务已审批')
+    DECODE(ASO.SALE_ORDER_STATUS,2, '销售已提交',4, '财务已审批')
     AS "approvalStatus",
     ASOM.SALE_ORDER_CONSIGNEE_TEL AS "saleOrderConsigneeTel",
     RSH.SHIPPER_NAME AS "shipperName",
@@ -3102,7 +3156,11 @@
     RM.MATERIAL_NAME AS "materialName",
     RM.MATERIAL_SPECIFICATION AS "materialSpecification",
     RM.MATERIAL_MODEL AS "materialModel",
-    RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL AS "nameSpecificationModel"
+    RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL AS "specificationModel",
+    RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL AS "nameSpecificationModel",
+    RCP.CAPACITY_NUMBER AS "capacityNumber",
+    OO.DRIVER_TEL AS "drivelTel",
+    ASM.MATERIAL_NUMBER AS "materialNumber"
     FROM AMS_SALE_ORDER_MATERIAL ASOM
     LEFT JOIN AMS_SALE_ORDER ASO
     ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
@@ -3120,6 +3178,8 @@
     ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
     LEFT JOIN OMSTRUCK_ORDER OO
     ON OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
+    LEFT JOIN RMS_CAPACITY RCP
+    ON RCP.CAPACITY_ID = OO.CAPACITY_ID
     LEFT JOIN RMS_CARRIER RCA
     ON RCA.CARRIER_ID = ADSO.CARRIER_ID
     LEFT JOIN AMS_SALE_MATERIAL ASM
@@ -3493,7 +3553,7 @@
     a_s_order.SALE_ORDER_TAX "saleOrderTax",
     a_s_order.SALE_REMARK "saleRemark",
     a_s_order.INSERT_TIME "insertTime",
-    DECODE(a_s_order.SALE_ORDER_STATUS,2,'销售已审批',4,'财务已审批') "statusStr",
+    DECODE(a_s_order.SALE_ORDER_STATUS,2,'销售已提交',4,'财务已审批') "statusStr",
     RM.MATERIAL_NAME "materialName",
     ASM.MATERIAL_WEIGHT "materialWeight",
     ASM.SALE_WAREHOUSE "saleWareHouse",
@@ -3734,10 +3794,12 @@
     a_s_order.SALE_ORDER_TAX "saleOrderTax",
     a_s_order.SALE_REMARK "saleRemark",
     a_s_order.INSERT_TIME "insertTime",
-    DECODE(a_s_order.SALE_ORDER_STATUS,2,'销售已审批',4,'财务已审批') "statusStr",
+    DECODE(a_s_order.SALE_ORDER_STATUS,2,'销售已提交',4,'财务已审批') "statusStr",
     RM.MATERIAL_NAME "materialName",
     RM.MATERIAL_SPECIFICATION "materialSpecification",
     RM.MATERIAL_MODEL "materialModel",
+    RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "specificationModel",
+    ASM.MATERIAL_NUMBER "materialNumber",
     RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "nameSpecificationModel",
     ASM.SALE_WAREHOUSE "saleWareHouse"
     from AMS_SALE_ORDER a_s_order
@@ -3755,6 +3817,173 @@
     <if test="con != null">
       and (instr(r_consignee.CONSIGNEE_COMPANY_NAME, #{con}) > 0 or instr(a_s_order.SALE_NUMBER, #{con}) > 0)
     </if>
+    <if test="oneDate != null">
+      and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= a_s_order.UPDATE_TIME
+    </if>
+    <if test="startDate != null">
+      and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= a_s_order.UPDATE_TIME
+      and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= a_s_order.UPDATE_TIME
+    </if>
+    <if test="consigneeSsoId != null">
+      and r_consignee.CONSIGNEE_SSO_ID = #{consigneeSsoId}
+    </if>
+    ORDER BY a_s_order.UPDATE_TIME DESC
+    )
+    <where>
+      <if test="saleNumber != null">
+        <foreach collection="saleNumber" item="item" open="(" separator="or" close=")">
+          "saleNumber" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="materialName != null">
+        <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+          "materialName" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="materialSpecification != null">
+        <foreach collection="materialSpecification" item="item" open="(" separator="or" close=")">
+          "materialSpecification" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="materialModel != null">
+        <foreach collection="materialModel" item="item" open="(" separator="or" close=")">
+          "materialModel" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="statusStr != null">
+        <foreach collection="statusStr" item="item" open="(" separator="or" close=")">
+          and "statusStr" like '%${item}%'
+        </foreach>
+      </if>
+
+      <!--      <if test="startTime != null">-->
+      <!--        and "insertTime" &gt;= to_date('${startTime}','yyyy-mm-dd')-->
+      <!--      </if>-->
+      <!--      <if test="endTime != null">-->
+      <!--        and "insertTime" &lt;= to_date('${endTime}','yyyy-mm-dd')-->
+      <!--      </if>-->
+
+      <if test="shipperName != null">
+        and
+        <foreach collection="shipperName" item="item" open="(" separator="or" close=")">
+          "shipperName" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="consigneeCompanyName != null">
+        and
+        <foreach collection="consigneeCompanyName" item="item" open="(" separator="or" close=")">
+          "consigneeCompanyName" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="consigneeWarrantyAmount != null">
+        and
+        <foreach collection="consigneeWarrantyAmount" item="item" open="(" separator="or" close=")">
+          "consigneeWarrantyAmount" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="consigneeWarrantyWeight != null">
+        and
+        <foreach collection="consigneeWarrantyWeight" item="item" open="(" separator="or" close=")">
+          "consigneeWarrantyWeight" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="saleOrderIsselfMention != null">
+        and
+        <foreach collection="saleOrderIsselfMention" item="item" open="(" separator="or" close=")">
+          "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=")">
+          "saleRemark" like '%${item}%'
+        </foreach>
+      </if>
+    </where>
+  </select>
+
+  <select id="getAllSteelSaleOrderList" parameterType="java.util.Map" resultType="java.util.Map" >
+    select * from(
+    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",
+    r_consignee.CONSIGNEE_WARRANTY_AMOUNT "consigneeWarrantyAmount",
+    r_consignee.CONSIGNEE_WARRANTY_WEIGHT "consigneeWarrantyWeight",
+    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",
+    a_s_order.SALE_REMARK "saleRemark",
+    a_s_order.INSERT_TIME "insertTime",
+    DECODE(a_s_order.SALE_ORDER_STATUS || a_s_order.DELETED,00,'未上传',10,'已上传',20,'销售已提交',40,'财务已审批',21,'反审核',41,'反审核',22,'已关闭',42,'已关闭') "statusStr",
+    RM.MATERIAL_NAME "materialName",
+    RM.MATERIAL_SPECIFICATION "materialSpecification",
+    RM.MATERIAL_MODEL "materialModel",
+    RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "nameSpecificationModel",
+    ASM.SALE_WAREHOUSE "saleWareHouse"
+    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_MATERIAL ASM
+    ON ASM.SALE_ORDER_ID = a_s_order.SALE_ORDER_ID
+    LEFT JOIN RMS_MATERIAL RM
+    ON RM.MATERIAL_ID = ASM.MATERIAL_ID
+    where a_s_order.CLOSE_STATUS is null
+    and a_s_order.DELETED = 0
+    <if test="con != null">
+      and (instr(r_consignee.CONSIGNEE_COMPANY_NAME, #{con}) > 0 or instr(a_s_order.SALE_NUMBER, #{con}) > 0)
+    </if>
+    <if test="shipperId != null">
+      and a_s_order.SHIPPER_ID = #{shipperId}
+    </if>
+    <if test="saleType != null">
+      and a_s_order.SALE_TYPE = #{saleType}
+    </if>
+    <if test="saleType == null">
+      and a_s_order.SALE_TYPE is null
+    </if>
     <if test="consigneeSsoId != null">
       and r_consignee.CONSIGNEE_SSO_ID = #{consigneeSsoId}
     </if>

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

@@ -653,8 +653,13 @@
     ASO.SALE_ORDER_ISSELF_MENTION AS "isselfMention",
     ASOM.INSERT_TIME AS "insertTime",
     ASOM.SALE_ORDER_MATERIAL_ID AS "saleOrderMaterialId",
-    ASO.SALE_ORDER_ID AS "saleOrderId"
+    ASO.SALE_ORDER_ID AS "saleOrderId",
+    ASM.SALE_WAREHOUSE AS "saleWareHouse"
     FROM AMS_SALE_ORDER_MATERIAL ASOM
+    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 ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
     LEFT JOIN AMS_SALE_ORDER ASO
     ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
     LEFT JOIN RMS_RECEIVE_PLACE RRP

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

@@ -856,4 +856,12 @@
         WHERE RRA.ADDRESS_ID = #{addressId}
         AND ACTP.PRICE_VALUE = #{priceValue}
     </select>
+
+    <select id="findCarNumberByOrderId" parameterType="DECIMAL" resultType="java.lang.String" >
+        SELECT RC.CAPACITY_NUMBER AS "capacityNumber"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
 </mapper>