Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU2/DAL-DAZHOU-JOIN-API into dev

pom.xml

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

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

@@ -22,17 +22,13 @@ import java.io.IOException;
 @RequestMapping("/${api.version}/tmsTruckQualityResult")
 public class TmsTruckQualityResultController extends BaseRESTfulController {
 
-    @Autowired
-    TmsTruckQualityService tmsTruckQualityService;
-
-
+//    @Autowired
+//    TmsTruckQualityService tmsTruckQualityService;
 //    @ApiModelProperty(value = "发送磅单号,接收质检实绩信息")
 //    @GetMapping("/insert")
 //    @Transactional
-//    public RESTfulResult addQualityResult(String WzInputId) throws IOException, DocumentException {
-//
-//        return success(tmsTruckQualityService.insertQualityResult(WzInputId));
-//
+//    public RESTfulResult addQualityResult() throws IOException, DocumentException {
 //
+//        return success(tmsTruckQualityService.insertQualityResult());
 //    }
 }

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

@@ -0,0 +1,20 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import java.math.BigDecimal;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/10/8 22:02
+ */
+
+@FeignClient(value = "dil-bmstruck-api-dev", url = "${openfeign.BmsTruckFeign.url}")
+public interface BmsTruckFeign {
+
+    @PostMapping("api/v1/bmstruck/bmstruckdetailsorder/addDetailsOrder/{weightTaskResultId}")
+    public RESTfulResult addDetailsOrder(@PathVariable("weightTaskResultId") BigDecimal weightTaskResultId) throws Exception ;
+}

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

@@ -12,7 +12,7 @@ import java.util.Map;
 @Mapper
 public interface RmsMaterialMapper extends IBaseMapper<RmsMaterial, BigDecimal> {
 
-    @Select("select seq__RMS_MATERIAL.nextval from dual")
+    @Select("SELECT seq_RMS_MATERIAL.nextval FROM dual")
     BigDecimal getMaterialId();
 
     @Override

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

@@ -7,6 +7,7 @@ import java.math.*;
 import java.util.Map;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 
 @Mapper
 public interface TmstruckQualityResultMapper extends IBaseMapper<TmstruckQualityResult, BigDecimal> {
@@ -15,6 +16,9 @@ public interface TmstruckQualityResultMapper extends IBaseMapper<TmstruckQuality
 
     BigDecimal selectSamplePlaceId(String samplePlaceName);
 
-    BigDecimal Count();
+    // 得到销售订单主键
+    @Select("select seq_tmstruck_quality_result.nextval from dual")
+    BigDecimal qualityId();
+
 
 }

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

@@ -25,7 +25,7 @@ public interface TmstruckWeightResultMapper extends IBaseMapper<TmstruckWeightRe
 
     List<Map<String,Object>> selectWzInputId();
 
-    int updateWzInputId(String wzInputId);
+    int updateWzInputId(BigDecimal wzInputId);
 
     BigDecimal getWeightTaskResultId(String orderNumber);
 

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/model/AmsSaleMaterial.java

@@ -81,6 +81,12 @@ public class AmsSaleMaterial implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="逻辑删除 0:未删除 ；1：已删除",required=false)
     private BigDecimal deleted;
 
+    /**
+     * 仓库所在厂区(SALE_WAREHOUSE,VARCHAR,50)
+     */
+    @ApiModelProperty(value="仓库所在厂区",required=false)
+    private String saleWarehouse;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -189,6 +195,14 @@ public class AmsSaleMaterial implements IBasePO<BigDecimal> {
         this.deleted = deleted;
     }
 
