Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-AMS-API

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

@@ -34,9 +34,9 @@ public class AmsSaleOrderMaterial implements IBasePO<BigDecimal> {
     private BigDecimal saleShippingAddressId;
 
     /**
-     * 收货日期(SALE_DATE_OF_RECEIPT,TIMESTAMP,7)
+     * 发货日期(SALE_DATE_OF_RECEIPT,TIMESTAMP,7)
      */
-    @ApiModelProperty(value="收货日期",required=false)
+    @ApiModelProperty(value="发货日期",required=false)
     private Date saleDateOfReceipt;
 
     /**
@@ -94,11 +94,17 @@ public class AmsSaleOrderMaterial implements IBasePO<BigDecimal> {
     private BigDecimal updated;
 
     /**
-     * 下发状态(ISSUE_STATUS,DECIMAL,0)
+     * 下发状态(0:未下发；1:已下发 2:已下发给承运商)(ISSUE_STATUS,DECIMAL,0)
      */
-    @ApiModelProperty(value="下发状态",required=false)
+    @ApiModelProperty(value="下发状态(0:未下发；1:已下发 2:已下发给承运商)",required=false)
     private BigDecimal issueStatus;
 
+    /**
+     * 钢材收货日期(STEEL_RECEIPT_DATE,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="钢材收货日期",required=false)
+    private Date steelReceiptDate;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -231,6 +237,14 @@ public class AmsSaleOrderMaterial implements IBasePO<BigDecimal> {
         this.issueStatus = issueStatus;
     }
 
+    public Date getSteelReceiptDate() {
+        return steelReceiptDate;
+    }
+
+    public void setSteelReceiptDate(Date steelReceiptDate) {
+        this.steelReceiptDate = steelReceiptDate;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -252,6 +266,7 @@ public class AmsSaleOrderMaterial implements IBasePO<BigDecimal> {
         sb.append(", deleted=").append(deleted);
         sb.append(", updated=").append(updated);
         sb.append(", issueStatus=").append(issueStatus);
+        sb.append(", steelReceiptDate=").append(steelReceiptDate);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -221,7 +221,8 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
                 amsSaleOrderMaterial.setSaleOrderId(saleOrderId);
                 amsSaleOrderMaterial.setSaleOrderMaterialTruckNo(truckNo);
                 amsSaleOrderMaterial.setSaleShippingAddressId(shippingAddressId);
-                amsSaleOrderMaterial.setSaleDateOfReceipt(dateOfReceipt);
+                // 钢材收货日期
+                amsSaleOrderMaterial.setSteelReceiptDate(dateOfReceipt);
                 amsSaleOrderMaterial.setSaleOrderConsignee(orderConsignee);
                 if (orderConsignee != null) {
                     amsSaleOrderMaterial.setSaleOrderConsigneeTel(orderConsigneeTel.toString());
@@ -314,6 +315,9 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
             BigDecimal materialId = DataChange.dataToBigDecimal(map.get("materialId"));
             // 收货地址id
             BigDecimal saleShippingAddressId = DataChange.dataToBigDecimal(map.get("saleShippingAddressId"));
+            if (saleShippingAddressId.intValue() == 0) {
+                saleShippingAddressId = null;
+            }
             // 承运商id
             BigDecimal carrierId = DataChange.dataToBigDecimal(map.get("carrierId"));
             // 运输线路id
@@ -328,7 +332,7 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
             String consigneeName = String.valueOf(map.get("saleOrderConsignee"));
             // 收货方电话
             String consigneeTel = String.valueOf(map.get("saleOrderConsigneeTel"));
-            // 收货日期
+            // 发货日期
             String dateOfReceiptStr = String.valueOf(map.get("saleDateOfReceipt"));
             Date dateOfReceipt = null;
             if (!"null".equals(dateOfReceiptStr) && !"undefined".equals(dateOfReceiptStr)) {
@@ -410,7 +414,7 @@ public class AmsSaleOrderMaterialServiceImpl implements IAmsSaleOrderMaterialSer
             // 运单状态
             omstruckOrder.setOrderStatus(new BigDecimal(4));
             // 订单类型
-            omstruckOrder.setOrderType(new BigDecimal(1));
+            omstruckOrder.setOrderType(new BigDecimal(2));
             // 运输线路id
             omstruckOrder.setLineId(lineId);
             /*

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

@@ -408,7 +408,19 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
 
     @Override
     public List<Map<String, Object>> getSaleOrderListBySaleCompanyes(Map<String, Object> map) {
-        return amsSaleOrderMapper.getSaleOrderListBySaleCompanyes(map);
+        List<Map<String, Object>> resultList = amsSaleOrderMapper.getSaleOrderListBySaleCompanyes(map);
+        String statusStr;
+        for (Map<String, Object> resultMap : resultList) {
+            BigDecimal saleOrderStatus = (BigDecimal) resultMap.get("saleOrderStatus");
+            if (saleOrderStatus.intValue() == 2) {
+                statusStr = "销售公司已审核";
+            }
+            else {
+                statusStr = "财务已审核";
+            }
+            resultMap.put("statusStr",statusStr);
+        }
+        return resultList;
     }
 
     @Override

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

@@ -1607,7 +1607,8 @@
     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"
+    a_s_order.INSERT_TIME "insertTime",
+    a_s_order.SALE_ORDER_STATUS "saleOrderStatus"
     from AMS_SALE_ORDER a_s_order
     left join RMS_SHIPPER r_shipper
     on a_s_order.SHIPPER_ID=r_shipper.SHIPPER_ID

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

@@ -17,18 +17,19 @@
     <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
     <result column="UPDATED" jdbcType="DECIMAL" property="updated" />
     <result column="ISSUE_STATUS" jdbcType="DECIMAL" property="issueStatus" />
+    <result column="STEEL_RECEIPT_DATE" jdbcType="TIMESTAMP" property="steelReceiptDate" />
   </resultMap>
   <sql id="columns">
     SALE_ORDER_MATERIAL_ID, SALE_ORDER_ID, SALE_ORDER_MATERIAL_TRUCK_NO, SALE_SHIPPING_ADDRESS_ID, 
     SALE_DATE_OF_RECEIPT, SALE_ORDER_CONSIGNEE, SALE_ORDER_CONSIGNEE_TEL, INSERT_USERNAME, 
     INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, UPDATED, 
-    ISSUE_STATUS
+    ISSUE_STATUS, STEEL_RECEIPT_DATE
   </sql>
   <sql id="columns_alias">
     t.SALE_ORDER_MATERIAL_ID, t.SALE_ORDER_ID, t.SALE_ORDER_MATERIAL_TRUCK_NO, t.SALE_SHIPPING_ADDRESS_ID, 
     t.SALE_DATE_OF_RECEIPT, t.SALE_ORDER_CONSIGNEE, t.SALE_ORDER_CONSIGNEE_TEL, t.INSERT_USERNAME, 
     t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED, 
-    t.UPDATED, t.ISSUE_STATUS
+    t.UPDATED, t.ISSUE_STATUS, t.STEEL_RECEIPT_DATE
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM AMS_SALE_ORDER_MATERIAL
@@ -83,6 +84,9 @@
       <if test="issueStatus != null">
         and ISSUE_STATUS = #{issueStatus}
       </if>
+      <if test="steelReceiptDate != null">
+        and TO_CHAR(STEEL_RECEIPT_DATE,'yyyy-MM-dd') = #{steelReceiptDate}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -132,6 +136,9 @@
       <if test="issueStatus != null">
         and ISSUE_STATUS = #{issueStatus}
       </if>
+      <if test="steelReceiptDate != null">
+        and TO_CHAR(STEEL_RECEIPT_DATE,'yyyy-MM-dd') = #{steelReceiptDate}
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
@@ -183,6 +190,9 @@
       <if test="issueStatus != null">
         or ISSUE_STATUS = #{issueStatus}
       </if>
+      <if test="steelReceiptDate != null">
+        or TO_CHAR(STEEL_RECEIPT_DATE,'yyyy-MM-dd') = '#{steelReceiptDate}'
+      </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.AmsSaleOrderMaterial">
     insert into AMS_SALE_ORDER_MATERIAL (SALE_ORDER_MATERIAL_ID, SALE_ORDER_ID, 
@@ -191,14 +201,14 @@
       SALE_ORDER_CONSIGNEE_TEL, INSERT_USERNAME, 
       INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
       INSERT_UPDATE_REMARK, DELETED, UPDATED, 
-      ISSUE_STATUS)
+      ISSUE_STATUS, STEEL_RECEIPT_DATE)
     values (#{saleOrderMaterialId,jdbcType=DECIMAL}, #{saleOrderId,jdbcType=DECIMAL}, 
       #{saleOrderMaterialTruckNo,jdbcType=DECIMAL}, #{saleShippingAddressId,jdbcType=DECIMAL}, 
       #{saleDateOfReceipt,jdbcType=TIMESTAMP}, #{saleOrderConsignee,jdbcType=VARCHAR}, 
       #{saleOrderConsigneeTel,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR}, 
       #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
       #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{updated,jdbcType=DECIMAL}, 
-      #{issueStatus,jdbcType=DECIMAL})
+      #{issueStatus,jdbcType=DECIMAL}, #{steelReceiptDate,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmsSaleOrderMaterial">
     insert into AMS_SALE_ORDER_MATERIAL
@@ -248,6 +258,9 @@
       <if test="issueStatus != null">
         ISSUE_STATUS,
       </if>
+      <if test="steelReceiptDate != null">
+        STEEL_RECEIPT_DATE,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="saleOrderMaterialId != null">
@@ -295,6 +308,9 @@
       <if test="issueStatus != null">
         #{issueStatus,jdbcType=DECIMAL},
       </if>
+      <if test="steelReceiptDate != null">
+        #{steelReceiptDate,jdbcType=TIMESTAMP},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmsSaleOrderMaterial">
@@ -312,7 +328,8 @@
       INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
       DELETED = #{deleted,jdbcType=DECIMAL},
       UPDATED = #{updated,jdbcType=DECIMAL},
-      ISSUE_STATUS = #{issueStatus,jdbcType=DECIMAL}
+      ISSUE_STATUS = #{issueStatus,jdbcType=DECIMAL},
+      STEEL_RECEIPT_DATE = #{steelReceiptDate,jdbcType=TIMESTAMP}
     where SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmsSaleOrderMaterial">
@@ -360,6 +377,9 @@
       <if test="issueStatus != null">
         ISSUE_STATUS = #{issueStatus,jdbcType=DECIMAL},
       </if>
+      <if test="steelReceiptDate != null">
+        STEEL_RECEIPT_DATE = #{steelReceiptDate,jdbcType=TIMESTAMP},
+      </if>
     </set>
     where SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId,jdbcType=DECIMAL}
   </update>
@@ -384,7 +404,8 @@
       INSERT_USERNAME, INSERT_TIME, 
       UPDATE_USERNAME, UPDATE_TIME, 
       INSERT_UPDATE_REMARK, DELETED, 
-      UPDATED, ISSUE_STATUS)
+      UPDATED, ISSUE_STATUS, STEEL_RECEIPT_DATE
+      )
     ( <foreach collection="list" item="item" separator="union all"> 
    select  
       #{item.saleOrderMaterialId,jdbcType=DECIMAL}, 
@@ -394,7 +415,8 @@
       #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP}, 
       #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
       #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL}, 
-      #{item.updated,jdbcType=DECIMAL}, #{item.issueStatus,jdbcType=DECIMAL} from dual  
+      #{item.updated,jdbcType=DECIMAL}, #{item.issueStatus,jdbcType=DECIMAL}, #{item.steelReceiptDate,jdbcType=TIMESTAMP}
+       from dual  
    </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -460,6 +482,10 @@
        <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_MATERIAL_ID" separator=" ">
           when #{item.saleOrderMaterialId,jdbcType=DECIMAL} then #{item.issueStatus,jdbcType=DECIMAL}
        </foreach>
+       ,STEEL_RECEIPT_DATE=
+       <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_MATERIAL_ID" separator=" ">
+          when #{item.saleOrderMaterialId,jdbcType=DECIMAL} then #{item.steelReceiptDate,jdbcType=TIMESTAMP}
+       </foreach>
      where SALE_ORDER_MATERIAL_ID in 
      <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
     #{item.saleOrderMaterialId,jdbcType=DECIMAL}
@@ -650,34 +676,34 @@
 
   <select id="getTruckNoMaterialList" parameterType="DECIMAL" resultType="java.util.Map" >
     SELECT
-        RM.MATERIAL_ID AS "materialId",
-           RM.MATERIAL_NAME AS "materialName",
-           RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL AS "specificationModel",
-           RM.MATERIAL_CODE AS "materialCode",
-           ASTM.SALE_ORDER_MATERIAL_NUMBER AS "materialNumber"
-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 RMS_MATERIAL RM
-ON RM.MATERIAL_ID = ASM.MATERIAL_ID
-WHERE ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
+      RM.MATERIAL_ID AS "materialId",
+      RM.MATERIAL_NAME AS "materialName",
+      RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL AS "specificationModel",
+      RM.MATERIAL_CODE AS "materialCode",
+      ASTM.SALE_ORDER_MATERIAL_NUMBER AS "materialNumber"
+    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 RMS_MATERIAL RM
+                     ON RM.MATERIAL_ID = ASM.MATERIAL_ID
+    WHERE ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
   </select>
-  
+
   <select id="getSaleMaterialList" parameterType="DECIMAL" resultType="java.util.Map" >
-        SELECT
-        RM.MATERIAL_NAME AS "materialName",
-        RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL AS "specificationModel",
-        ASM.MATERIAL_NUMBER AS "materialNumber",
-        ASM.MATERIAL_WEIGHT AS "materialWeight"
-        FROM AMS_SALE_MATERIAL ASM
-        LEFT JOIN RMS_MATERIAL RM
-        ON ASM.MATERIAL_ID = RM.MATERIAL_ID
-        WHERE ASM.SALE_ORDER_ID = #{saleOrderId}
+    SELECT
+      RM.MATERIAL_NAME AS "materialName",
+      RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL AS "specificationModel",
+      ASM.MATERIAL_NUMBER AS "materialNumber",
+      ASM.MATERIAL_WEIGHT AS "materialWeight"
+    FROM AMS_SALE_MATERIAL ASM
+           LEFT JOIN RMS_MATERIAL RM
+                     ON ASM.MATERIAL_ID = RM.MATERIAL_ID
+    WHERE ASM.SALE_ORDER_ID = #{saleOrderId}
   </select>
 
-<!--  通过车牌号查询运力id-->
+  <!--  通过车牌号查询运力id-->
   <select id="getCapacityId" parameterType="java.lang.String" resultType="DECIMAL" >
     SELECT RC.CAPACITY_ID AS "capacityId"
     FROM RMS_CAPACITY RC
@@ -695,14 +721,14 @@ WHERE ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
   <select id="getMaterialNetWeightBySaleId" parameterType="DECIMAL" resultType="DECIMAL">
     select sum(TWR.RESULT_NET_WEIGHT)
     from TMSTRUCK_WEIGHT_RESULT TWR
-    left join TMSTRUCK_TOTAL_RESULT TTR
-    on TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
-    left join OMSTRUCK_ORDER OO
-    on OO.ORDER_ID = TTR.ORDER_ID
-    left join AMS_SALE_ORDER_MATERIAL ASOM
-    on ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
-    LEFT JOIN AMS_SALE_ORDER ASO
-    ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+           left join TMSTRUCK_TOTAL_RESULT TTR
+                     on TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
+           left join OMSTRUCK_ORDER OO
+                     on OO.ORDER_ID = TTR.ORDER_ID
+           left join AMS_SALE_ORDER_MATERIAL ASOM
+                     on ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+           LEFT JOIN AMS_SALE_ORDER ASO
+                     ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
     WHERE ASO.SALE_ORDER_ID = #{saleOrderId}
   </select>
 </mapper>