修改

pom.xml

@@ -111,7 +111,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <param>DIL_ROLE_ORGCODE_TABLE</param>
+                        <param>AMS_SALE_ORDER</param>
                     </tables>
                 </configuration>
                 <executions>

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

@@ -118,7 +118,7 @@ public class AmsSaleOrder implements IBasePO<BigDecimal> {
     private Date updateTime;
 
     /**
-     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,250)
      */
     @ApiModelProperty(value="记录创建或修改备注",required=false)
     private String insertUpdateRemark;
@@ -142,11 +142,53 @@ public class AmsSaleOrder implements IBasePO<BigDecimal> {
     private BigDecimal salerId;
 
     /**
-     * 销售订单类型：（空：化产焦炭和水渣，1：钢材，2：钒渣）(SALE_TYPE,DECIMAL,0)
+     * 销售订单类型：（空：化产焦炭和水渣，1：钢材，2：钒渣,4:内转钢材到异地库）(SALE_TYPE,DECIMAL,0)
      */
-    @ApiModelProperty(value="销售订单类型：（空：化产焦炭和水渣，1：钢材，2：钒渣）",required=false)
+    @ApiModelProperty(value="销售订单类型：（空：化产焦炭和水渣，1：钢材，2：钒渣,4:内转钢材到异地库）",required=false)
     private BigDecimal saleType;
 
+    /**
+     * 调出库存组织(TRANSFER_OUT_INVENTORY_ORG,VARCHAR,50)
+     */
+    @ApiModelProperty(value="调出库存组织",required=false)
+    private String transferOutInventoryOrg;
+
+    /**
+     * 调入库存组织(TRANSFER_IN_INVENTORY_ORG,VARCHAR,50)
+     */
+    @ApiModelProperty(value="调入库存组织",required=false)
+    private String transferInInventoryOrg;
+
+    /**
+     * 调出部门(TRANSFER_OUT_DEP,VARCHAR,50)
+     */
+    @ApiModelProperty(value="调出部门",required=false)
+    private String transferOutDep;
+
+    /**
+     * 调入部门(TRANSFER_IN_DEP,VARCHAR,50)
+     */
+    @ApiModelProperty(value="调入部门",required=false)
+    private String transferInDep;
+
+    /**
+     * 业务日期(BUSINESS_DATE,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="业务日期",required=false)
+    private Date businessDate;
+
+    /**
+     * 是否是车皮(WHETHER_THE_CAR,VARCHAR,20)
+     */
+    @ApiModelProperty(value="是否是车皮",required=false)
+    private String whetherTheCar;
+
+    /**
+     * 业务类型(BUSINESS_TYPE,VARCHAR,50)
+     */
+    @ApiModelProperty(value="业务类型",required=false)
+    private String businessType;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -343,6 +385,62 @@ public class AmsSaleOrder implements IBasePO<BigDecimal> {
         this.saleType = saleType;
     }
 
+    public String getTransferOutInventoryOrg() {
+        return transferOutInventoryOrg;
+    }
+
+    public void setTransferOutInventoryOrg(String transferOutInventoryOrg) {
+        this.transferOutInventoryOrg = transferOutInventoryOrg == null ? null : transferOutInventoryOrg.trim();
+    }
+
+    public String getTransferInInventoryOrg() {
+        return transferInInventoryOrg;
+    }
+
+    public void setTransferInInventoryOrg(String transferInInventoryOrg) {
+        this.transferInInventoryOrg = transferInInventoryOrg == null ? null : transferInInventoryOrg.trim();
+    }
+
+    public String getTransferOutDep() {
+        return transferOutDep;
+    }
+
+    public void setTransferOutDep(String transferOutDep) {
+        this.transferOutDep = transferOutDep == null ? null : transferOutDep.trim();
+    }
+
+    public String getTransferInDep() {
+        return transferInDep;
+    }
+
+    public void setTransferInDep(String transferInDep) {
+        this.transferInDep = transferInDep == null ? null : transferInDep.trim();
+    }
+
+    public Date getBusinessDate() {
+        return businessDate;
+    }
+
+    public void setBusinessDate(Date businessDate) {
+        this.businessDate = businessDate;
+    }
+
+    public String getWhetherTheCar() {
+        return whetherTheCar;
+    }
+
+    public void setWhetherTheCar(String whetherTheCar) {
+        this.whetherTheCar = whetherTheCar == null ? null : whetherTheCar.trim();
+    }
+
+    public String getBusinessType() {
+        return businessType;
+    }
+
+    public void setBusinessType(String businessType) {
+        this.businessType = businessType == null ? null : businessType.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -372,6 +470,13 @@ public class AmsSaleOrder implements IBasePO<BigDecimal> {
         sb.append(", closeStatus=").append(closeStatus);
         sb.append(", salerId=").append(salerId);
         sb.append(", saleType=").append(saleType);
+        sb.append(", transferOutInventoryOrg=").append(transferOutInventoryOrg);
+        sb.append(", transferInInventoryOrg=").append(transferInInventoryOrg);
+        sb.append(", transferOutDep=").append(transferOutDep);
+        sb.append(", transferInDep=").append(transferInDep);
+        sb.append(", businessDate=").append(businessDate);
+        sb.append(", whetherTheCar=").append(whetherTheCar);
+        sb.append(", businessType=").append(businessType);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -643,6 +643,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         amsSaleOrder.setUpdateTime(new Date());
         amsSaleOrder.setDeleted(new BigDecimal(0));
         amsSaleOrder.setSaleOrderStatus(new BigDecimal(0));
+        amsSaleOrder.setBusinessDate(new Date());
         // 税率默认13%
         amsSaleOrder.setSaleOrderTax("13%");
         // 含税单价某人4000

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

@@ -25,20 +25,30 @@
     <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="TRANSFER_OUT_INVENTORY_ORG" jdbcType="VARCHAR" property="transferOutInventoryOrg" />
+    <result column="TRANSFER_IN_INVENTORY_ORG" jdbcType="VARCHAR" property="transferInInventoryOrg" />
+    <result column="TRANSFER_OUT_DEP" jdbcType="VARCHAR" property="transferOutDep" />
+    <result column="TRANSFER_IN_DEP" jdbcType="VARCHAR" property="transferInDep" />
+    <result column="BUSINESS_DATE" jdbcType="TIMESTAMP" property="businessDate" />
+    <result column="WHETHER_THE_CAR" jdbcType="VARCHAR" property="whetherTheCar" />
+    <result column="BUSINESS_TYPE" jdbcType="VARCHAR" property="businessType" />
   </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
+    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, TRANSFER_OUT_INVENTORY_ORG, TRANSFER_IN_INVENTORY_ORG, TRANSFER_OUT_DEP, 
+    TRANSFER_IN_DEP, BUSINESS_DATE, WHETHER_THE_CAR, BUSINESS_TYPE
   </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.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.TRANSFER_OUT_INVENTORY_ORG, 
+    t.TRANSFER_IN_INVENTORY_ORG, t.TRANSFER_OUT_DEP, t.TRANSFER_IN_DEP, t.BUSINESS_DATE, 
+    t.WHETHER_THE_CAR, t.BUSINESS_TYPE
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM AMS_SALE_ORDER
@@ -117,6 +127,27 @@
       <if test="saleType != null">
         and SALE_TYPE = #{saleType}
       </if>
+      <if test="transferOutInventoryOrg != null and transferOutInventoryOrg != ''">
+        and TRANSFER_OUT_INVENTORY_ORG = #{transferOutInventoryOrg}
+      </if>
+      <if test="transferInInventoryOrg != null and transferInInventoryOrg != ''">
+        and TRANSFER_IN_INVENTORY_ORG = #{transferInInventoryOrg}
+      </if>
+      <if test="transferOutDep != null and transferOutDep != ''">
+        and TRANSFER_OUT_DEP = #{transferOutDep}
+      </if>
+      <if test="transferInDep != null and transferInDep != ''">
+        and TRANSFER_IN_DEP = #{transferInDep}
+      </if>
+      <if test="businessDate != null">
+        and TO_CHAR(BUSINESS_DATE,'yyyy-MM-dd') = #{businessDate}
+      </if>
+      <if test="whetherTheCar != null and whetherTheCar != ''">
+        and WHETHER_THE_CAR = #{whetherTheCar}
+      </if>
+      <if test="businessType != null and businessType != ''">
+        and BUSINESS_TYPE = #{businessType}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -190,6 +221,27 @@
       <if test="saleType != null">
         and SALE_TYPE = #{saleType}
       </if>
+      <if test="transferOutInventoryOrg != null and transferOutInventoryOrg != ''">
+        and TRANSFER_OUT_INVENTORY_ORG LIKE '%${transferOutInventoryOrg}%'
+      </if>
+      <if test="transferInInventoryOrg != null and transferInInventoryOrg != ''">
+        and TRANSFER_IN_INVENTORY_ORG LIKE '%${transferInInventoryOrg}%'
+      </if>
+      <if test="transferOutDep != null and transferOutDep != ''">
+        and TRANSFER_OUT_DEP LIKE '%${transferOutDep}%'
+      </if>
+      <if test="transferInDep != null and transferInDep != ''">
+        and TRANSFER_IN_DEP LIKE '%${transferInDep}%'
+      </if>
+      <if test="businessDate != null">
+        and TO_CHAR(BUSINESS_DATE,'yyyy-MM-dd') = #{businessDate}
+      </if>
+      <if test="whetherTheCar != null and whetherTheCar != ''">
+        and WHETHER_THE_CAR LIKE '%${whetherTheCar}%'
+      </if>
+      <if test="businessType != null and businessType != ''">
+        and BUSINESS_TYPE LIKE '%${businessType}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
@@ -265,6 +317,27 @@
     <if test="saleType != null">
       or SALE_TYPE = #{saleType}
     </if>
+    <if test="transferOutInventoryOrg != null and transferOutInventoryOrg != ''">
+      or TRANSFER_OUT_INVENTORY_ORG = #{transferOutInventoryOrg}
+    </if>
+    <if test="transferInInventoryOrg != null and transferInInventoryOrg != ''">
+      or TRANSFER_IN_INVENTORY_ORG = #{transferInInventoryOrg}
+    </if>
+    <if test="transferOutDep != null and transferOutDep != ''">
+      or TRANSFER_OUT_DEP = #{transferOutDep}
+    </if>
+    <if test="transferInDep != null and transferInDep != ''">
+      or TRANSFER_IN_DEP = #{transferInDep}
+    </if>
+    <if test="businessDate != null">
+      or TO_CHAR(BUSINESS_DATE,'yyyy-MM-dd') = '#{businessDate}'
+    </if>
+    <if test="whetherTheCar != null and whetherTheCar != ''">
+      or WHETHER_THE_CAR = #{whetherTheCar}
+    </if>
+    <if test="businessType != null and businessType != ''">
+      or BUSINESS_TYPE = #{businessType}
+    </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 +348,10 @@
                                 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, TRANSFER_OUT_INVENTORY_ORG,
+                                TRANSFER_IN_INVENTORY_ORG, TRANSFER_OUT_DEP,
+                                TRANSFER_IN_DEP, BUSINESS_DATE, WHETHER_THE_CAR,
+                                BUSINESS_TYPE)
     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 +360,10 @@
             #{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}, #{transferOutInventoryOrg,jdbcType=VARCHAR},
+            #{transferInInventoryOrg,jdbcType=VARCHAR}, #{transferOutDep,jdbcType=VARCHAR},
+            #{transferInDep,jdbcType=VARCHAR}, #{businessDate,jdbcType=TIMESTAMP}, #{whetherTheCar,jdbcType=VARCHAR},
+            #{businessType,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmsSaleOrder">
     insert into AMS_SALE_ORDER
@@ -358,6 +437,27 @@
       <if test="saleType != null">
         SALE_TYPE,
       </if>
+      <if test="transferOutInventoryOrg != null">
+        TRANSFER_OUT_INVENTORY_ORG,
+      </if>
+      <if test="transferInInventoryOrg != null">
+        TRANSFER_IN_INVENTORY_ORG,
+      </if>
+      <if test="transferOutDep != null">
+        TRANSFER_OUT_DEP,
+      </if>
+      <if test="transferInDep != null">
+        TRANSFER_IN_DEP,
+      </if>
+      <if test="businessDate != null">
+        BUSINESS_DATE,
+      </if>
+      <if test="whetherTheCar != null">
+        WHETHER_THE_CAR,
+      </if>
+      <if test="businessType != null">
+        BUSINESS_TYPE,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="saleOrderId != null">
@@ -429,6 +529,27 @@
       <if test="saleType != null">
         #{saleType,jdbcType=DECIMAL},
       </if>
+      <if test="transferOutInventoryOrg != null">
+        #{transferOutInventoryOrg,jdbcType=VARCHAR},
+      </if>
+      <if test="transferInInventoryOrg != null">
+        #{transferInInventoryOrg,jdbcType=VARCHAR},
+      </if>
+      <if test="transferOutDep != null">
+        #{transferOutDep,jdbcType=VARCHAR},
+      </if>
+      <if test="transferInDep != null">
+        #{transferInDep,jdbcType=VARCHAR},
+      </if>
+      <if test="businessDate != null">
+        #{businessDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="whetherTheCar != null">
+        #{whetherTheCar,jdbcType=VARCHAR},
+      </if>
+      <if test="businessType != null">
+        #{businessType,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmsSaleOrder">
@@ -454,7 +575,14 @@
         DELETED = #{deleted,jdbcType=DECIMAL},
         CLOSE_STATUS = #{closeStatus,jdbcType=DECIMAL},
         SALER_ID = #{salerId,jdbcType=DECIMAL},
-        SALE_TYPE = #{saleType,jdbcType=DECIMAL}
+        SALE_TYPE = #{saleType,jdbcType=DECIMAL},
+        TRANSFER_OUT_INVENTORY_ORG = #{transferOutInventoryOrg,jdbcType=VARCHAR},
+        TRANSFER_IN_INVENTORY_ORG = #{transferInInventoryOrg,jdbcType=VARCHAR},
+        TRANSFER_OUT_DEP = #{transferOutDep,jdbcType=VARCHAR},
+        TRANSFER_IN_DEP = #{transferInDep,jdbcType=VARCHAR},
+        BUSINESS_DATE = #{businessDate,jdbcType=TIMESTAMP},
+        WHETHER_THE_CAR = #{whetherTheCar,jdbcType=VARCHAR},
+        BUSINESS_TYPE = #{businessType,jdbcType=VARCHAR}
     where SALE_ORDER_ID = #{saleOrderId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmsSaleOrder">
@@ -526,6 +654,27 @@
       <if test="saleType != null">
         SALE_TYPE = #{saleType,jdbcType=DECIMAL},
       </if>
+      <if test="transferOutInventoryOrg != null">
+        TRANSFER_OUT_INVENTORY_ORG = #{transferOutInventoryOrg,jdbcType=VARCHAR},
+      </if>
+      <if test="transferInInventoryOrg != null">
+        TRANSFER_IN_INVENTORY_ORG = #{transferInInventoryOrg,jdbcType=VARCHAR},
+      </if>
+      <if test="transferOutDep != null">
+        TRANSFER_OUT_DEP = #{transferOutDep,jdbcType=VARCHAR},
+      </if>
+      <if test="transferInDep != null">
+        TRANSFER_IN_DEP = #{transferInDep,jdbcType=VARCHAR},
+      </if>
+      <if test="businessDate != null">
+        BUSINESS_DATE = #{businessDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="whetherTheCar != null">
+        WHETHER_THE_CAR = #{whetherTheCar,jdbcType=VARCHAR},
+      </if>
+      <if test="businessType != null">
+        BUSINESS_TYPE = #{businessType,jdbcType=VARCHAR},
+      </if>
     </set>
     where SALE_ORDER_ID = #{saleOrderId,jdbcType=DECIMAL}
   </update>
@@ -553,7 +702,10 @@
     INSERT_TIME, UPDATE_USERNAME,
     UPDATE_TIME, INSERT_UPDATE_REMARK,
     DELETED, CLOSE_STATUS, SALER_ID,
-    SALE_TYPE)
+    SALE_TYPE, TRANSFER_OUT_INVENTORY_ORG,
+    TRANSFER_IN_INVENTORY_ORG, TRANSFER_OUT_DEP,
+    TRANSFER_IN_DEP, BUSINESS_DATE,
+    WHETHER_THE_CAR, BUSINESS_TYPE)
     ( <foreach collection="list" item="item" separator="union all">
     select
     #{item.saleOrderId,jdbcType=DECIMAL},
@@ -566,7 +718,10 @@
     #{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.transferOutInventoryOrg,jdbcType=VARCHAR},
+    #{item.transferInInventoryOrg,jdbcType=VARCHAR}, #{item.transferOutDep,jdbcType=VARCHAR},
+    #{item.transferInDep,jdbcType=VARCHAR}, #{item.businessDate,jdbcType=TIMESTAMP},
+    #{item.whetherTheCar,jdbcType=VARCHAR}, #{item.businessType,jdbcType=VARCHAR} from dual
   </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
@@ -664,6 +819,34 @@
     <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>
+    ,TRANSFER_OUT_INVENTORY_ORG=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+      when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.transferOutInventoryOrg,jdbcType=VARCHAR}
+    </foreach>
+    ,TRANSFER_IN_INVENTORY_ORG=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+      when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.transferInInventoryOrg,jdbcType=VARCHAR}
+    </foreach>
+    ,TRANSFER_OUT_DEP=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+      when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.transferOutDep,jdbcType=VARCHAR}
+    </foreach>
+    ,TRANSFER_IN_DEP=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+      when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.transferInDep,jdbcType=VARCHAR}
+    </foreach>
+    ,BUSINESS_DATE=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+      when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.businessDate,jdbcType=TIMESTAMP}
+    </foreach>
+    ,WHETHER_THE_CAR=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+      when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.whetherTheCar,jdbcType=VARCHAR}
+    </foreach>
+    ,BUSINESS_TYPE=
+    <foreach close="end" collection="list" index="index" item="item" open="case SALE_ORDER_ID" separator=" ">
+      when #{item.saleOrderId,jdbcType=DECIMAL} then #{item.businessType,jdbcType=VARCHAR}
+    </foreach>
     where SALE_ORDER_ID in
     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
       #{item.saleOrderId,jdbcType=DECIMAL}
@@ -678,6 +861,8 @@
   </delete>
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
 
   <sql id="orderBy">
     <if test="orderField != null and orderField != ''">