Ver Fonte

修改计量接口

txf há 3 anos atrás
pai
commit
800a0030fc

+ 18 - 0
src/main/java/com/steerinfo/dil/mapper/AmsNotUploadedEasMapper.java

@@ -0,0 +1,18 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.AmsNotUploadedEas;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface AmsNotUploadedEasMapper extends IBaseMapper<AmsNotUploadedEas, String> {
+
+    //查询订单是否已存在
+    String getIsExistsOrderId(String orderId);
+
+    //查询所有未上传金蝶的数据  补传
+    List<Map<String, Object>> getAllNotUploadedEasMes();
+}

+ 288 - 0
src/main/java/com/steerinfo/dil/model/AmsNotUploadedEas.java

@@ -0,0 +1,288 @@
+package com.steerinfo.dil.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+@ApiModel(value="未上传金蝶记录")
+public class AmsNotUploadedEas implements IBasePO<String> {
+    /**
+     * 订单ID 兼 主键ID(ORDER_ID,VARCHAR,200)
+     */
+    @ApiModelProperty(value="订单ID 兼 主键ID",required=true)
+    private String orderId;
+
+    /**
+     * 采购订单号(NO,VARCHAR,200)
+     */
+    @ApiModelProperty(value="采购订单号",required=false)
+    private String no;
+
+    /**
+     * 磅单号(RESULT_POUND_NO,VARCHAR,200)
+     */
+    @ApiModelProperty(value="磅单号",required=false)
+    private String resultPoundNo;
+
+    /**
+     * 车牌号(CAPACITY_NUMBER,VARCHAR,200)
+     */
+    @ApiModelProperty(value="车牌号",required=false)
+    private String capacityNumber;
+
+    /**
+     * 毛重汽车衡(RESULT_CROSS_CALCULATE_NUMBER,VARCHAR,200)
+     */
+    @ApiModelProperty(value="毛重汽车衡",required=false)
+    private String resultCrossCalculateNumber;
+
+    /**
+     * 皮重汽车衡(RESULT_TARE_CALCULATE_NUMBER,VARCHAR,200)
+     */
+    @ApiModelProperty(value="皮重汽车衡",required=false)
+    private String resultTareCalculateNumber;
+
+    /**
+     * 毛重(RESULT_CROSS_WEIGHT,VARCHAR,200)
+     */
+    @ApiModelProperty(value="毛重",required=false)
+    private String resultCrossWeight;
+
+    /**
+     * 皮重(RESULT_TARE_WEIGHT,VARCHAR,200)
+     */
+    @ApiModelProperty(value="皮重",required=false)
+    private String resultTareWeight;
+
+    /**
+     * 净重(RESULT_NET_WEIGHT,VARCHAR,200)
+     */
+    @ApiModelProperty(value="净重",required=false)
+    private String resultNetWeight;
+
+    /**
+     * 毛重时间(RESULT_CROSS_WEIGHT_TIME,VARCHAR,200)
+     */
+    @ApiModelProperty(value="毛重时间",required=false)
+    private String resultCrossWeightTime;
+
+    /**
+     * 皮重时间(RESULT_TARE_WEIGHT_TIME,VARCHAR,200)
+     */
+    @ApiModelProperty(value="皮重时间",required=false)
+    private String resultTareWeightTime;
+
+    /**
+     * 金蝶分录ID(EAS_ENTRY_ID,VARCHAR,200)
+     */
+    @ApiModelProperty(value="金蝶分录ID",required=false)
+    private String easEntryId;
+
+    /**
+     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录创建人",required=false)
+    private String insertUsername;
+
+    /**
+     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录创建时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录修改人",required=false)
+    private String updateUsername;
+
+    /**
+     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public String getId() {
+        return this.orderId;
+    }
+
+    @Override
+    public void setId(String orderId) {
+        this.orderId = orderId == null ? null : orderId.trim();
+    }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId == null ? null : orderId.trim();
+    }
+
+    public String getNo() {
+        return no;
+    }
+
+    public void setNo(String no) {
+        this.no = no == null ? null : no.trim();
+    }
+
+    public String getResultPoundNo() {
+        return resultPoundNo;
+    }
+
+    public void setResultPoundNo(String resultPoundNo) {
+        this.resultPoundNo = resultPoundNo == null ? null : resultPoundNo.trim();
+    }
+
+    public String getCapacityNumber() {
+        return capacityNumber;
+    }
+
+    public void setCapacityNumber(String capacityNumber) {
+        this.capacityNumber = capacityNumber == null ? null : capacityNumber.trim();
+    }
+
+    public String getResultCrossCalculateNumber() {
+        return resultCrossCalculateNumber;
+    }
+
+    public void setResultCrossCalculateNumber(String resultCrossCalculateNumber) {
+        this.resultCrossCalculateNumber = resultCrossCalculateNumber == null ? null : resultCrossCalculateNumber.trim();
+    }
+
+    public String getResultTareCalculateNumber() {
+        return resultTareCalculateNumber;
+    }
+
+    public void setResultTareCalculateNumber(String resultTareCalculateNumber) {
+        this.resultTareCalculateNumber = resultTareCalculateNumber == null ? null : resultTareCalculateNumber.trim();
+    }
+
+    public String getResultCrossWeight() {
+        return resultCrossWeight;
+    }
+
+    public void setResultCrossWeight(String resultCrossWeight) {
+        this.resultCrossWeight = resultCrossWeight == null ? null : resultCrossWeight.trim();
+    }
+
+    public String getResultTareWeight() {
+        return resultTareWeight;
+    }
+
+    public void setResultTareWeight(String resultTareWeight) {
+        this.resultTareWeight = resultTareWeight == null ? null : resultTareWeight.trim();
+    }
+
+    public String getResultNetWeight() {
+        return resultNetWeight;
+    }
+
+    public void setResultNetWeight(String resultNetWeight) {
+        this.resultNetWeight = resultNetWeight == null ? null : resultNetWeight.trim();
+    }
+
+    public String getResultCrossWeightTime() {
+        return resultCrossWeightTime;
+    }
+
+    public void setResultCrossWeightTime(String resultCrossWeightTime) {
+        this.resultCrossWeightTime = resultCrossWeightTime == null ? null : resultCrossWeightTime.trim();
+    }
+
+    public String getResultTareWeightTime() {
+        return resultTareWeightTime;
+    }
+
+    public void setResultTareWeightTime(String resultTareWeightTime) {
+        this.resultTareWeightTime = resultTareWeightTime == null ? null : resultTareWeightTime.trim();
+    }
+
+    public String getEasEntryId() {
+        return easEntryId;
+    }
+
+    public void setEasEntryId(String easEntryId) {
+        this.easEntryId = easEntryId == null ? null : easEntryId.trim();
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", orderId=").append(orderId);
+        sb.append(", no=").append(no);
+        sb.append(", resultPoundNo=").append(resultPoundNo);
+        sb.append(", capacityNumber=").append(capacityNumber);
+        sb.append(", resultCrossCalculateNumber=").append(resultCrossCalculateNumber);
+        sb.append(", resultTareCalculateNumber=").append(resultTareCalculateNumber);
+        sb.append(", resultCrossWeight=").append(resultCrossWeight);
+        sb.append(", resultTareWeight=").append(resultTareWeight);
+        sb.append(", resultNetWeight=").append(resultNetWeight);
+        sb.append(", resultCrossWeightTime=").append(resultCrossWeightTime);
+        sb.append(", resultTareWeightTime=").append(resultTareWeightTime);
+        sb.append(", easEntryId=").append(easEntryId);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

+ 73 - 3
src/main/java/com/steerinfo/dil/util/KDWebserviceUtil.java → src/main/java/com/steerinfo/dil/service/impl/KDWebserviceUtil.java

@@ -1,6 +1,8 @@
-package com.steerinfo.dil.util;
+package com.steerinfo.dil.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.steerinfo.dil.mapper.AmsNotUploadedEasMapper;
+import com.steerinfo.dil.model.AmsNotUploadedEas;
 import com.steerinfo.dil.wsdl.LoginUtil;
 import com.steerinfo.dil.wsdl.ServiceInfo;
 import com.steerinfo.dil.wsdl.WSContext;
@@ -8,7 +10,11 @@ import com.steerinfo.dil.wsdl.WSUpDaxingMeteringSystemFacadeSrvProxyServiceLocat
 import org.dom4j.Document;
 import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -16,7 +22,12 @@ import java.util.Map;
  * @ time      :2022/2/10 10:07
  */
 
+@Service
 public class KDWebserviceUtil {
+
+    @Autowired
+    private AmsNotUploadedEasMapper amsNotUploadedEasMapper;
+
     /**
      *
      * 推送数据给金蝶接口
@@ -25,7 +36,7 @@ public class KDWebserviceUtil {
      * @param map n个数据
      * @return Integer   1 成功  0 失败
      **/
-    public static int sendMesToKD(Map<String, Object> map){
+    public int sendMesToKD(Map<String, Object> map){
         try {
             String xml = asXmlData(map);
             System.out.println(xml);
@@ -34,6 +45,7 @@ public class KDWebserviceUtil {
             WSContext wsContext = LoginUtil.doEASLogin(service);
             String sessionId = wsContext.getSessionId();
             if(null == sessionId) {
+                addNotUploadedEASResult(map);
                 System.out.println("[error]: 登陆有问题");
                 return 0;
             }
@@ -43,10 +55,12 @@ public class KDWebserviceUtil {
             if("S02".equals(String.valueOf(returnMap.get("Status")))){
                 return 1;
             }else {
+                addNotUploadedEASResult(map);
                 System.out.println((map.get("orderNumber")+ "数据推送金蝶失败:"+ returnMap.get("MessageText")));
                 return 0;
             }
         } catch (Exception e) {
+            addNotUploadedEASResult(map);
             System.out.println(map.get("orderNumber") + "数据推送金蝶失败:" + e.getMessage());
             return 0;
         }
@@ -60,7 +74,7 @@ public class KDWebserviceUtil {
      * @param map
      * @return
      **/
-    public static String asXmlData(Map<String, Object> map){
+    public String asXmlData(Map<String, Object> map){
         // 创建一个Document实例
         Document doc = DocumentHelper.createDocument();
         // 添加根节点
@@ -87,12 +101,68 @@ public class KDWebserviceUtil {
         return doc.asXML();
     }
 
+    /**
+     * 如果回传金蝶失败则将数据保存到数据库
+     * @Author TXF
+     * @Date 2022/2/14 16:35
+     * @param map
+     * @return
+     **/
+    public int addNotUploadedEASResult(Map<String, Object> map) {
+        AmsNotUploadedEas amsNotUploadedEas = new AmsNotUploadedEas();
+        //查询该订单是否已存在
+        String orderId = (String) map.get("orderId");
+        String isExistsOrderId = amsNotUploadedEasMapper.getIsExistsOrderId(orderId);
+        if(isExistsOrderId == null){
+            return 0;
+        }
+        amsNotUploadedEas.setId(orderId);
+        amsNotUploadedEas.setNo((String) map.get("No"));
+        amsNotUploadedEas.setResultPoundNo((String) map.get("resultPoundNo"));
+        amsNotUploadedEas.setCapacityNumber((String) map.get("capacityNumber"));
+        amsNotUploadedEas.setResultCrossCalculateNumber((String) map.get("resultCrossCalculateNumber"));
+        amsNotUploadedEas.setResultTareCalculateNumber((String) map.get("resultTareCalculateNumber"));
+        amsNotUploadedEas.setResultCrossWeight((String) map.get("resultCrossWeight"));
+        amsNotUploadedEas.setResultTareWeight((String) map.get("resultTareWeight"));
+        amsNotUploadedEas.setResultCrossWeightTime((String) map.get("resultCrossWeightTime"));
+        amsNotUploadedEas.setResultTareWeightTime((String) map.get("resultTareWeightTime"));
+        amsNotUploadedEas.setResultNetWeight((String) map.get("resultNetWeight"));
+        amsNotUploadedEas.setEasEntryId((String) map.get("easEntryId"));
+        return amsNotUploadedEasMapper.insertSelective(amsNotUploadedEas);
+    }
+
+    /**
+     * 定时访问未上传金蝶数据 重复抛
+     * @Author TXF
+     * @Date 2022/2/14 17:01
+     * @param
+     * @return
+     **/
+    @Scheduled(fixedRate = 1000 * 60 * 10)
+    public void timingPushMesToKD(){
+        List<Map<String, Object>> allNotUploadedEasMes = amsNotUploadedEasMapper.getAllNotUploadedEasMes();
+        if(allNotUploadedEasMes != null && allNotUploadedEasMes.size() != 0){
+            for (Map<String, Object> map : allNotUploadedEasMes) {
+                int i = sendMesToKD(map);
+                String orderId = (String) map.get("orderId");
+                if (i == 1){
+                    //如果添加成功则往数据库中删除此数据
+                    amsNotUploadedEasMapper.deleteByPrimaryKey(orderId);
+                    System.out.println(orderId + map.get("capacityNumber") + "补传成功");
+                }else {
+                    System.out.println(orderId + map.get("capacityNumber") + "补传失败");
+                }
+            }
+        }
+    }
 
 }
 
 
 
 
+
+
 /**
  * 封装的访问webservice的工具类:(有局限性,数据量小的xml报文可用,较大则会出现stackoverflow的异常)
  *

+ 4 - 7
src/main/java/com/steerinfo/dil/service/impl/TmstruckWeightResultServiceImpl.java

@@ -9,7 +9,6 @@ import com.steerinfo.dil.model.TmstruckWeightResult;
 import com.steerinfo.dil.mapper.TmstruckWeightResultMapper;
 import com.steerinfo.dil.service.ITmstruckWeightResultService;
 import com.steerinfo.dil.util.DataChange;
-import com.steerinfo.dil.util.KDWebserviceUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -139,10 +138,8 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
                 if ( orderType == 6) {
                     String resultNetWeight = String.valueOf(map.get("resultNetWeight")); //如果净重不为空  或者净重不为0
                     if (!"null".equals(resultNetWeight) && !"".equals(resultNetWeight) && !"0".equals(resultNetWeight)) {
-                        //回传数据给金蝶方法 返回1即为回传成功
-                        if (sendMesToKD(map, orderType) != 1) {
-                            return map.get("orderNumber") + ":回传金蝶失败";
-                        }
+                        //回传数据给金蝶方法
+                        sendMesToKD(map, orderType);
                     }
                 }
             }
@@ -460,7 +457,7 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
      * @param
      * @return
      **/
-    public int sendMesToKD(Map<String, Object> map, Integer orderType){
+    public void sendMesToKD(Map<String, Object> map, Integer orderType){
         String orderNumber = (String) map.get("orderNumber");
         Map<String, Object> mesMap = new HashMap<>();
         switch (orderType){
@@ -474,7 +471,7 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
         //将map数据全放进mesMap中
         map.putAll(mesMap);
         //访问金蝶接口
-        return KDWebserviceUtil.sendMesToKD(map);
+        new KDWebserviceUtil().sendMesToKD(map);
     }
 
     /**

+ 552 - 0
src/main/resources/com/steerinfo/dil/mapper/AmsNotUploadedEasMapper.xml

@@ -0,0 +1,552 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.AmsNotUploadedEasMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.AmsNotUploadedEas">
+    <id column="ORDER_ID" jdbcType="VARCHAR" property="orderId" />
+    <result column="NO" jdbcType="VARCHAR" property="no" />
+    <result column="RESULT_POUND_NO" jdbcType="VARCHAR" property="resultPoundNo" />
+    <result column="CAPACITY_NUMBER" jdbcType="VARCHAR" property="capacityNumber" />
+    <result column="RESULT_CROSS_CALCULATE_NUMBER" jdbcType="VARCHAR" property="resultCrossCalculateNumber" />
+    <result column="RESULT_TARE_CALCULATE_NUMBER" jdbcType="VARCHAR" property="resultTareCalculateNumber" />
+    <result column="RESULT_CROSS_WEIGHT" jdbcType="VARCHAR" property="resultCrossWeight" />
+    <result column="RESULT_TARE_WEIGHT" jdbcType="VARCHAR" property="resultTareWeight" />
+    <result column="RESULT_NET_WEIGHT" jdbcType="VARCHAR" property="resultNetWeight" />
+    <result column="RESULT_CROSS_WEIGHT_TIME" jdbcType="VARCHAR" property="resultCrossWeightTime" />
+    <result column="RESULT_TARE_WEIGHT_TIME" jdbcType="VARCHAR" property="resultTareWeightTime" />
+    <result column="EAS_ENTRY_ID" jdbcType="VARCHAR" property="easEntryId" />
+    <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" />
+  </resultMap>
+  <sql id="columns">
+    ORDER_ID, NO, RESULT_POUND_NO, CAPACITY_NUMBER, RESULT_CROSS_CALCULATE_NUMBER, RESULT_TARE_CALCULATE_NUMBER, 
+    RESULT_CROSS_WEIGHT, RESULT_TARE_WEIGHT, RESULT_NET_WEIGHT, RESULT_CROSS_WEIGHT_TIME, 
+    RESULT_TARE_WEIGHT_TIME, EAS_ENTRY_ID, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
+    UPDATE_TIME, INSERT_UPDATE_REMARK
+  </sql>
+  <sql id="columns_alias">
+    t.ORDER_ID, t.NO, t.RESULT_POUND_NO, t.CAPACITY_NUMBER, t.RESULT_CROSS_CALCULATE_NUMBER, 
+    t.RESULT_TARE_CALCULATE_NUMBER, t.RESULT_CROSS_WEIGHT, t.RESULT_TARE_WEIGHT, t.RESULT_NET_WEIGHT, 
+    t.RESULT_CROSS_WEIGHT_TIME, t.RESULT_TARE_WEIGHT_TIME, t.EAS_ENTRY_ID, t.INSERT_USERNAME, 
+    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns" /> FROM AMS_NOT_UPLOADED_EAS
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias" /> FROM AMS_NOT_UPLOADED_EAS t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="orderId != null and orderId != ''">
+        and ORDER_ID = #{orderId}
+      </if>
+      <if test="no != null and no != ''">
+        and NO = #{no}
+      </if>
+      <if test="resultPoundNo != null and resultPoundNo != ''">
+        and RESULT_POUND_NO = #{resultPoundNo}
+      </if>
+      <if test="capacityNumber != null and capacityNumber != ''">
+        and CAPACITY_NUMBER = #{capacityNumber}
+      </if>
+      <if test="resultCrossCalculateNumber != null and resultCrossCalculateNumber != ''">
+        and RESULT_CROSS_CALCULATE_NUMBER = #{resultCrossCalculateNumber}
+      </if>
+      <if test="resultTareCalculateNumber != null and resultTareCalculateNumber != ''">
+        and RESULT_TARE_CALCULATE_NUMBER = #{resultTareCalculateNumber}
+      </if>
+      <if test="resultCrossWeight != null and resultCrossWeight != ''">
+        and RESULT_CROSS_WEIGHT = #{resultCrossWeight}
+      </if>
+      <if test="resultTareWeight != null and resultTareWeight != ''">
+        and RESULT_TARE_WEIGHT = #{resultTareWeight}
+      </if>
+      <if test="resultNetWeight != null and resultNetWeight != ''">
+        and RESULT_NET_WEIGHT = #{resultNetWeight}
+      </if>
+      <if test="resultCrossWeightTime != null and resultCrossWeightTime != ''">
+        and RESULT_CROSS_WEIGHT_TIME = #{resultCrossWeightTime}
+      </if>
+      <if test="resultTareWeightTime != null and resultTareWeightTime != ''">
+        and RESULT_TARE_WEIGHT_TIME = #{resultTareWeightTime}
+      </if>
+      <if test="easEntryId != null and easEntryId != ''">
+        and EAS_ENTRY_ID = #{easEntryId}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="orderId != null and orderId != ''">
+        and ORDER_ID LIKE '%${orderId}%'
+      </if>
+      <if test="no != null and no != ''">
+        and NO LIKE '%${no}%'
+      </if>
+      <if test="resultPoundNo != null and resultPoundNo != ''">
+        and RESULT_POUND_NO LIKE '%${resultPoundNo}%'
+      </if>
+      <if test="capacityNumber != null and capacityNumber != ''">
+        and CAPACITY_NUMBER LIKE '%${capacityNumber}%'
+      </if>
+      <if test="resultCrossCalculateNumber != null and resultCrossCalculateNumber != ''">
+        and RESULT_CROSS_CALCULATE_NUMBER LIKE '%${resultCrossCalculateNumber}%'
+      </if>
+      <if test="resultTareCalculateNumber != null and resultTareCalculateNumber != ''">
+        and RESULT_TARE_CALCULATE_NUMBER LIKE '%${resultTareCalculateNumber}%'
+      </if>
+      <if test="resultCrossWeight != null and resultCrossWeight != ''">
+        and RESULT_CROSS_WEIGHT LIKE '%${resultCrossWeight}%'
+      </if>
+      <if test="resultTareWeight != null and resultTareWeight != ''">
+        and RESULT_TARE_WEIGHT LIKE '%${resultTareWeight}%'
+      </if>
+      <if test="resultNetWeight != null and resultNetWeight != ''">
+        and RESULT_NET_WEIGHT LIKE '%${resultNetWeight}%'
+      </if>
+      <if test="resultCrossWeightTime != null and resultCrossWeightTime != ''">
+        and RESULT_CROSS_WEIGHT_TIME LIKE '%${resultCrossWeightTime}%'
+      </if>
+      <if test="resultTareWeightTime != null and resultTareWeightTime != ''">
+        and RESULT_TARE_WEIGHT_TIME LIKE '%${resultTareWeightTime}%'
+      </if>
+      <if test="easEntryId != null and easEntryId != ''">
+        and EAS_ENTRY_ID LIKE '%${easEntryId}%'
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME LIKE '%${insertUsername}%'
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME LIKE '%${updateUsername}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from AMS_NOT_UPLOADED_EAS
+    where ORDER_ID = #{orderId,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from AMS_NOT_UPLOADED_EAS
+    where 1!=1 
+      <if test="no != null and no != ''">
+        or NO = #{no}
+      </if>
+      <if test="resultPoundNo != null and resultPoundNo != ''">
+        or RESULT_POUND_NO = #{resultPoundNo}
+      </if>
+      <if test="capacityNumber != null and capacityNumber != ''">
+        or CAPACITY_NUMBER = #{capacityNumber}
+      </if>
+      <if test="resultCrossCalculateNumber != null and resultCrossCalculateNumber != ''">
+        or RESULT_CROSS_CALCULATE_NUMBER = #{resultCrossCalculateNumber}
+      </if>
+      <if test="resultTareCalculateNumber != null and resultTareCalculateNumber != ''">
+        or RESULT_TARE_CALCULATE_NUMBER = #{resultTareCalculateNumber}
+      </if>
+      <if test="resultCrossWeight != null and resultCrossWeight != ''">
+        or RESULT_CROSS_WEIGHT = #{resultCrossWeight}
+      </if>
+      <if test="resultTareWeight != null and resultTareWeight != ''">
+        or RESULT_TARE_WEIGHT = #{resultTareWeight}
+      </if>
+      <if test="resultNetWeight != null and resultNetWeight != ''">
+        or RESULT_NET_WEIGHT = #{resultNetWeight}
+      </if>
+      <if test="resultCrossWeightTime != null and resultCrossWeightTime != ''">
+        or RESULT_CROSS_WEIGHT_TIME = #{resultCrossWeightTime}
+      </if>
+      <if test="resultTareWeightTime != null and resultTareWeightTime != ''">
+        or RESULT_TARE_WEIGHT_TIME = #{resultTareWeightTime}
+      </if>
+      <if test="easEntryId != null and easEntryId != ''">
+        or EAS_ENTRY_ID = #{easEntryId}
+      </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>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.model.AmsNotUploadedEas">
+    insert into AMS_NOT_UPLOADED_EAS (ORDER_ID, NO, RESULT_POUND_NO, 
+      CAPACITY_NUMBER, RESULT_CROSS_CALCULATE_NUMBER, 
+      RESULT_TARE_CALCULATE_NUMBER, RESULT_CROSS_WEIGHT, 
+      RESULT_TARE_WEIGHT, RESULT_NET_WEIGHT, RESULT_CROSS_WEIGHT_TIME, 
+      RESULT_TARE_WEIGHT_TIME, EAS_ENTRY_ID, INSERT_USERNAME, 
+      INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
+      INSERT_UPDATE_REMARK)
+    values (#{orderId,jdbcType=VARCHAR}, #{no,jdbcType=VARCHAR}, #{resultPoundNo,jdbcType=VARCHAR}, 
+      #{capacityNumber,jdbcType=VARCHAR}, #{resultCrossCalculateNumber,jdbcType=VARCHAR}, 
+      #{resultTareCalculateNumber,jdbcType=VARCHAR}, #{resultCrossWeight,jdbcType=VARCHAR}, 
+      #{resultTareWeight,jdbcType=VARCHAR}, #{resultNetWeight,jdbcType=VARCHAR}, #{resultCrossWeightTime,jdbcType=VARCHAR}, 
+      #{resultTareWeightTime,jdbcType=VARCHAR}, #{easEntryId,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR}, 
+      #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{insertUpdateRemark,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmsNotUploadedEas">
+    insert into AMS_NOT_UPLOADED_EAS
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="orderId != null">
+        ORDER_ID,
+      </if>
+      <if test="no != null">
+        NO,
+      </if>
+      <if test="resultPoundNo != null">
+        RESULT_POUND_NO,
+      </if>
+      <if test="capacityNumber != null">
+        CAPACITY_NUMBER,
+      </if>
+      <if test="resultCrossCalculateNumber != null">
+        RESULT_CROSS_CALCULATE_NUMBER,
+      </if>
+      <if test="resultTareCalculateNumber != null">
+        RESULT_TARE_CALCULATE_NUMBER,
+      </if>
+      <if test="resultCrossWeight != null">
+        RESULT_CROSS_WEIGHT,
+      </if>
+      <if test="resultTareWeight != null">
+        RESULT_TARE_WEIGHT,
+      </if>
+      <if test="resultNetWeight != null">
+        RESULT_NET_WEIGHT,
+      </if>
+      <if test="resultCrossWeightTime != null">
+        RESULT_CROSS_WEIGHT_TIME,
+      </if>
+      <if test="resultTareWeightTime != null">
+        RESULT_TARE_WEIGHT_TIME,
+      </if>
+      <if test="easEntryId != null">
+        EAS_ENTRY_ID,
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME,
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME,
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="orderId != null">
+        #{orderId,jdbcType=VARCHAR},
+      </if>
+      <if test="no != null">
+        #{no,jdbcType=VARCHAR},
+      </if>
+      <if test="resultPoundNo != null">
+        #{resultPoundNo,jdbcType=VARCHAR},
+      </if>
+      <if test="capacityNumber != null">
+        #{capacityNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="resultCrossCalculateNumber != null">
+        #{resultCrossCalculateNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="resultTareCalculateNumber != null">
+        #{resultTareCalculateNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="resultCrossWeight != null">
+        #{resultCrossWeight,jdbcType=VARCHAR},
+      </if>
+      <if test="resultTareWeight != null">
+        #{resultTareWeight,jdbcType=VARCHAR},
+      </if>
+      <if test="resultNetWeight != null">
+        #{resultNetWeight,jdbcType=VARCHAR},
+      </if>
+      <if test="resultCrossWeightTime != null">
+        #{resultCrossWeightTime,jdbcType=VARCHAR},
+      </if>
+      <if test="resultTareWeightTime != null">
+        #{resultTareWeightTime,jdbcType=VARCHAR},
+      </if>
+      <if test="easEntryId != null">
+        #{easEntryId,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmsNotUploadedEas">
+    update AMS_NOT_UPLOADED_EAS
+    set NO = #{no,jdbcType=VARCHAR},
+      RESULT_POUND_NO = #{resultPoundNo,jdbcType=VARCHAR},
+      CAPACITY_NUMBER = #{capacityNumber,jdbcType=VARCHAR},
+      RESULT_CROSS_CALCULATE_NUMBER = #{resultCrossCalculateNumber,jdbcType=VARCHAR},
+      RESULT_TARE_CALCULATE_NUMBER = #{resultTareCalculateNumber,jdbcType=VARCHAR},
+      RESULT_CROSS_WEIGHT = #{resultCrossWeight,jdbcType=VARCHAR},
+      RESULT_TARE_WEIGHT = #{resultTareWeight,jdbcType=VARCHAR},
+      RESULT_NET_WEIGHT = #{resultNetWeight,jdbcType=VARCHAR},
+      RESULT_CROSS_WEIGHT_TIME = #{resultCrossWeightTime,jdbcType=VARCHAR},
+      RESULT_TARE_WEIGHT_TIME = #{resultTareWeightTime,jdbcType=VARCHAR},
+      EAS_ENTRY_ID = #{easEntryId,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}
+    where ORDER_ID = #{orderId,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmsNotUploadedEas">
+    update AMS_NOT_UPLOADED_EAS
+    <set>
+      <if test="no != null">
+        NO = #{no,jdbcType=VARCHAR},
+      </if>
+      <if test="resultPoundNo != null">
+        RESULT_POUND_NO = #{resultPoundNo,jdbcType=VARCHAR},
+      </if>
+      <if test="capacityNumber != null">
+        CAPACITY_NUMBER = #{capacityNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="resultCrossCalculateNumber != null">
+        RESULT_CROSS_CALCULATE_NUMBER = #{resultCrossCalculateNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="resultTareCalculateNumber != null">
+        RESULT_TARE_CALCULATE_NUMBER = #{resultTareCalculateNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="resultCrossWeight != null">
+        RESULT_CROSS_WEIGHT = #{resultCrossWeight,jdbcType=VARCHAR},
+      </if>
+      <if test="resultTareWeight != null">
+        RESULT_TARE_WEIGHT = #{resultTareWeight,jdbcType=VARCHAR},
+      </if>
+      <if test="resultNetWeight != null">
+        RESULT_NET_WEIGHT = #{resultNetWeight,jdbcType=VARCHAR},
+      </if>
+      <if test="resultCrossWeightTime != null">
+        RESULT_CROSS_WEIGHT_TIME = #{resultCrossWeightTime,jdbcType=VARCHAR},
+      </if>
+      <if test="resultTareWeightTime != null">
+        RESULT_TARE_WEIGHT_TIME = #{resultTareWeightTime,jdbcType=VARCHAR},
+      </if>
+      <if test="easEntryId != null">
+        EAS_ENTRY_ID = #{easEntryId,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where ORDER_ID = #{orderId,jdbcType=VARCHAR}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    <include refid="select" />
+    where ORDER_ID = #{orderId,jdbcType=VARCHAR}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="where" />
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="whereLike" />
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into AMS_NOT_UPLOADED_EAS 
+      (ORDER_ID, 
+      NO, RESULT_POUND_NO, CAPACITY_NUMBER, 
+      RESULT_CROSS_CALCULATE_NUMBER, RESULT_TARE_CALCULATE_NUMBER, 
+      RESULT_CROSS_WEIGHT, RESULT_TARE_WEIGHT, 
+      RESULT_NET_WEIGHT, RESULT_CROSS_WEIGHT_TIME, 
+      RESULT_TARE_WEIGHT_TIME, EAS_ENTRY_ID, 
+      INSERT_USERNAME, INSERT_TIME, 
+      UPDATE_USERNAME, UPDATE_TIME, 
+      INSERT_UPDATE_REMARK)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.orderId,jdbcType=VARCHAR}, 
+      #{item.no,jdbcType=VARCHAR}, #{item.resultPoundNo,jdbcType=VARCHAR}, #{item.capacityNumber,jdbcType=VARCHAR}, 
+      #{item.resultCrossCalculateNumber,jdbcType=VARCHAR}, #{item.resultTareCalculateNumber,jdbcType=VARCHAR}, 
+      #{item.resultCrossWeight,jdbcType=VARCHAR}, #{item.resultTareWeight,jdbcType=VARCHAR}, 
+      #{item.resultNetWeight,jdbcType=VARCHAR}, #{item.resultCrossWeightTime,jdbcType=VARCHAR}, 
+      #{item.resultTareWeightTime,jdbcType=VARCHAR}, #{item.easEntryId,jdbcType=VARCHAR}, 
+      #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP}, 
+      #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
+      #{item.insertUpdateRemark,jdbcType=VARCHAR} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update AMS_NOT_UPLOADED_EAS
+     set
+       ORDER_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+          when #{item.orderId,jdbcType=VARCHAR} then #{item.orderId,jdbcType=VARCHAR}
+       </foreach>
+       ,NO=
+       <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+          when #{item.orderId,jdbcType=VARCHAR} then #{item.no,jdbcType=VARCHAR}
+       </foreach>
+       ,RESULT_POUND_NO=
+       <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+          when #{item.orderId,jdbcType=VARCHAR} then #{item.resultPoundNo,jdbcType=VARCHAR}
+       </foreach>
+       ,CAPACITY_NUMBER=
+       <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+          when #{item.orderId,jdbcType=VARCHAR} then #{item.capacityNumber,jdbcType=VARCHAR}
+       </foreach>
+       ,RESULT_CROSS_CALCULATE_NUMBER=
+       <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+          when #{item.orderId,jdbcType=VARCHAR} then #{item.resultCrossCalculateNumber,jdbcType=VARCHAR}
+       </foreach>
+       ,RESULT_TARE_CALCULATE_NUMBER=
+       <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+          when #{item.orderId,jdbcType=VARCHAR} then #{item.resultTareCalculateNumber,jdbcType=VARCHAR}
+       </foreach>
+       ,RESULT_CROSS_WEIGHT=
+       <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+          when #{item.orderId,jdbcType=VARCHAR} then #{item.resultCrossWeight,jdbcType=VARCHAR}
+       </foreach>
+       ,RESULT_TARE_WEIGHT=
+       <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+          when #{item.orderId,jdbcType=VARCHAR} then #{item.resultTareWeight,jdbcType=VARCHAR}
+       </foreach>
+       ,RESULT_NET_WEIGHT=
+       <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+          when #{item.orderId,jdbcType=VARCHAR} then #{item.resultNetWeight,jdbcType=VARCHAR}
+       </foreach>
+       ,RESULT_CROSS_WEIGHT_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+          when #{item.orderId,jdbcType=VARCHAR} then #{item.resultCrossWeightTime,jdbcType=VARCHAR}
+       </foreach>
+       ,RESULT_TARE_WEIGHT_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+          when #{item.orderId,jdbcType=VARCHAR} then #{item.resultTareWeightTime,jdbcType=VARCHAR}
+       </foreach>
+       ,EAS_ENTRY_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+          when #{item.orderId,jdbcType=VARCHAR} then #{item.easEntryId,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+          when #{item.orderId,jdbcType=VARCHAR} then #{item.insertUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+          when #{item.orderId,jdbcType=VARCHAR} then #{item.insertTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+          when #{item.orderId,jdbcType=VARCHAR} then #{item.updateUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+          when #{item.orderId,jdbcType=VARCHAR} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,INSERT_UPDATE_REMARK=
+       <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+          when #{item.orderId,jdbcType=VARCHAR} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+       </foreach>
+     where ORDER_ID in 
+     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+    #{item.orderId,jdbcType=VARCHAR}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from AMS_NOT_UPLOADED_EAS
+    where ORDER_ID in 
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示!!!-->
+  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
+
+<!--  -->
+  <select id="getAllNotUploadedEasMes" resultType="java.util.Map">
+    select
+           t.ORDER_ID "orderId",
+           t.NO "no",
+           t.RESULT_POUND_NO    "resultPoundNo",
+           t.CAPACITY_NUMBER    "capacityNumber",
+           t.RESULT_CROSS_CALCULATE_NUMBER  "resultCrossCalculateNumber",
+           t.RESULT_TARE_CALCULATE_NUMBER "resultTareCalculateNumber",
+           t.RESULT_CROSS_WEIGHT "resultCrossWeight",
+           t.RESULT_TARE_WEIGHT "resultTareWeight",
+           t.RESULT_NET_WEIGHT "resultNetWeight",
+           t.RESULT_CROSS_WEIGHT_TIME "resultCrossWeightTime",
+           t.RESULT_TARE_WEIGHT_TIME "resultTareWeightTime",
+           t.EAS_ENTRY_ID "easEntryId"
+    from AMS_NOT_UPLOADED_EAS t
+  </select>
+
+
+  <select id="getIsExistsOrderId" parameterType="string" resultType="string">
+        select a.ORDER_ID from AMS_NOT_UPLOADED_EAS a where a.ORDER_ID = #{orderId}
+  </select>
+
+
+</mapper>

+ 4 - 2
src/main/resources/com/steerinfo/dil/mapper/TmstruckWeightResultMapper.xml

@@ -758,7 +758,8 @@
     <select id="getPurOrderMesToKD" parameterType="string" resultType="java.util.Map">
         select APO.PURCHASE_ORDER_NO    "No",
                APO.EAS_ENTRY_ID     "easEntryId",
-               RC.CAPACITY_NUMBER   "capacityNumber"
+               RC.CAPACITY_NUMBER   "capacityNumber",
+               OO.ORDER_ID          "orderId"
         from OMSTRUCK_ORDER OO
         left join AMS_PURCHASE_ORDER APO
         on OO.ORDER_PLAN_ID = APO.PURCHASE_ORDER_ID
@@ -772,7 +773,8 @@
         SELECT
             APO.PURCHASE_ORDER_NO "No",
             APO.EAS_ENTRY_ID "easEntryId",
-            RC.CAPACITY_NUMBER "capacityNumber"
+            RC.CAPACITY_NUMBER "capacityNumber",
+            OO.ORDER_ID          "orderId"
         FROM
             OMSTRUCK_ORDER OO
                 LEFT JOIN AMSTRUCK_INWARD_PLAN AIP ON AIP.PLAN_ID = OO.ORDER_PLAN_ID