+    public String getSaleWarehouse() {
+        return saleWarehouse;
+    }
+
+    public void setSaleWarehouse(String saleWarehouse) {
+        this.saleWarehouse = saleWarehouse == null ? null : saleWarehouse.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -207,6 +221,7 @@ public class AmsSaleMaterial implements IBasePO<BigDecimal> {
         sb.append(", updateTime=").append(updateTime);
         sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
         sb.append(", deleted=").append(deleted);
+        sb.append(", saleWarehouse=").append(saleWarehouse);
         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/java/com/steerinfo/dil/service/impl/AmsSaleOrderServiceImpl.java

@@ -13,6 +13,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -114,6 +116,9 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             String receiveUnit = (String) mapVal.get("receiveUnit");
             // 得到收货单位名称
             String receiveUnitName = (String) mapVal.get("receiveUnitName");
+            // 得到订单日期
+            String saleOrderBizDateStr = (String) mapVal.get("saleOrderBizDate");
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
             BigDecimal receiveId = amsSaleOrderMapper.getReceiveId(receiveUnit);
             // 如果不存则自己增收获单位
             if (receiveId == null) {
@@ -142,13 +147,19 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 amsSaleOrder.setSaleOrderId(saleOrderId);
                 amsSaleOrder.setSaleNumber(saleNumber);
                 amsSaleOrder.setDeleted(new BigDecimal(0));
-                amsSaleOrder.setInsertTime(new Date());
                 amsSaleOrder.setUpdateTime(new Date());
                 amsSaleOrder.setInsertUsername("admin");
                 amsSaleOrder.setInsertUpdateRemark("金蝶采集销售订单");
                 amsSaleOrder.setUpdateUsername("admin");
                 amsSaleOrder.setReceiveId(receiveId);
                 amsSaleOrder.setShipperId(shipperId);
+                // 订单日期
+                try {
+                    Date saleOrderBizDate = sdf.parse(saleOrderBizDateStr);
+                    amsSaleOrder.setInsertTime(saleOrderBizDate);
+                } catch (ParseException e) {
+                    e.printStackTrace();
+                }
                 if (shipperUnit.equals("四川达兴能源有限责任公司") && receiveUnitName.equals("四川省达州钢铁集团有限责任公司")) {
                     amsSaleOrder.setCloseStatus(new BigDecimal(0));
                 }
@@ -175,6 +186,13 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                     BigDecimal saleMaterialId = amsSaleMaterialMapper.getSaleMaterialId();
                     amsSaleMaterial.setSaleMaterialId(saleMaterialId);
                     amsSaleMaterial.setSaleOrderId(saleOrderId);
+                    // 仓库编码
+                    Object warehouseNum = materialMap.get("warehouseNum");
+                    // 仓库名称
+                    Object warehouseName = materialMap.get("warehouseName");
+                    if (warehouseName != null) {
+                        amsSaleMaterial.setSaleWarehouse(warehouseName.toString());
+                    }
                     // 得到物资编码
                     String materialCode = (String) materialMap.get("materialCode");
                     BigDecimal materialId = amsSaleMaterialMapper.getMaterialId(materialCode);

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

@@ -68,9 +68,9 @@ public class RmsMaterialServiceImpl implements IRmsMaterialService {
         }
         // 得到数据状态
         Integer dataStatus = (Integer) mapVal.get("dataStatus");
-        // 判断是否EASId已存在
+        // 判断是否materialCode已存在
         Map<String,Object> map1 = new HashMap<>();
-        map1.put("easMaterialId",EASMaterialId);
+        map1.put("materialCode",materialCode);
         BigDecimal deleted = new BigDecimal(0);
 //        map1.put("deleted",deleted);
         List<RmsMaterial> rmsMaterials = rmsMaterialMapper.selectByParameters(map1);

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

@@ -6,6 +6,7 @@ import com.steerinfo.dil.mapper.TmstruckQualityResultMapper;
 import com.steerinfo.dil.mapper.TmstruckWeightResultMapper;
 import com.steerinfo.dil.model.TmstruckQualityResult;
 import com.steerinfo.dil.service.ITmsTruckQualityResultService;
+import com.steerinfo.dil.util.DataChange;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
@@ -35,7 +36,7 @@ public class TmsTruckQualityService implements ITmsTruckQualityResultService {
     @Autowired
     TmstruckWeightResultMapper tmstruckWeightResultMapper;
     //定时访问质检系统，获取质检实绩
-//    @Scheduled(cron = "* * 1 * * ?")
+    @Scheduled(cron = "30 10 10 * * ?")
 //    @Override
     public int insertQualityResult() throws IOException, DocumentException {
         //先查出所有需要质检的但是没有质检的磅单号
@@ -45,8 +46,10 @@ public class TmsTruckQualityService implements ITmsTruckQualityResultService {
         if (mapList.size() != 0){
             for (Map<String,Object> map:mapList
             ) {
-                String  WzInputId=(String) map.get("WzInputId");
                 BigDecimal  resultTotalId= (BigDecimal) map.get("resultTotalId");
+                String capacityNumber = (String) map.get("capacityNumber");
+                String grossWeightTime = (String) map.get("grossWeightTime");
+                String WzInputId = grossWeightTime + capacityNumber.substring(2);
                 //		1. 创建 HttpClient 的实例
                 CloseableHttpClient httpClient = HttpClientBuilder.create().build();
                 //		2. 创建某种连接方法的实例
@@ -68,14 +71,14 @@ public class TmsTruckQualityService implements ITmsTruckQualityResultService {
                         System.out.println(map1);
                         List mapList2= JSON.parseArray((String) map1.get("jsonResult"));
                         if(mapList2.size() == 0){
-                            return 0;
+                            continue;
                         }
                         List<Map<String,Object>>mapList9=mapList2;
                         for (Map<String,Object> map3:mapList9
                         ) {
                             //判断是否生成报告单，如果生成则生成质检实绩，否则退出
                             Object value =  map3.get("REPORT_ID");
-                            if(value == null){
+                            if("".equals(value)){
                                 continue;
                             }
                             //质检说明
@@ -85,13 +88,13 @@ public class TmsTruckQualityService implements ITmsTruckQualityResultService {
                             //查询卸货点ID
                             BigDecimal SamplePlaceId=tmstruckQualityResultMapper.selectSamplePlaceId(samplePlaceName);
                             //扣水扣杂量
-                            BigDecimal Deduction= new BigDecimal(Integer.parseInt(String.valueOf(map3.get("DEDUCT_NUMBER"))));
+                            BigDecimal Deduction= DataChange.dataToBigDecimal(map3.get("DEDUCT_NUMBER"));
                             //抽样时间
                             Date sampleDate= new Date((String)(map3.get("SAMPLE_DATE")));
                             //根据磅单号新增相应的质检实绩
                             TmstruckQualityResult tmstruckQualityResult = new TmstruckQualityResult();
                             //主键ID
-                            tmstruckQualityResult.setId(tmstruckQualityResultMapper.Count());
+                            tmstruckQualityResult.setId(tmstruckQualityResultMapper.qualityId());
                             tmstruckQualityResult.setInsertTime(new Date());
                             tmstruckQualityResult.setInsertUsername("质检系统-物流系统");
                             tmstruckQualityResult.setInsertUpdateRemark("原料质检实绩");
@@ -104,9 +107,10 @@ public class TmsTruckQualityService implements ITmsTruckQualityResultService {
                             //输入扣水扣杂量
                             tmstruckQualityResult.setResultDeduction(Deduction);
                             tmstruckQualityResult.setResultDeductionDescription(DeductionDescription);
+                            tmstruckQualityResult.setResultIssampling("已抽样");
                             tmstruckQualityResultMapper.insertSelective(tmstruckQualityResult);
                             //更新计重实绩表中的是否质检完成字段
-                            tmstruckWeightResultMapper.updateWzInputId(WzInputId);
+                            tmstruckWeightResultMapper.updateWzInputId(resultTotalId);
                         }
                     } catch (DocumentException e) {
                         e.printStackTrace();

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.service.impl;
 
+import com.steerinfo.dil.feign.BmsTruckFeign;
 import com.steerinfo.dil.mapper.TmstrainWeightResultMapper;
 import com.steerinfo.dil.mapper.TmstruckReceiptResultMapper;
 import com.steerinfo.dil.mapper.UtilsMapper;

src/main/resources/bootstrap.yml

@@ -44,6 +44,8 @@ openfeign:
   #正式环境
   imFeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
+  BmsTruckFeign:
+    url: ${BMSTRUCKFEIGN_URL:localhost:8009}
 
 mybatis:
   type-aliases-package: com.steerinfo.dil.model

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>
@@ -588,5 +641,6 @@
     SELECT RM.MATERIAL_ID AS "materialId"
     FROM RMS_MATERIAL RM
     WHERE RM.MATERIAL_CODE = #{materialCode}
+    AND RM.DELETED = 0
   </select>
 </mapper>

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

@@ -2,38 +2,35 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.steerinfo.dil.mapper.AmsSaleMaterialMapper">
     <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.AmsSaleMaterial">
-        <id column="SALE_MATERIAL_ID" jdbcType="DECIMAL" property="saleMaterialId"/>
-        <result column="SALE_ORDER_ID" jdbcType="DECIMAL" property="saleOrderId"/>
-        <result column="MATERIAL_ID" jdbcType="DECIMAL" property="materialId"/>
-        <result column="MATERIAL_WEIGHT" jdbcType="DECIMAL" property="materialWeight"/>
-        <result column="MATERIAL_NUMBER" jdbcType="DECIMAL" property="materialNumber"/>
-        <result column="EAS_PRIMARY_ID" jdbcType="VARCHAR" property="easPrimaryId"/>
-        <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername"/>
-        <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime"/>
-        <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername"/>
-        <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime"/>
-        <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark"/>
-        <result column="DELETED" jdbcType="DECIMAL" property="deleted"/>
+        <id column="SALE_MATERIAL_ID" jdbcType="DECIMAL" property="saleMaterialId" />
+        <result column="SALE_ORDER_ID" jdbcType="DECIMAL" property="saleOrderId" />
+        <result column="MATERIAL_ID" jdbcType="DECIMAL" property="materialId" />
+        <result column="MATERIAL_WEIGHT" jdbcType="DECIMAL" property="materialWeight" />
+        <result column="MATERIAL_NUMBER" jdbcType="DECIMAL" property="materialNumber" />
+        <result column="EAS_PRIMARY_ID" jdbcType="VARCHAR" property="easPrimaryId" />
+        <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
+        <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
+        <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
+        <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+        <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+        <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
+        <result column="SALE_WAREHOUSE" jdbcType="VARCHAR" property="saleWarehouse" />
     </resultMap>
     <sql id="columns">
         SALE_MATERIAL_ID, SALE_ORDER_ID, MATERIAL_ID, MATERIAL_WEIGHT, MATERIAL_NUMBER, EAS_PRIMARY_ID,
-    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, 
-    DELETED
+    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
+    DELETED, SALE_WAREHOUSE
     </sql>
     <sql id="columns_alias">
         t.SALE_MATERIAL_ID, t.SALE_ORDER_ID, t.MATERIAL_ID, t.MATERIAL_WEIGHT, t.MATERIAL_NUMBER,
-    t.EAS_PRIMARY_ID, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, 
-    t.INSERT_UPDATE_REMARK, t.DELETED
+    t.EAS_PRIMARY_ID, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME,
+    t.INSERT_UPDATE_REMARK, t.DELETED, t.SALE_WAREHOUSE
     </sql>
     <sql id="select">
-        SELECT
-        <include refid="columns"/>
-        FROM AMS_SALE_MATERIAL
+        SELECT <include refid="columns" /> FROM AMS_SALE_MATERIAL
     </sql>
     <sql id="select_alias">
-        SELECT
-        <include refid="columns_alias"/>
-        FROM AMS_SALE_MATERIAL t
+        SELECT <include refid="columns_alias" /> FROM AMS_SALE_MATERIAL t
     </sql>
     <sql id="where">
         <where>
@@ -73,6 +70,9 @@
             <if test="deleted != null">
                 and DELETED = #{deleted}
             </if>
+            <if test="saleWarehouse != null and saleWarehouse != ''">
+                and SALE_WAREHOUSE = #{saleWarehouse}
+            </if>
         </where>
     </sql>
     <sql id="whereLike">
@@ -113,11 +113,13 @@
             <if test="deleted != null">
                 and DELETED = #{deleted}
             </if>
+            <if test="saleWarehouse != null and saleWarehouse != ''">
+                and SALE_WAREHOUSE LIKE '%${saleWarehouse}%'
+            </if>
         </where>
     </sql>
     <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-        delete
-        from AMS_SALE_MATERIAL
+        delete from AMS_SALE_MATERIAL
         where SALE_MATERIAL_ID = #{saleMaterialId,jdbcType=DECIMAL}
     </delete>
     <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
@@ -156,18 +158,21 @@
         <if test="deleted != null">
             or DELETED = #{deleted}
         </if>
+        <if test="saleWarehouse != null and saleWarehouse != ''">
+            or SALE_WAREHOUSE = #{saleWarehouse}
+        </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.AmsSaleMaterial">
         insert into AMS_SALE_MATERIAL (SALE_MATERIAL_ID, SALE_ORDER_ID, MATERIAL_ID,
                                        MATERIAL_WEIGHT, MATERIAL_NUMBER, EAS_PRIMARY_ID,
                                        INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
-                                       UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED)
+                                       UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED,
+                                       SALE_WAREHOUSE)
         values (#{saleMaterialId,jdbcType=DECIMAL}, #{saleOrderId,jdbcType=DECIMAL}, #{materialId,jdbcType=DECIMAL},
-                #{materialWeight,jdbcType=DECIMAL}, #{materialNumber,jdbcType=DECIMAL},
-                #{easPrimaryId,jdbcType=VARCHAR},
-                #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
-                #{updateUsername,jdbcType=VARCHAR},
-                #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL})
+                #{materialWeight,jdbcType=DECIMAL}, #{materialNumber,jdbcType=DECIMAL}, #{easPrimaryId,jdbcType=VARCHAR},
+                #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR},
+                #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL},
+                #{saleWarehouse,jdbcType=VARCHAR})
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmsSaleMaterial">
         insert into AMS_SALE_MATERIAL
@@ -208,6 +213,9 @@
             <if test="deleted != null">
                 DELETED,
             </if>
+            <if test="saleWarehouse != null">
+                SALE_WAREHOUSE,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="saleMaterialId != null">
@@ -246,21 +254,25 @@
             <if test="deleted != null">
                 #{deleted,jdbcType=DECIMAL},
             </if>
+            <if test="saleWarehouse != null">
+                #{saleWarehouse,jdbcType=VARCHAR},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmsSaleMaterial">
         update AMS_SALE_MATERIAL
-        set SALE_ORDER_ID        = #{saleOrderId,jdbcType=DECIMAL},
-            MATERIAL_ID          = #{materialId,jdbcType=DECIMAL},
-            MATERIAL_WEIGHT      = #{materialWeight,jdbcType=DECIMAL},
-            MATERIAL_NUMBER      = #{materialNumber,jdbcType=DECIMAL},
-            EAS_PRIMARY_ID       = #{easPrimaryId,jdbcType=VARCHAR},
-            INSERT_USERNAME      = #{insertUsername,jdbcType=VARCHAR},
-            INSERT_TIME          = #{insertTime,jdbcType=TIMESTAMP},
-            UPDATE_USERNAME      = #{updateUsername,jdbcType=VARCHAR},
-            UPDATE_TIME          = #{updateTime,jdbcType=TIMESTAMP},
+        set SALE_ORDER_ID = #{saleOrderId,jdbcType=DECIMAL},
+            MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
+            MATERIAL_WEIGHT = #{materialWeight,jdbcType=DECIMAL},
+            MATERIAL_NUMBER = #{materialNumber,jdbcType=DECIMAL},
+            EAS_PRIMARY_ID = #{easPrimaryId,jdbcType=VARCHAR},
+            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}
+            DELETED = #{deleted,jdbcType=DECIMAL},
+            SALE_WAREHOUSE = #{saleWarehouse,jdbcType=VARCHAR}
         where SALE_MATERIAL_ID = #{saleMaterialId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmsSaleMaterial">
@@ -299,20 +311,23 @@
             <if test="deleted != null">
                 DELETED = #{deleted,jdbcType=DECIMAL},
             </if>
+            <if test="saleWarehouse != null">
+                SALE_WAREHOUSE = #{saleWarehouse,jdbcType=VARCHAR},
+            </if>
         </set>
         where SALE_MATERIAL_ID = #{saleMaterialId,jdbcType=DECIMAL}
     </update>
     <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-        <include refid="select"/>
+        <include refid="select" />
         where SALE_MATERIAL_ID = #{saleMaterialId,jdbcType=DECIMAL}
     </select>
     <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-        <include refid="select"/>
-        <include refid="where"/>
+        <include refid="select" />
+        <include refid="where" />
     </select>
     <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-        <include refid="select"/>
-        <include refid="whereLike"/>
+        <include refid="select" />
+        <include refid="whereLike" />
     </select>
     <insert id="batchInsert" parameterType="java.util.List">
         insert into AMS_SALE_MATERIAL
@@ -321,16 +336,17 @@
         MATERIAL_NUMBER, EAS_PRIMARY_ID,
         INSERT_USERNAME, INSERT_TIME,
         UPDATE_USERNAME, UPDATE_TIME,
-        INSERT_UPDATE_REMARK, DELETED)
+        INSERT_UPDATE_REMARK, DELETED,
+        SALE_WAREHOUSE)
         ( <foreach collection="list" item="item" separator="union all">
         select
         #{item.saleMaterialId,jdbcType=DECIMAL},
-        #{item.saleOrderId,jdbcType=DECIMAL}, #{item.materialId,jdbcType=DECIMAL},
-        #{item.materialWeight,jdbcType=DECIMAL},
+        #{item.saleOrderId,jdbcType=DECIMAL}, #{item.materialId,jdbcType=DECIMAL}, #{item.materialWeight,jdbcType=DECIMAL},
         #{item.materialNumber,jdbcType=DECIMAL}, #{item.easPrimaryId,jdbcType=VARCHAR},
         #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
         #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
-        #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL} from dual
+        #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL},
+        #{item.saleWarehouse,jdbcType=VARCHAR} from dual
     </foreach> )
     </insert>
     <update id="batchUpdate" parameterType="java.util.List">
@@ -384,6 +400,10 @@
         <foreach close="end" collection="list" index="index" item="item" open="case SALE_MATERIAL_ID" separator=" ">
             when #{item.saleMaterialId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
         </foreach>
+        ,SALE_WAREHOUSE=
+        <foreach close="end" collection="list" index="index" item="item" open="case SALE_MATERIAL_ID" separator=" ">
+            when #{item.saleMaterialId,jdbcType=DECIMAL} then #{item.saleWarehouse,jdbcType=VARCHAR}
+        </foreach>
         where SALE_MATERIAL_ID in
         <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
             #{item.saleMaterialId,jdbcType=DECIMAL}
@@ -404,6 +424,7 @@
         SELECT RM.MATERIAL_ID AS "materialId"
         FROM RMS_MATERIAL RM
         WHERE RM.MATERIAL_CODE = #{materialCode}
+        AND RM.DELETED = 0
     </select>
 
 </mapper>

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

@@ -672,19 +672,44 @@
         and TWR.MATERIAL_ID=#{materialId,jdbcType=DECIMAL}
     </select>
     <select id="selectWzInputId" resultType="java.util.Map">
-        SELECT twr.RESULT_POUND_NO "WzInputId", twr.RESULT_TOTAL_ID "resultTotalId"
-        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
-        WHERE OO.ORDER_TYPE IN (7, 10, 18)
-        AND TWR.ISQUALITY IS NULL
+        (SELECT DISTINCT
+             twr.RESULT_TOTAL_ID "resultTotalId",
+             RC.CAPACITY_NUMBER  "capacityNumber",
+             to_char(TWR.RESULT_GROSS_WEIGHT_TIME,'YYYYMMDDHH24MISS')  "grossWeightTime"
+         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 RMS_CAPACITY RC
+                            ON RC.CAPACITY_ID = OO.CAPACITY_ID
+                  LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
+                            ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+         WHERE OO.ORDER_TYPE IN (10,20)
+           AND TWR.GROSS_SEGMENT_SQE = 7
+           AND TER.SEGMEN_SQE = 6
+           AND TWR.ISQUALITY IS NULL)
+        union
+        (SELECT DISTINCT
+             twr.RESULT_TOTAL_ID "resultTotalId",
+             RC.CAPACITY_NUMBER  "capacityNumber",
+             to_char(TWR.RESULT_GROSS_WEIGHT_TIME,'YYYYMMDDHH24MISS')  "grossWeightTime"
+         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 RMS_CAPACITY RC
+                            ON RC.CAPACITY_ID = OO.CAPACITY_ID
+                  LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
+                            ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+         WHERE OO.ORDER_TYPE IN (6,7,18)
+           AND TWR.ISQUALITY IS NULL)
     </select>
-    <update id="updateWzInputId">
+    <update id="updateWzInputId" parameterType="decimal">
         update TMSTRUCK_WEIGHT_RESULT twr
         set twr.ISQUALITY=1
-        where twr.RESULT_POUND_NO=#{wzInputId}
+        where twr.RESULT_TOTAL_ID=#{resultTotalId}
     </update>
 
     <update id="updateTruckWeightResult" parameterType="java.util.Map">