'采购订单新增字段'

pom.xml

@@ -194,7 +194,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <table>AMSTRUCK_INWARD_PLAN</table>
+                        <table>AMS_PURCHASE_ORDER</table>
                     </tables>
                 </configuration>
                 <executions>

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

@@ -117,6 +117,18 @@ public class AmsPurchaseOrder implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="金蝶分录ID",required=false)
     private String easEntryId;
 
+    /**
+     * 是否一车多趟（0：否 1：是）(IS_MORE_TRIPS,DECIMAL,0)
+     */
+    @ApiModelProperty(value="是否一车多趟（0：否 1：是）",required=false)
+    private BigDecimal isMoreTrips;
+
+    /**
+     * 供应商屏蔽信息(SUPPLIER_SCREEN_INFO,VARCHAR,200)
+     */
+    @ApiModelProperty(value="供应商屏蔽信息",required=false)
+    private String supplierScreenInfo;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -273,6 +285,22 @@ public class AmsPurchaseOrder implements IBasePO<BigDecimal> {
         this.easEntryId = easEntryId == null ? null : easEntryId.trim();
     }
 
+    public BigDecimal getIsMoreTrips() {
+        return isMoreTrips;
+    }
+
+    public void setIsMoreTrips(BigDecimal isMoreTrips) {
+        this.isMoreTrips = isMoreTrips;
+    }
+
+    public String getSupplierScreenInfo() {
+        return supplierScreenInfo;
+    }
+
+    public void setSupplierScreenInfo(String supplierScreenInfo) {
+        this.supplierScreenInfo = supplierScreenInfo == null ? null : supplierScreenInfo.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -297,6 +325,8 @@ public class AmsPurchaseOrder implements IBasePO<BigDecimal> {
         sb.append(", deleted=").append(deleted);
         sb.append(", easPurchaseOrderId=").append(easPurchaseOrderId);
         sb.append(", easEntryId=").append(easEntryId);
+        sb.append(", isMoreTrips=").append(isMoreTrips);
+        sb.append(", supplierScreenInfo=").append(supplierScreenInfo);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -59,13 +59,16 @@ public class AmsPurchaseOrderServiceImpl implements IAmsPurchaseOrderService {
         String materialCode = (String) mapVal.get("materialCode");
         // 得到外轮船名
         String resultForeignShipName = (String) mapVal.get("resultForeignShipName");
+        // 得到卸货地点编号
+        Object plantAreaNum = mapVal.get("plantAreaNum");
+        // 得到供应商屏蔽信息
+        Object supplierScreenInfo = mapVal.get("supplierScreenInfo");
         Map<String, Object> map = new HashMap<>();
         map.put("materialCode", materialCode);
         BigDecimal materialId = amsPurchaseOrderMapper.getMaterialId(materialCode);
         map.put("resultForeignShipName", resultForeignShipName);
         // 得到批次
         BigDecimal batchId;
-//        if (amsPurchaseOrderMapper.getBatchId(map) == null) {
         DilBatch dilBatch = new DilBatch();
         dilBatch.setResultForeignShipName(resultForeignShipName);
         dilBatch.setMaterialId(materialId);
@@ -74,20 +77,14 @@ public class AmsPurchaseOrderServiceImpl implements IAmsPurchaseOrderService {
         dilBatch.setInsertUsername("admin");
         dilBatch.setUpdateUsername("admin");
         dilBatch.setInsertUpdateRemark("无");
-//        }
-//        else {
-//            batchId = amsPurchaseOrderMapper.getBatchId(map);
-//        }
         // 得到采购员
         String purchaseOrderBuyer = (String) mapVal.get("purchaseOrderBuyer");
-//        // 得到发货单位
-//        String sendUnit = (String) mapVal.get("sendUnit");
         // 得到采购组织
         String purchaseOrganization = (String) mapVal.get("purchaseOrganization");
         BigDecimal purchasingOrganizationId = amsPurchaseOrderMapper.getOrganizationId(purchaseOrganization);
         // 得到收货单位
-        String receiveUnit = (String) mapVal.get("receiveUnit");
-        BigDecimal shipperId = amsPurchaseOrderMapper.getShipperId(receiveUnit);
+//        String receiveUnit = (String) mapVal.get("receiveUnit");
+//        BigDecimal shipperId = amsPurchaseOrderMapper.getShipperId(receiveUnit);
         // 得到订货数量
         String purchaseOrderMaterialNumber = (String) mapVal.get("purchaseOrderMaterialNumber");
         // 得到订单日期
@@ -105,11 +102,19 @@ public class AmsPurchaseOrderServiceImpl implements IAmsPurchaseOrderService {
         BigDecimal supplierId = amsPurchaseOrderMapper.getSupplierId(supplierDutyParagraph);
         // 得到数据状态
         Integer dataStatus = (Integer) mapVal.get("dataStatus");
+        if (supplierScreenInfo != null) {
+            amsPurchaseOrder.setSupplierScreenInfo(supplierScreenInfo.toString());
+        }
         amsPurchaseOrder.setPurchaseOrderNo(purchaseOrderNo);
         amsPurchaseOrder.setPurchaseOrderBuyer(purchaseOrderBuyer);
         amsPurchaseOrder.setPuchaseOrderMaterialNumber(new BigDecimal(purchaseOrderMaterialNumber));
         amsPurchaseOrder.setSupplierUnitId(supplierId);
         amsPurchaseOrder.setReceiveUnitId(purchasingOrganizationId);
+        if (plantAreaNum != null) {
+            if (plantAreaNum.toString().equals("001")) {
+                purchasingOrganizationId = new BigDecimal(1);
+            }
+        }
         amsPurchaseOrder.setPurchasingOrganizationId(purchasingOrganizationId);
         amsPurchaseOrder.setEasPurchaseOrderId(EASPurchaseId);
         amsPurchaseOrder.setInsertTime(new Date());

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

@@ -20,19 +20,22 @@
     <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
     <result column="EAS_PURCHASE_ORDER_ID" jdbcType="VARCHAR" property="easPurchaseOrderId" />
     <result column="EAS_ENTRY_ID" jdbcType="VARCHAR" property="easEntryId" />
+    <result column="IS_MORE_TRIPS" jdbcType="DECIMAL" property="isMoreTrips" />
+    <result column="SUPPLIER_SCREEN_INFO" jdbcType="VARCHAR" property="supplierScreenInfo" />
   </resultMap>
   <sql id="columns">
-    PURCHASE_ORDER_ID, PURCHASE_ORDER_NO, BATCH_ID, PURCHASE_ORDER_DATE, SUPPLIER_UNIT_ID, 
-    PURCHASING_ORGANIZATION_ID, PURCHASE_ORDER_BUYER, PUCHASE_ORDER_MATERIAL_NUMBER, 
-    RECEIVE_UNIT_ID, PUCHASE_ORDER_DELIVERY_DATE, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
-    UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, EAS_PURCHASE_ORDER_ID, EAS_ENTRY_ID
+    PURCHASE_ORDER_ID, PURCHASE_ORDER_NO, BATCH_ID, PURCHASE_ORDER_DATE, SUPPLIER_UNIT_ID,
+    PURCHASING_ORGANIZATION_ID, PURCHASE_ORDER_BUYER, PUCHASE_ORDER_MATERIAL_NUMBER,
+    RECEIVE_UNIT_ID, PUCHASE_ORDER_DELIVERY_DATE, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
+    UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, EAS_PURCHASE_ORDER_ID, EAS_ENTRY_ID,
+    IS_MORE_TRIPS, SUPPLIER_SCREEN_INFO
   </sql>
   <sql id="columns_alias">
-    t.PURCHASE_ORDER_ID, t.PURCHASE_ORDER_NO, t.BATCH_ID, t.PURCHASE_ORDER_DATE, t.SUPPLIER_UNIT_ID, 
-    t.PURCHASING_ORGANIZATION_ID, t.PURCHASE_ORDER_BUYER, t.PUCHASE_ORDER_MATERIAL_NUMBER, 
-    t.RECEIVE_UNIT_ID, t.PUCHASE_ORDER_DELIVERY_DATE, t.INSERT_USERNAME, t.INSERT_TIME, 
-    t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED, t.EAS_PURCHASE_ORDER_ID, 
-    t.EAS_ENTRY_ID
+    t.PURCHASE_ORDER_ID, t.PURCHASE_ORDER_NO, t.BATCH_ID, t.PURCHASE_ORDER_DATE, t.SUPPLIER_UNIT_ID,
+    t.PURCHASING_ORGANIZATION_ID, t.PURCHASE_ORDER_BUYER, t.PUCHASE_ORDER_MATERIAL_NUMBER,
+    t.RECEIVE_UNIT_ID, t.PUCHASE_ORDER_DELIVERY_DATE, t.INSERT_USERNAME, t.INSERT_TIME,
+    t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED, t.EAS_PURCHASE_ORDER_ID,
+    t.EAS_ENTRY_ID, t.IS_MORE_TRIPS, t.SUPPLIER_SCREEN_INFO
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM AMS_PURCHASE_ORDER
@@ -41,7 +44,7 @@
     SELECT <include refid="columns_alias" /> FROM AMS_PURCHASE_ORDER t
   </sql>
   <sql id="where">
-    <where> 
+    <where>
       <if test="purchaseOrderId != null">
         and PURCHASE_ORDER_ID = #{purchaseOrderId}
       </if>
@@ -96,10 +99,16 @@
       <if test="easEntryId != null and easEntryId != ''">
         and EAS_ENTRY_ID = #{easEntryId}
       </if>
+      <if test="isMoreTrips != null">
+        and IS_MORE_TRIPS = #{isMoreTrips}
+      </if>
+      <if test="supplierScreenInfo != null and supplierScreenInfo != ''">
+        and SUPPLIER_SCREEN_INFO = #{supplierScreenInfo}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
-    <where> 
+    <where>
       <if test="purchaseOrderId != null">
         and PURCHASE_ORDER_ID = #{purchaseOrderId}
       </if>
@@ -154,6 +163,12 @@
       <if test="easEntryId != null and easEntryId != ''">
         and EAS_ENTRY_ID LIKE '%${easEntryId}%'
       </if>
+      <if test="isMoreTrips != null">
+        and IS_MORE_TRIPS = #{isMoreTrips}
+      </if>
+      <if test="supplierScreenInfo != null and supplierScreenInfo != ''">
+        and SUPPLIER_SCREEN_INFO LIKE '%${supplierScreenInfo}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
@@ -162,76 +177,84 @@
   </delete>
   <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
     delete from AMS_PURCHASE_ORDER
-    where 1!=1 
-      <if test="purchaseOrderNo != null and purchaseOrderNo != ''">
-        or PURCHASE_ORDER_NO = #{purchaseOrderNo}
-      </if>
-      <if test="batchId != null">
-        or BATCH_ID = #{batchId}
-      </if>
-      <if test="purchaseOrderDate != null">
-        or TO_CHAR(PURCHASE_ORDER_DATE,'yyyy-MM-dd') = '#{purchaseOrderDate}'
-      </if>
-      <if test="supplierUnitId != null">
-        or SUPPLIER_UNIT_ID = #{supplierUnitId}
-      </if>
-      <if test="purchasingOrganizationId != null">
-        or PURCHASING_ORGANIZATION_ID = #{purchasingOrganizationId}
-      </if>
-      <if test="purchaseOrderBuyer != null and purchaseOrderBuyer != ''">
-        or PURCHASE_ORDER_BUYER = #{purchaseOrderBuyer}
-      </if>
-      <if test="puchaseOrderMaterialNumber != null">
-        or PUCHASE_ORDER_MATERIAL_NUMBER = #{puchaseOrderMaterialNumber}
-      </if>
-      <if test="receiveUnitId != null">
-        or RECEIVE_UNIT_ID = #{receiveUnitId}
-      </if>
-      <if test="puchaseOrderDeliveryDate != null">
-        or TO_CHAR(PUCHASE_ORDER_DELIVERY_DATE,'yyyy-MM-dd') = '#{puchaseOrderDeliveryDate}'
-      </if>
-      <if test="insertUsername != null and insertUsername != ''">
-        or INSERT_USERNAME = #{insertUsername}
-      </if>
-      <if test="insertTime != null">
-        or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
-      </if>
-      <if test="updateUsername != null and updateUsername != ''">
-        or UPDATE_USERNAME = #{updateUsername}
-      </if>
-      <if test="updateTime != null">
-        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
-      </if>
-      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
-        or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
-      </if>
-      <if test="deleted != null">
-        or DELETED = #{deleted}
-      </if>
-      <if test="easPurchaseOrderId != null and easPurchaseOrderId != ''">
-        or EAS_PURCHASE_ORDER_ID = #{easPurchaseOrderId}
-      </if>
-      <if test="easEntryId != null and easEntryId != ''">
-        or EAS_ENTRY_ID = #{easEntryId}
-      </if>
+    where 1!=1
+    <if test="purchaseOrderNo != null and purchaseOrderNo != ''">
+      or PURCHASE_ORDER_NO = #{purchaseOrderNo}
+    </if>
+    <if test="batchId != null">
+      or BATCH_ID = #{batchId}
+    </if>
+    <if test="purchaseOrderDate != null">
+      or TO_CHAR(PURCHASE_ORDER_DATE,'yyyy-MM-dd') = '#{purchaseOrderDate}'
+    </if>
+    <if test="supplierUnitId != null">
+      or SUPPLIER_UNIT_ID = #{supplierUnitId}
+    </if>
+    <if test="purchasingOrganizationId != null">
+      or PURCHASING_ORGANIZATION_ID = #{purchasingOrganizationId}
+    </if>
+    <if test="purchaseOrderBuyer != null and purchaseOrderBuyer != ''">
+      or PURCHASE_ORDER_BUYER = #{purchaseOrderBuyer}
+    </if>
+    <if test="puchaseOrderMaterialNumber != null">
+      or PUCHASE_ORDER_MATERIAL_NUMBER = #{puchaseOrderMaterialNumber}
+    </if>
+    <if test="receiveUnitId != null">
+      or RECEIVE_UNIT_ID = #{receiveUnitId}
+    </if>
+    <if test="puchaseOrderDeliveryDate != null">
+      or TO_CHAR(PUCHASE_ORDER_DELIVERY_DATE,'yyyy-MM-dd') = '#{puchaseOrderDeliveryDate}'
+    </if>
+    <if test="insertUsername != null and insertUsername != ''">
+      or INSERT_USERNAME = #{insertUsername}
+    </if>
+    <if test="insertTime != null">
+      or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+    </if>
+    <if test="updateUsername != null and updateUsername != ''">
+      or UPDATE_USERNAME = #{updateUsername}
+    </if>
+    <if test="updateTime != null">
+      or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+    </if>
+    <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+      or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+    </if>
+    <if test="deleted != null">
+      or DELETED = #{deleted}
+    </if>
+    <if test="easPurchaseOrderId != null and easPurchaseOrderId != ''">
+      or EAS_PURCHASE_ORDER_ID = #{easPurchaseOrderId}
+    </if>
+    <if test="easEntryId != null and easEntryId != ''">
+      or EAS_ENTRY_ID = #{easEntryId}
+    </if>
+    <if test="isMoreTrips != null">
+      or IS_MORE_TRIPS = #{isMoreTrips}
+    </if>
+    <if test="supplierScreenInfo != null and supplierScreenInfo != ''">
+      or SUPPLIER_SCREEN_INFO = #{supplierScreenInfo}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.AmsPurchaseOrder">
-    insert into AMS_PURCHASE_ORDER (PURCHASE_ORDER_ID, PURCHASE_ORDER_NO, 
-      BATCH_ID, PURCHASE_ORDER_DATE, SUPPLIER_UNIT_ID, 
-      PURCHASING_ORGANIZATION_ID, PURCHASE_ORDER_BUYER, 
-      PUCHASE_ORDER_MATERIAL_NUMBER, RECEIVE_UNIT_ID, 
-      PUCHASE_ORDER_DELIVERY_DATE, INSERT_USERNAME, 
-      INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
-      INSERT_UPDATE_REMARK, DELETED, EAS_PURCHASE_ORDER_ID, 
-      EAS_ENTRY_ID)
-    values (#{purchaseOrderId,jdbcType=DECIMAL}, #{purchaseOrderNo,jdbcType=VARCHAR}, 
-      #{batchId,jdbcType=DECIMAL}, #{purchaseOrderDate,jdbcType=TIMESTAMP}, #{supplierUnitId,jdbcType=DECIMAL}, 
-      #{purchasingOrganizationId,jdbcType=DECIMAL}, #{purchaseOrderBuyer,jdbcType=VARCHAR}, 
-      #{puchaseOrderMaterialNumber,jdbcType=DECIMAL}, #{receiveUnitId,jdbcType=DECIMAL}, 
-      #{puchaseOrderDeliveryDate,jdbcType=TIMESTAMP}, #{insertUsername,jdbcType=VARCHAR}, 
-      #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{easPurchaseOrderId,jdbcType=VARCHAR}, 
-      #{easEntryId,jdbcType=VARCHAR})
+    insert into AMS_PURCHASE_ORDER (PURCHASE_ORDER_ID, PURCHASE_ORDER_NO,
+                                    BATCH_ID, PURCHASE_ORDER_DATE, SUPPLIER_UNIT_ID,
+                                    PURCHASING_ORGANIZATION_ID, PURCHASE_ORDER_BUYER,
+                                    PUCHASE_ORDER_MATERIAL_NUMBER, RECEIVE_UNIT_ID,
+                                    PUCHASE_ORDER_DELIVERY_DATE, INSERT_USERNAME,
+                                    INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
+                                    INSERT_UPDATE_REMARK, DELETED, EAS_PURCHASE_ORDER_ID,
+                                    EAS_ENTRY_ID, IS_MORE_TRIPS, SUPPLIER_SCREEN_INFO
+    )
+    values (#{purchaseOrderId,jdbcType=DECIMAL}, #{purchaseOrderNo,jdbcType=VARCHAR},
+            #{batchId,jdbcType=DECIMAL}, #{purchaseOrderDate,jdbcType=TIMESTAMP}, #{supplierUnitId,jdbcType=DECIMAL},
+            #{purchasingOrganizationId,jdbcType=DECIMAL}, #{purchaseOrderBuyer,jdbcType=VARCHAR},
+            #{puchaseOrderMaterialNumber,jdbcType=DECIMAL}, #{receiveUnitId,jdbcType=DECIMAL},
+            #{puchaseOrderDeliveryDate,jdbcType=TIMESTAMP}, #{insertUsername,jdbcType=VARCHAR},
+            #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
+            #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{easPurchaseOrderId,jdbcType=VARCHAR},
+            #{easEntryId,jdbcType=VARCHAR}, #{isMoreTrips,jdbcType=DECIMAL}, #{supplierScreenInfo,jdbcType=VARCHAR}
+           )
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmsPurchaseOrder">
     insert into AMS_PURCHASE_ORDER
@@ -290,6 +313,12 @@
       <if test="easEntryId != null">
         EAS_ENTRY_ID,
       </if>
+      <if test="isMoreTrips != null">
+        IS_MORE_TRIPS,
+      </if>
+      <if test="supplierScreenInfo != null">
+        SUPPLIER_SCREEN_INFO,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="purchaseOrderId != null">
@@ -346,27 +375,35 @@
       <if test="easEntryId != null">
         #{easEntryId,jdbcType=VARCHAR},
       </if>
+      <if test="isMoreTrips != null">
+        #{isMoreTrips,jdbcType=DECIMAL},
+      </if>
+      <if test="supplierScreenInfo != null">
+        #{supplierScreenInfo,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmsPurchaseOrder">
     update AMS_PURCHASE_ORDER
     set PURCHASE_ORDER_NO = #{purchaseOrderNo,jdbcType=VARCHAR},
-      BATCH_ID = #{batchId,jdbcType=DECIMAL},
-      PURCHASE_ORDER_DATE = #{purchaseOrderDate,jdbcType=TIMESTAMP},
-      SUPPLIER_UNIT_ID = #{supplierUnitId,jdbcType=DECIMAL},
-      PURCHASING_ORGANIZATION_ID = #{purchasingOrganizationId,jdbcType=DECIMAL},
-      PURCHASE_ORDER_BUYER = #{purchaseOrderBuyer,jdbcType=VARCHAR},
-      PUCHASE_ORDER_MATERIAL_NUMBER = #{puchaseOrderMaterialNumber,jdbcType=DECIMAL},
-      RECEIVE_UNIT_ID = #{receiveUnitId,jdbcType=DECIMAL},
-      PUCHASE_ORDER_DELIVERY_DATE = #{puchaseOrderDeliveryDate,jdbcType=TIMESTAMP},
-      INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
-      INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
-      UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
-      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
-      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
-      DELETED = #{deleted,jdbcType=DECIMAL},
-      EAS_PURCHASE_ORDER_ID = #{easPurchaseOrderId,jdbcType=VARCHAR},
-      EAS_ENTRY_ID = #{easEntryId,jdbcType=VARCHAR}
+        BATCH_ID = #{batchId,jdbcType=DECIMAL},
+        PURCHASE_ORDER_DATE = #{purchaseOrderDate,jdbcType=TIMESTAMP},
+        SUPPLIER_UNIT_ID = #{supplierUnitId,jdbcType=DECIMAL},
+        PURCHASING_ORGANIZATION_ID = #{purchasingOrganizationId,jdbcType=DECIMAL},
+        PURCHASE_ORDER_BUYER = #{purchaseOrderBuyer,jdbcType=VARCHAR},
+        PUCHASE_ORDER_MATERIAL_NUMBER = #{puchaseOrderMaterialNumber,jdbcType=DECIMAL},
+        RECEIVE_UNIT_ID = #{receiveUnitId,jdbcType=DECIMAL},
+        PUCHASE_ORDER_DELIVERY_DATE = #{puchaseOrderDeliveryDate,jdbcType=TIMESTAMP},
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+        DELETED = #{deleted,jdbcType=DECIMAL},
+        EAS_PURCHASE_ORDER_ID = #{easPurchaseOrderId,jdbcType=VARCHAR},
+        EAS_ENTRY_ID = #{easEntryId,jdbcType=VARCHAR},
+        IS_MORE_TRIPS = #{isMoreTrips,jdbcType=DECIMAL},
+        SUPPLIER_SCREEN_INFO = #{supplierScreenInfo,jdbcType=VARCHAR}
     where PURCHASE_ORDER_ID = #{purchaseOrderId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmsPurchaseOrder">
@@ -423,6 +460,12 @@
       <if test="easEntryId != null">
         EAS_ENTRY_ID = #{easEntryId,jdbcType=VARCHAR},
       </if>
+      <if test="isMoreTrips != null">
+        IS_MORE_TRIPS = #{isMoreTrips,jdbcType=DECIMAL},
+      </if>
+      <if test="supplierScreenInfo != null">
+        SUPPLIER_SCREEN_INFO = #{supplierScreenInfo,jdbcType=VARCHAR},
+      </if>
     </set>
     where PURCHASE_ORDER_ID = #{purchaseOrderId,jdbcType=DECIMAL}
   </update>
@@ -439,114 +482,124 @@
     <include refid="whereLike" />
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
-    insert into AMS_PURCHASE_ORDER 
-      (PURCHASE_ORDER_ID, 
-      PURCHASE_ORDER_NO, BATCH_ID, PURCHASE_ORDER_DATE, 
-      SUPPLIER_UNIT_ID, PURCHASING_ORGANIZATION_ID, 
-      PURCHASE_ORDER_BUYER, PUCHASE_ORDER_MATERIAL_NUMBER, 
-      RECEIVE_UNIT_ID, PUCHASE_ORDER_DELIVERY_DATE, 
-      INSERT_USERNAME, INSERT_TIME, 
-      UPDATE_USERNAME, UPDATE_TIME, 
-      INSERT_UPDATE_REMARK, DELETED, 
-      EAS_PURCHASE_ORDER_ID, EAS_ENTRY_ID
-      )
-    ( <foreach collection="list" item="item" separator="union all"> 
-   select  
-      #{item.purchaseOrderId,jdbcType=DECIMAL}, 
-      #{item.purchaseOrderNo,jdbcType=VARCHAR}, #{item.batchId,jdbcType=DECIMAL}, #{item.purchaseOrderDate,jdbcType=TIMESTAMP}, 
-      #{item.supplierUnitId,jdbcType=DECIMAL}, #{item.purchasingOrganizationId,jdbcType=DECIMAL}, 
-      #{item.purchaseOrderBuyer,jdbcType=VARCHAR}, #{item.puchaseOrderMaterialNumber,jdbcType=DECIMAL}, 
-      #{item.receiveUnitId,jdbcType=DECIMAL}, #{item.puchaseOrderDeliveryDate,jdbcType=TIMESTAMP}, 
-      #{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.easPurchaseOrderId,jdbcType=VARCHAR}, #{item.easEntryId,jdbcType=VARCHAR}
-       from dual  
-   </foreach> )
+    insert into AMS_PURCHASE_ORDER
+    (PURCHASE_ORDER_ID,
+    PURCHASE_ORDER_NO, BATCH_ID, PURCHASE_ORDER_DATE,
+    SUPPLIER_UNIT_ID, PURCHASING_ORGANIZATION_ID,
+    PURCHASE_ORDER_BUYER, PUCHASE_ORDER_MATERIAL_NUMBER,
+    RECEIVE_UNIT_ID, PUCHASE_ORDER_DELIVERY_DATE,
+    INSERT_USERNAME, INSERT_TIME,
+    UPDATE_USERNAME, UPDATE_TIME,
+    INSERT_UPDATE_REMARK, DELETED,
+    EAS_PURCHASE_ORDER_ID, EAS_ENTRY_ID,
+    IS_MORE_TRIPS, SUPPLIER_SCREEN_INFO
+    )
+    ( <foreach collection="list" item="item" separator="union all">
+    select
+    #{item.purchaseOrderId,jdbcType=DECIMAL},
+    #{item.purchaseOrderNo,jdbcType=VARCHAR}, #{item.batchId,jdbcType=DECIMAL}, #{item.purchaseOrderDate,jdbcType=TIMESTAMP},
+    #{item.supplierUnitId,jdbcType=DECIMAL}, #{item.purchasingOrganizationId,jdbcType=DECIMAL},
+    #{item.purchaseOrderBuyer,jdbcType=VARCHAR}, #{item.puchaseOrderMaterialNumber,jdbcType=DECIMAL},
+    #{item.receiveUnitId,jdbcType=DECIMAL}, #{item.puchaseOrderDeliveryDate,jdbcType=TIMESTAMP},
+    #{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.easPurchaseOrderId,jdbcType=VARCHAR}, #{item.easEntryId,jdbcType=VARCHAR},
+    #{item.isMoreTrips,jdbcType=DECIMAL}, #{item.supplierScreenInfo,jdbcType=VARCHAR}
+    from dual
+  </foreach> )
   </insert>
   <update id="batchUpdate" parameterType="java.util.List">
-     update AMS_PURCHASE_ORDER
-     set
-       PURCHASE_ORDER_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
-          when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.purchaseOrderId,jdbcType=DECIMAL}
-       </foreach>
-       ,PURCHASE_ORDER_NO=
-       <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
-          when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.purchaseOrderNo,jdbcType=VARCHAR}
-       </foreach>
-       ,BATCH_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
-          when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.batchId,jdbcType=DECIMAL}
-       </foreach>
-       ,PURCHASE_ORDER_DATE=
-       <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
-          when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.purchaseOrderDate,jdbcType=TIMESTAMP}
-       </foreach>
-       ,SUPPLIER_UNIT_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
-          when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.supplierUnitId,jdbcType=DECIMAL}
-       </foreach>
-       ,PURCHASING_ORGANIZATION_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
-          when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.purchasingOrganizationId,jdbcType=DECIMAL}
-       </foreach>
-       ,PURCHASE_ORDER_BUYER=
-       <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
-          when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.purchaseOrderBuyer,jdbcType=VARCHAR}
-       </foreach>
-       ,PUCHASE_ORDER_MATERIAL_NUMBER=
-       <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
-          when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.puchaseOrderMaterialNumber,jdbcType=DECIMAL}
-       </foreach>
-       ,RECEIVE_UNIT_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
-          when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.receiveUnitId,jdbcType=DECIMAL}
-       </foreach>
-       ,PUCHASE_ORDER_DELIVERY_DATE=
-       <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
-          when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.puchaseOrderDeliveryDate,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
-          when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,INSERT_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
-          when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,UPDATE_USERNAME=
-       <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
-          when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-       </foreach>
-       ,UPDATE_TIME=
-       <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
-          when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-       </foreach>
-       ,INSERT_UPDATE_REMARK=
-       <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
-          when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-       </foreach>
-       ,DELETED=
-       <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
-          when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
-       </foreach>
-       ,EAS_PURCHASE_ORDER_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
-          when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.easPurchaseOrderId,jdbcType=VARCHAR}
-       </foreach>
-       ,EAS_ENTRY_ID=
-       <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
-          when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.easEntryId,jdbcType=VARCHAR}
-       </foreach>
-     where PURCHASE_ORDER_ID in 
-     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-    #{item.purchaseOrderId,jdbcType=DECIMAL}
-     </foreach> 
+    update AMS_PURCHASE_ORDER
+    set
+    PURCHASE_ORDER_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
+      when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.purchaseOrderId,jdbcType=DECIMAL}
+    </foreach>
+    ,PURCHASE_ORDER_NO=
+    <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
+      when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.purchaseOrderNo,jdbcType=VARCHAR}
+    </foreach>
+    ,BATCH_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
+      when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.batchId,jdbcType=DECIMAL}
+    </foreach>
+    ,PURCHASE_ORDER_DATE=
+    <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
+      when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.purchaseOrderDate,jdbcType=TIMESTAMP}
+    </foreach>
+    ,SUPPLIER_UNIT_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
+      when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.supplierUnitId,jdbcType=DECIMAL}
+    </foreach>
+    ,PURCHASING_ORGANIZATION_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
+      when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.purchasingOrganizationId,jdbcType=DECIMAL}
+    </foreach>
+    ,PURCHASE_ORDER_BUYER=
+    <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
+      when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.purchaseOrderBuyer,jdbcType=VARCHAR}
+    </foreach>
+    ,PUCHASE_ORDER_MATERIAL_NUMBER=
+    <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
+      when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.puchaseOrderMaterialNumber,jdbcType=DECIMAL}
+    </foreach>
+    ,RECEIVE_UNIT_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
+      when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.receiveUnitId,jdbcType=DECIMAL}
+    </foreach>
+    ,PUCHASE_ORDER_DELIVERY_DATE=
+    <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
+      when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.puchaseOrderDeliveryDate,jdbcType=TIMESTAMP}
+    </foreach>
+    ,INSERT_USERNAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
+      when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,INSERT_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
+      when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,UPDATE_USERNAME=
+    <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
+      when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+    </foreach>
+    ,UPDATE_TIME=
+    <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
+      when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+    </foreach>
+    ,INSERT_UPDATE_REMARK=
+    <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
+      when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+    </foreach>
+    ,DELETED=
+    <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
+      when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+    </foreach>
+    ,EAS_PURCHASE_ORDER_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
+      when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.easPurchaseOrderId,jdbcType=VARCHAR}
+    </foreach>
+    ,EAS_ENTRY_ID=
+    <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
+      when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.easEntryId,jdbcType=VARCHAR}
+    </foreach>
+    ,IS_MORE_TRIPS=
+    <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
+      when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.isMoreTrips,jdbcType=DECIMAL}
+    </foreach>
+    ,SUPPLIER_SCREEN_INFO=
+    <foreach close="end" collection="list" index="index" item="item" open="case PURCHASE_ORDER_ID" separator=" ">
+      when #{item.purchaseOrderId,jdbcType=DECIMAL} then #{item.supplierScreenInfo,jdbcType=VARCHAR}
+    </foreach>
+    where PURCHASE_ORDER_ID in
+    <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+      #{item.purchaseOrderId,jdbcType=DECIMAL}
+    </foreach>
   </update>
   <delete id="batchDelete" parameterType="java.util.List">
     delete from AMS_PURCHASE_ORDER
-    where PURCHASE_ORDER_ID in 
+    where PURCHASE_ORDER_ID in
     <foreach close=")" collection="list" item="id" open="(" separator=",">
       #{id}
     </foreach>