dsa

pom.xml

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

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

@@ -169,14 +169,6 @@ public class AmstruckInwardRequirementController extends BaseRESTfulController {
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amstruckInwardRequirementService.getTruckRequirementList(mapValue);
-        columnList.forEach(e->{
-            String tel = e.get("Tel").toString();
-            if (tel.length()==11){
-                return;
-            }
-            String telNew=tel.substring(0,11)+"-"+tel.substring(11,tel.length());
-            e.put("Tel",telNew);
-        });
         PageListAdd data = columnDataUtil.tableColumnData(apiId, null, columnList);
         return success(data);
     }
@@ -340,5 +332,14 @@ public class AmstruckInwardRequirementController extends BaseRESTfulController {
         return success();
     }
 
+    @ApiOperation("抽查炉号")
+    @PostMapping("checkBillet")
+    public RESTfulResult checkBillet(@RequestBody Map<String,Object> map) {
+        int i = amstruckInwardRequirementService.checkBillet(map);
+        if(i == -1) {
+            return failed("该炉号已抽取");
+        }
+        return success(i);
+    }
 
 }

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

@@ -22,4 +22,8 @@ public interface AmstruckRequirementMaterialMapper extends IBaseMapper<AmstruckR
 
     BigDecimal getMaterialId(Map<String, Object> mapValue);
 
+    List<Map<String,Object>> selectRequirementByLuhao(String checkLuNo);
+
+    BigDecimal getSingleWeight(String luNo);
+
 }

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

@@ -0,0 +1,15 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.RmsCheckInfo;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.math.BigDecimal;
+
+@Mapper
+public interface RmsCheckInfoMapper extends IBaseMapper<RmsCheckInfo, BigDecimal> {
+    int getMaxId();
+
+    int selectCheckLuNo(String checkLuNo);
+
+}

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

@@ -14,7 +14,6 @@ public class AmstruckInwardRequirement implements IBasePO<BigDecimal> {
      */
     @ApiModelProperty(value="主键ID",required=true)
     private BigDecimal requirementId;
-    
 
     /**
      * 采购订单ID(PURCHASE_ORDER_ID,DECIMAL,0)
@@ -29,7 +28,7 @@ public class AmstruckInwardRequirement implements IBasePO<BigDecimal> {
     private String requirementNumber;
 
     /**
-     * 需求类型（0：计重；1：计时；2：计次；3：包月）(REQUIREMENT_TYPE,VARCHAR,6)
+     * 需求类型（0：计重；1：计时；2：计次；3：包月）(REQUIREMENT_TYPE,VARCHAR,10)
      */
     @ApiModelProperty(value="需求类型（0：计重；1：计时；2：计次；3：包月）",required=false)
     private String requirementType;
@@ -172,6 +171,18 @@ public class AmstruckInwardRequirement implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="装机备注",required=false)
     private String loadingRemark;
 
+    /**
+     * 班次(REQUIREMENT_SHIFT,VARCHAR,255)
+     */
+    @ApiModelProperty(value="班次",required=false)
+    private String requirementShift;
+
+    /**
+     * 班组(REQUIREMENT_CLASS,VARCHAR,255)
+     */
+    @ApiModelProperty(value="班组",required=false)
+    private String requirementClass;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -397,7 +408,23 @@ public class AmstruckInwardRequirement implements IBasePO<BigDecimal> {
     }
 
     public void setLoadingRemark(String loadingRemark) {
-        this.loadingRemark = loadingRemark;
+        this.loadingRemark = loadingRemark == null ? null : loadingRemark.trim();
+    }
+
+    public String getRequirementShift() {
+        return requirementShift;
+    }
+
+    public void setRequirementShift(String requirementShift) {
+        this.requirementShift = requirementShift == null ? null : requirementShift.trim();
+    }
+
+    public String getRequirementClass() {
+        return requirementClass;
+    }
+
+    public void setRequirementClass(String requirementClass) {
+        this.requirementClass = requirementClass == null ? null : requirementClass.trim();
     }
 
     @Override
@@ -433,6 +460,8 @@ public class AmstruckInwardRequirement implements IBasePO<BigDecimal> {
         sb.append(", dueDate=").append(dueDate);
         sb.append(", isMineral=").append(isMineral);
         sb.append(", loadingRemark=").append(loadingRemark);
+        sb.append(", requirementShift=").append(requirementShift);
+        sb.append(", requirementClass=").append(requirementClass);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -39,7 +39,7 @@ public class OmstruckOrderMaterial implements IBasePO<BigDecimal> {
     private BigDecimal orderMaterialWeight;
 
     /**
-     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
+     * 记录创建人(INSERT_USERNAME,VARCHAR,200)
      */
     @ApiModelProperty(value="记录创建人",required=false)
     private String insertUsername;
@@ -80,6 +80,18 @@ public class OmstruckOrderMaterial implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="物资装卸货优先级",required=false)
     private BigDecimal materialPriority;
 
+    /**
+     * 物资委托发送状态:1:已发送(MATERIAL_MEASSION,DECIMAL,0)
+     */
+    @ApiModelProperty(value="物资委托发送状态:1:已发送",required=false)
+    private BigDecimal materialMeassion;
+
+    /**
+     * 炉号(MATERIAL_LUNO,VARCHAR,50)
+     */
+    @ApiModelProperty(value="炉号",required=false)
+    private String materialLuno;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -188,6 +200,22 @@ public class OmstruckOrderMaterial implements IBasePO<BigDecimal> {
         this.materialPriority = materialPriority;
     }
 
+    public BigDecimal getMaterialMeassion() {
+        return materialMeassion;
+    }
+
+    public void setMaterialMeassion(BigDecimal materialMeassion) {
+        this.materialMeassion = materialMeassion;
+    }
+
+    public String getMaterialLuno() {
+        return materialLuno;
+    }
+
+    public void setMaterialLuno(String materialLuno) {
+        this.materialLuno = materialLuno == null ? null : materialLuno.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -206,6 +234,8 @@ public class OmstruckOrderMaterial implements IBasePO<BigDecimal> {
         sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
         sb.append(", materialDirection=").append(materialDirection);
         sb.append(", materialPriority=").append(materialPriority);
+        sb.append(", materialMeassion=").append(materialMeassion);
+        sb.append(", materialLuno=").append(materialLuno);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -0,0 +1,199 @@
+package com.steerinfo.dil.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel(value="抽查信息")
+public class RmsCheckInfo implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(CHECK_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal checkId;
+
+    /**
+     * 抽查炉号(CHECK_LUNO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="抽查炉号",required=false)
+    private String checkLuno;
+
+    /**
+     * 抽查支数(CHECK_COUNT,DECIMAL,38)
+     */
+    @ApiModelProperty(value="抽查支数",required=false)
+    private BigDecimal checkCount;
+
+    /**
+     * 抽查重量(CHECK_WEIGHT,DECIMAL,38)
+     */
+    @ApiModelProperty(value="抽查重量",required=false)
+    private BigDecimal checkWeight;
+
+    /**
+     * 单支重量平均值(CHECK_SINGLE_WEIGHT,DECIMAL,38)
+     */
+    @ApiModelProperty(value="单支重量平均值",required=false)
+    private BigDecimal checkSingleWeight;
+
+    /**
+     * 记录创建人(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;
+
+    /**
+     * 逻辑删除（0：未删除；1：已删除）(DELETED,DECIMAL,0)
+     */
+    @ApiModelProperty(value="逻辑删除（0：未删除；1：已删除）",required=false)
+    private Short deleted;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.checkId;
+    }
+
+    @Override
+    public void setId(BigDecimal checkId) {
+        this.checkId = checkId;
+    }
+
+    public BigDecimal getCheckId() {
+        return checkId;
+    }
+
+    public void setCheckId(BigDecimal checkId) {
+        this.checkId = checkId;
+    }
+
+    public String getCheckLuno() {
+        return checkLuno;
+    }
+
+    public void setCheckLuno(String checkLuno) {
+        this.checkLuno = checkLuno == null ? null : checkLuno.trim();
+    }
+
+    public BigDecimal getCheckCount() {
+        return checkCount;
+    }
+
+    public void setCheckCount(BigDecimal checkCount) {
+        this.checkCount = checkCount;
+    }
+
+    public BigDecimal getCheckWeight() {
+        return checkWeight;
+    }
+
+    public void setCheckWeight(BigDecimal checkWeight) {
+        this.checkWeight = checkWeight;
+    }
+
+    public BigDecimal getCheckSingleWeight() {
+        return checkSingleWeight;
+    }
+
+    public void setCheckSingleWeight(BigDecimal checkSingleWeight) {
+        this.checkSingleWeight = checkSingleWeight;
+    }
+
+    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();
+    }
+
+    public Short getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(Short deleted) {
+        this.deleted = deleted;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", checkId=").append(checkId);
+        sb.append(", checkLuno=").append(checkLuno);
+        sb.append(", checkCount=").append(checkCount);
+        sb.append(", checkWeight=").append(checkWeight);
+        sb.append(", checkSingleWeight=").append(checkSingleWeight);
+        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(", deleted=").append(deleted);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/dil/service/IAmstruckInwardRequirementService.java

@@ -62,6 +62,9 @@ public interface IAmstruckInwardRequirementService extends IBaseService<Amstruck
 
     List<Map<String, Object>> getBilletRequirementList(Map<String, Object> mapValue);
 
+    int checkBillet(Map<String, Object> map);
+
+
 
 //    int insertInwardRequirementPlan(Map<String, Object> mapValue);
 }

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

@@ -142,6 +142,10 @@ public class AmstruckInwardPlanServiceImpl extends BaseServiceImpl<AmstruckInwar
             omstruckOrderMaterial.setOrderId(orderId);
             omstruckOrderMaterial.setMaterialId(materialId);
             omstruckOrderMaterial.setOrderMaterialNumber(DataChange.dataToBigDecimal(mapValue.get("count")));
+            if (mapValue.get("materialWeight") != null) {
+                omstruckOrderMaterial.setOrderMaterialWeight(DataChange.dataToBigDecimal(mapValue.get("materialWeight")));
+            }
+            omstruckOrderMaterial.setMaterialLuno(mapValue.get("heatNo").toString());
             omstruckOrderMaterial.setInsertTime(new Date());
             omstruckOrderMaterial.setUpdateTime(new Date());
             result +=omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);

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

@@ -11,7 +11,11 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.math.RoundingMode;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * AmstruckInwardRequirement服务实现：
@@ -47,9 +51,15 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
     @Autowired
     AmstruckInwardPlanServiceImpl amstruckInwardPlanService;
 
+    @Autowired
+    OmstruckOrderMaterialMapper omstruckOrderMaterialMapper;
+
     @Autowired
     RmsMaterialMapper rmsMaterialMapper;
 
+    @Autowired
+    RmsCheckInfoMapper rmsCheckInfoMapper;
+
     @Override
     protected IBaseMapper<AmstruckInwardRequirement, BigDecimal> getMapper() {
         return amstruckInwardRequirementMapper;
@@ -162,11 +172,9 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
     //新增钢坯车辆用车需求
     @Override
     @Transactional
-    public int addBilletRequirement(Map<String, Object> mapValue) {
+    public synchronized int addBilletRequirement(Map<String, Object> mapValue) {
         String requirementType = (String) mapValue.get("requirementType");
         Integer requirementShipperId = (Integer) mapValue.get("requirementShipperId");
-        //提取车型
-        String InsertUpdateRemark = (String) mapValue.get("remark");
         //取出装机需求
         AmstruckInwardRequirement amstruckInwardRequirement = new AmstruckInwardRequirement();
         //设置主键
@@ -181,10 +189,15 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
         // 设置常规字段
         amstruckInwardRequirement.setInsertTime(new Date());
         amstruckInwardRequirement.setInsertUsername((String) mapValue.get("orgCode"));
-        amstruckInwardRequirement.setInsertUpdateRemark(InsertUpdateRemark);
-        amstruckInwardRequirement.setInsertUpdateRemark("内转钢坯专用");
+        if(!(Boolean) mapValue.get("isMeter")) {
+            amstruckInwardRequirement.setInsertUpdateRemark("不需要过磅");
+        }else {
+            amstruckInwardRequirement.setInsertUpdateRemark("需要过磅");
+        }
         amstruckInwardRequirement.setDeleted(new BigDecimal(0));
         amstruckInwardRequirement.setLineId(new BigDecimal(1));
+        amstruckInwardRequirement.setRequirementShift(mapValue.get("shift").toString());
+        amstruckInwardRequirement.setRequirementClass((String) mapValue.get("clazz"));
         int result = 0;
         result += amstruckInwardRequirementMapper.insertSelective(amstruckInwardRequirement);
         // 物资中间表
@@ -200,35 +213,44 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
         }
         AmstruckRequirementMaterial amstruckRequirementMaterial = new AmstruckRequirementMaterial();
         BigDecimal materialNumber = DataChange.dataToBigDecimal(mapValue.get("count"));
+        BigDecimal materialWeight = null;
         BigDecimal requirementPlatformId = DataChange.dataToBigDecimal(mapValue.get("requirementPlatformId"));
         BigDecimal requirementUnloadUnitId = DataChange.dataToBigDecimal(mapValue.get("requirementUnloadUnitId"));
         String luNo =  mapValue.get("heatNo").toString();
+        //根据炉号去查询近一单个重量
+        BigDecimal singleWeight = amstruckRequirementMaterialMapper.getSingleWeight(luNo);
+        if(singleWeight != null) {
+            materialWeight = singleWeight.multiply(materialNumber);
+            mapValue.put("materialWeight",materialWeight);
+        }
         amstruckRequirementMaterial.setRequirementMaterialId(amstruckRequirementMaterialMapper.selectRequirementMaterialId());
         amstruckRequirementMaterial.setMaterialLuno(luNo);
         amstruckRequirementMaterial.setRequirementId(requirementId);
-        if (materialNumber.intValue() != 0)
-                amstruckRequirementMaterial.setMaterialCount(materialNumber);
+        if (materialNumber.intValue() != 0) {
+            amstruckRequirementMaterial.setMaterialCount(materialNumber);
+        }
         if (requirementPlatformId.intValue() !=0){
                 amstruckRequirementMaterial.setRequirementPlatformId(requirementPlatformId);
             }
         if (requirementUnloadUnitId.intValue() !=0){
                 amstruckRequirementMaterial.setRequirementUnloadUnitId(requirementUnloadUnitId);
             }
+        if (materialWeight != null) {
+            amstruckRequirementMaterial.setMaterialWeight(materialWeight);
+        }
         amstruckRequirementMaterial.setMaterialId(materialId);
         amstruckRequirementMaterial.setInsertTime(new Date());
         amstruckRequirementMaterial.setInsertUsername("admin");
-        amstruckRequirementMaterial.setInsertUpdateRemark(InsertUpdateRemark);
         result += amstruckRequirementMaterialMapper.insertSelective(amstruckRequirementMaterial);
         //制定计划
         Map<String, Object> planMap = new HashMap<>();
-        planMap.put("carrierId",5848);
+        planMap.put("carrierId",3642);
         planMap.put("requirementId",requirementId);
         planMap.put("addBilletRequirement",1);
         planMap.put("materialId",materialId);
         planMap.putAll(mapValue);
         result =+ amstruckInwardPlanService.insert(planMap);
         //分解计划-车牌号,物资
-
         return result;
     }
 
@@ -237,6 +259,49 @@ public class AmstruckInwardRequirementServiceImpl extends BaseServiceImpl<Amstru
         return amstruckInwardRequirementMapper.getBilletRequirementList(mapValue);
     }
 
+    @Override
+    @Transactional
+    public synchronized int checkBillet(Map<String, Object> map) {
+        String checkLuNo = map.get("checkHeatNo").toString();
+        //根据炉号查询是否有没有被抽取
+        int checkLuCount = rmsCheckInfoMapper.selectCheckLuNo(checkLuNo);
+        if(checkLuCount != 0) {
+            return -1;
+        }
+        BigDecimal checkCount = DataChange.dataToBigDecimal(map.get("checkCount"));
+        BigDecimal checkWeight = DataChange.dataToBigDecimal(map.get("checkWeight"));
+        //根据抽查重量和抽取支数计算单支重量平均值
+        BigDecimal singleWeight = checkWeight.divide(checkCount, RoundingMode.HALF_UP);
+        RmsCheckInfo rmsCheckInfo = new RmsCheckInfo();
+        //获取主键
+        rmsCheckInfo.setCheckId(new BigDecimal(rmsCheckInfoMapper.getMaxId()));
+        rmsCheckInfo.setCheckLuno(checkLuNo);
+        rmsCheckInfo.setCheckCount(checkCount);
+        rmsCheckInfo.setCheckWeight(checkWeight);
+        rmsCheckInfo.setCheckSingleWeight(singleWeight);
+        rmsCheckInfo.setInsertUsername(map.get("orgCode").toString());
+        rmsCheckInfo.setInsertTime(new Date());
+        int i = rmsCheckInfoMapper.insertSelective(rmsCheckInfo);
+        //根据炉号去查询近一个月的需求
+        List<Map<String,Object>> requirementList = amstruckRequirementMaterialMapper.selectRequirementByLuhao(checkLuNo);
+        for (Map<String,Object> requirementMap : requirementList) {
+            BigDecimal requirementMaterialId = DataChange.dataToBigDecimal(requirementMap.get("requirementMaterialId"));
+            BigDecimal orderMaterialId = DataChange.dataToBigDecimal(requirementMap.get("orderMaterialId"));
+            AmstruckRequirementMaterial amstruckRequirementMaterial = amstruckRequirementMaterialMapper.selectByPrimaryKey(requirementMaterialId);
+            amstruckRequirementMaterial.setUpdateTime(new Date());
+            amstruckRequirementMaterial.setRequirementMaterialId(requirementMaterialId);
+            BigDecimal materialWeight = singleWeight.multiply(amstruckRequirementMaterial.getMaterialCount());
+            amstruckRequirementMaterial.setMaterialWeight(materialWeight);
+            i =+ amstruckRequirementMaterialMapper.updateByPrimaryKeySelective(amstruckRequirementMaterial);
+            OmstruckOrderMaterial omstruckOrderMaterial = omstruckOrderMaterialMapper.selectByPrimaryKey(orderMaterialId);
+            omstruckOrderMaterial.setOrderMaterialId(orderMaterialId);
+            omstruckOrderMaterial.setOrderMaterialWeight(materialWeight);
+            omstruckOrderMaterial.setUpdateTime(new Date());
+            i =+ omstruckOrderMaterialMapper.updateByPrimaryKeySelective(omstruckOrderMaterial);
+        }
+        return i;
+    }
+
     /**
      * 查询用车需求
      * @param mapValue

src/main/java/com/steerinfo/dil/util/DataChange.java

@@ -2,7 +2,6 @@ package com.steerinfo.dil.util;
 
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
@@ -303,4 +302,19 @@ public class DataChange {
             map.put("oneDate", yesDate + " 08:00:00");
         }
     }
+
+    public static String shift() {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:MM");
+        String morningStart = "07:31";
+        String morningEnd = "15:30";
+        String noonStart = "15:31";
+        String noonEnd = "23:50";
+        if(simpleDateFormat.format(new Date()).compareTo(morningStart) != -1 && simpleDateFormat.format(new Date()).compareTo(morningEnd) != 1) {
+            return "早班";
+        }else if(simpleDateFormat.format(new Date()).compareTo(noonStart) != -1 && simpleDateFormat.format(new Date()).compareTo(noonEnd) != 1) {
+            return "中班";
+        }else {
+            return "夜班";
+        }
+    }
 }

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

@@ -29,23 +29,25 @@
         <result column="DUE_DATE" jdbcType="TIMESTAMP" property="dueDate" />
         <result column="IS_MINERAL" jdbcType="VARCHAR" property="isMineral" />
         <result column="LOADING_REMARK" jdbcType="VARCHAR" property="loadingRemark" />
+        <result column="REQUIREMENT_SHIFT" jdbcType="VARCHAR" property="requirementShift" />
+        <result column="REQUIREMENT_CLASS" jdbcType="VARCHAR" property="requirementClass" />
     </resultMap>
     <sql id="columns">
-        REQUIREMENT_ID, PURCHASE_ORDER_ID, REQUIREMENT_NUMBER, REQUIREMENT_TYPE, CAPACITY_TYPE_ID, 
-    REQUIREMENT_TRUCK_TIME, REQUIREMENT_SHIPPER_ID, REQUIREMENT_WORK_TYPE, REQUIREMENT_WORK_CONTENT, 
-    LINE_ID, REQUIREMENT_WORK_ENVIRONMENT, REQUIREMENT_ESTIMATED_DURATION, REQUIREMENT_OVERLIMIT, 
-    REQUIREMNT_UNIT_ID, REQUIREMENT_STATUS, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
-    UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, REQUIREMENT_UNLOAD_UNIT_ID, REQUIREMENT_PLATFORM_ID, 
-    REQUIREMENT_LINK_TYPE, DUE_DATE, IS_MINERAL, LOADING_REMARK
+        REQUIREMENT_ID, PURCHASE_ORDER_ID, REQUIREMENT_NUMBER, REQUIREMENT_TYPE, CAPACITY_TYPE_ID,
+    REQUIREMENT_TRUCK_TIME, REQUIREMENT_SHIPPER_ID, REQUIREMENT_WORK_TYPE, REQUIREMENT_WORK_CONTENT,
+    LINE_ID, REQUIREMENT_WORK_ENVIRONMENT, REQUIREMENT_ESTIMATED_DURATION, REQUIREMENT_OVERLIMIT,
+    REQUIREMNT_UNIT_ID, REQUIREMENT_STATUS, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
+    UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, REQUIREMENT_UNLOAD_UNIT_ID, REQUIREMENT_PLATFORM_ID,
+    REQUIREMENT_LINK_TYPE, DUE_DATE, IS_MINERAL, LOADING_REMARK, REQUIREMENT_SHIFT, REQUIREMENT_CLASS
     </sql>
     <sql id="columns_alias">
-        t.REQUIREMENT_ID, t.PURCHASE_ORDER_ID, t.REQUIREMENT_NUMBER, t.REQUIREMENT_TYPE, 
-    t.CAPACITY_TYPE_ID, t.REQUIREMENT_TRUCK_TIME, t.REQUIREMENT_SHIPPER_ID, t.REQUIREMENT_WORK_TYPE, 
-    t.REQUIREMENT_WORK_CONTENT, t.LINE_ID, t.REQUIREMENT_WORK_ENVIRONMENT, t.REQUIREMENT_ESTIMATED_DURATION, 
-    t.REQUIREMENT_OVERLIMIT, t.REQUIREMNT_UNIT_ID, t.REQUIREMENT_STATUS, t.INSERT_USERNAME, 
-    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED, 
-    t.REQUIREMENT_UNLOAD_UNIT_ID, t.REQUIREMENT_PLATFORM_ID, t.REQUIREMENT_LINK_TYPE, 
-    t.DUE_DATE, t.IS_MINERAL, t.LOADING_REMARK
+        t.REQUIREMENT_ID, t.PURCHASE_ORDER_ID, t.REQUIREMENT_NUMBER, t.REQUIREMENT_TYPE,
+    t.CAPACITY_TYPE_ID, t.REQUIREMENT_TRUCK_TIME, t.REQUIREMENT_SHIPPER_ID, t.REQUIREMENT_WORK_TYPE,
+    t.REQUIREMENT_WORK_CONTENT, t.LINE_ID, t.REQUIREMENT_WORK_ENVIRONMENT, t.REQUIREMENT_ESTIMATED_DURATION,
+    t.REQUIREMENT_OVERLIMIT, t.REQUIREMNT_UNIT_ID, t.REQUIREMENT_STATUS, t.INSERT_USERNAME,
+    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED,
+    t.REQUIREMENT_UNLOAD_UNIT_ID, t.REQUIREMENT_PLATFORM_ID, t.REQUIREMENT_LINK_TYPE,
+    t.DUE_DATE, t.IS_MINERAL, t.LOADING_REMARK, t.REQUIREMENT_SHIFT, t.REQUIREMENT_CLASS
     </sql>
     <sql id="select">
         SELECT <include refid="columns" /> FROM AMSTRUCK_INWARD_REQUIREMENT
@@ -136,6 +138,12 @@
             <if test="loadingRemark != null and loadingRemark != ''">
                 and LOADING_REMARK = #{loadingRemark}
             </if>
+            <if test="requirementShift != null and requirementShift != ''">
+                and REQUIREMENT_SHIFT = #{requirementShift}
+            </if>
+            <if test="requirementClass != null and requirementClass != ''">
+                and REQUIREMENT_CLASS = #{requirementClass}
+            </if>
         </where>
     </sql>
     <sql id="whereLike">
@@ -221,9 +229,15 @@
             <if test="loadingRemark != null and loadingRemark != ''">
                 and LOADING_REMARK LIKE '%${loadingRemark}%'
             </if>
+            <if test="requirementShift != null and requirementShift != ''">
+                and REQUIREMENT_SHIFT LIKE '%${requirementShift}%'
+            </if>
+            <if test="requirementClass != null and requirementClass != ''">
+                and REQUIREMENT_CLASS LIKE '%${requirementClass}%'
+            </if>
         </where>
     </sql>
-    <delete id="deleteByPrimaryKey" parameterType="decimal">
+    <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
         delete from AMSTRUCK_INWARD_REQUIREMENT
         where REQUIREMENT_ID = #{requirementId,jdbcType=DECIMAL}
     </delete>
@@ -308,6 +322,12 @@
         <if test="loadingRemark != null and loadingRemark != ''">
             or LOADING_REMARK = #{loadingRemark}
         </if>
+        <if test="requirementShift != null and requirementShift != ''">
+            or REQUIREMENT_SHIFT = #{requirementShift}
+        </if>
+        <if test="requirementClass != null and requirementClass != ''">
+            or REQUIREMENT_CLASS = #{requirementClass}
+        </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.AmstruckInwardRequirement">
         insert into AMSTRUCK_INWARD_REQUIREMENT (REQUIREMENT_ID, PURCHASE_ORDER_ID, REQUIREMENT_NUMBER,
@@ -319,7 +339,8 @@
                                                  INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
                                                  INSERT_UPDATE_REMARK, DELETED, REQUIREMENT_UNLOAD_UNIT_ID,
                                                  REQUIREMENT_PLATFORM_ID, REQUIREMENT_LINK_TYPE,
-                                                 DUE_DATE, IS_MINERAL)
+                                                 DUE_DATE, IS_MINERAL, LOADING_REMARK,
+                                                 REQUIREMENT_SHIFT, REQUIREMENT_CLASS)
         values (#{requirementId,jdbcType=DECIMAL}, #{purchaseOrderId,jdbcType=DECIMAL}, #{requirementNumber,jdbcType=VARCHAR},
                 #{requirementType,jdbcType=VARCHAR}, #{capacityTypeId,jdbcType=DECIMAL}, #{requirementTruckTime,jdbcType=TIMESTAMP},
                 #{requirementShipperId,jdbcType=DECIMAL}, #{requirementWorkType,jdbcType=VARCHAR},
@@ -329,7 +350,8 @@
                 #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
                 #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL}, #{requirementUnloadUnitId,jdbcType=DECIMAL},
                 #{requirementPlatformId,jdbcType=DECIMAL}, #{requirementLinkType,jdbcType=DECIMAL},
-                #{dueDate,jdbcType=TIMESTAMP}, #{isMineral,jdbcType=VARCHAR}, #{loadingRemark,jdbcType=VARCHAR})
+                #{dueDate,jdbcType=TIMESTAMP}, #{isMineral,jdbcType=VARCHAR}, #{loadingRemark,jdbcType=VARCHAR},
+                #{requirementShift,jdbcType=VARCHAR}, #{requirementClass,jdbcType=VARCHAR})
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmstruckInwardRequirement">
         insert into AMSTRUCK_INWARD_REQUIREMENT
@@ -415,6 +437,12 @@
             <if test="loadingRemark != null">
                 LOADING_REMARK,
             </if>
+            <if test="requirementShift != null">
+                REQUIREMENT_SHIFT,
+            </if>
+            <if test="requirementClass != null">
+                REQUIREMENT_CLASS,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="requirementId != null">
@@ -498,6 +526,12 @@
             <if test="loadingRemark != null">
                 #{loadingRemark,jdbcType=VARCHAR},
             </if>
+            <if test="requirementShift != null">
+                #{requirementShift,jdbcType=VARCHAR},
+            </if>
+            <if test="requirementClass != null">
+                #{requirementClass,jdbcType=VARCHAR},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmstruckInwardRequirement">
@@ -527,7 +561,9 @@
             REQUIREMENT_LINK_TYPE = #{requirementLinkType,jdbcType=DECIMAL},
             DUE_DATE = #{dueDate,jdbcType=TIMESTAMP},
             IS_MINERAL = #{isMineral,jdbcType=VARCHAR},
-            LOADING_REMARK = #{loadingRemark,jdbcType=VARCHAR}
+            LOADING_REMARK = #{loadingRemark,jdbcType=VARCHAR},
+            REQUIREMENT_SHIFT = #{requirementShift,jdbcType=VARCHAR},
+            REQUIREMENT_CLASS = #{requirementClass,jdbcType=VARCHAR}
         where REQUIREMENT_ID = #{requirementId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmstruckInwardRequirement">
@@ -611,10 +647,16 @@
             <if test="loadingRemark != null">
                 LOADING_REMARK = #{loadingRemark,jdbcType=VARCHAR},
             </if>
+            <if test="requirementShift != null">
+                REQUIREMENT_SHIFT = #{requirementShift,jdbcType=VARCHAR},
+            </if>
+            <if test="requirementClass != null">
+                REQUIREMENT_CLASS = #{requirementClass,jdbcType=VARCHAR},
+            </if>
         </set>
         where REQUIREMENT_ID = #{requirementId,jdbcType=DECIMAL}
     </update>
-    <select id="selectByPrimaryKey" parameterType="decimal" resultMap="BaseResultMap">
+    <select id="selectByPrimaryKey" parameterType="DECIMAL" resultMap="BaseResultMap">
         <include refid="select" />
         where REQUIREMENT_ID = #{requirementId,jdbcType=DECIMAL}
     </select>
@@ -641,7 +683,8 @@
         INSERT_UPDATE_REMARK, DELETED,
         REQUIREMENT_UNLOAD_UNIT_ID, REQUIREMENT_PLATFORM_ID,
         REQUIREMENT_LINK_TYPE, DUE_DATE,
-        IS_MINERAL)
+        IS_MINERAL, LOADING_REMARK, REQUIREMENT_SHIFT,
+        REQUIREMENT_CLASS)
         ( <foreach collection="list" item="item" separator="union all">
         select
         #{item.requirementId,jdbcType=DECIMAL},
@@ -657,7 +700,8 @@
         #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleted,jdbcType=DECIMAL},
         #{item.requirementUnloadUnitId,jdbcType=DECIMAL}, #{item.requirementPlatformId,jdbcType=DECIMAL},
         #{item.requirementLinkType,jdbcType=DECIMAL}, #{item.dueDate,jdbcType=TIMESTAMP},
-        #{item.isMineral,jdbcType=VARCHAR},#{item.loadingRemark,jdbcType=VARCHAR}  from dual
+        #{item.isMineral,jdbcType=VARCHAR}, #{item.loadingRemark,jdbcType=VARCHAR}, #{item.requirementShift,jdbcType=VARCHAR},
+        #{item.requirementClass,jdbcType=VARCHAR} from dual
     </foreach> )
     </insert>
     <update id="batchUpdate" parameterType="java.util.List">
@@ -771,12 +815,19 @@
         <foreach close="end" collection="list" index="index" item="item" open="case REQUIREMENT_ID" separator=" ">
             when #{item.requirementId,jdbcType=DECIMAL} then #{item.loadingRemark,jdbcType=VARCHAR}
         </foreach>
+        ,REQUIREMENT_SHIFT=
+        <foreach close="end" collection="list" index="index" item="item" open="case REQUIREMENT_ID" separator=" ">
+            when #{item.requirementId,jdbcType=DECIMAL} then #{item.requirementShift,jdbcType=VARCHAR}
+        </foreach>
+        ,REQUIREMENT_CLASS=
+        <foreach close="end" collection="list" index="index" item="item" open="case REQUIREMENT_ID" separator=" ">
+            when #{item.requirementId,jdbcType=DECIMAL} then #{item.requirementClass,jdbcType=VARCHAR}
+        </foreach>
         where REQUIREMENT_ID in
         <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
             #{item.requirementId,jdbcType=DECIMAL}
         </foreach>
     </update>
-
     <delete id="batchDelete" parameterType="java.util.List">
         delete from AMSTRUCK_INWARD_REQUIREMENT
         where REQUIREMENT_ID in
@@ -784,7 +835,6 @@
             #{id}
         </foreach>
     </delete>
-    <!-- 友情提示！！！-->
     <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
     <!-- 展示用车需求 -->
     <select id="getTruckRequirementList" resultType="java.util.Map" parameterType="java.util.Map">
@@ -1434,34 +1484,47 @@
     </select>
     <select id="getBilletRequirementList" resultType="java.util.Map">
         SELECT * FROM (
-            SELECT
-            AIR.REQUIREMENT_NUMBER AS "requirementNumber",
-            AIR.REQUIREMENT_TYPE AS "requirementType",
-            RTR.TRANS_RANGE_VALUE AS "rangeValue",
-            RS.SHIPPER_NAME AS "shipperName",
-            AIR.INSERT_TIME AS "insertTime",
-            rw1.warehouse_name "unloadName",
-            rw2.warehouse_name "loadName",
-            arm.material_count "materialCount",
-            rm.material_name "materialName",
-            rm.material_specification "materialSpe",
-            rm.MATERIAL_MODEL "materialModel",
-            ARM.MATERIAL_LUNO "materialLuNo",
-            AIR.REQUIREMENT_ID "requirementId"
-            FROM
-            AMSTRUCK_INWARD_REQUIREMENT AIR
-            LEFT JOIN RMS_SHIPPER RS ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
-            LEFT JOIN amstruck_requirement_material arm ON air.requirement_id = arm.requirement_id
-            LEFT JOIN rms_warehouse rw1 ON rw1.warehouse_id = arm.requirement_unload_unit_id
-            LEFT JOIN rms_warehouse rw2 ON rw2.warehouse_id = arm.requirement_platform_id
-            LEFT JOIN rms_material rm ON rm.material_id = arm.material_id
-            LEFT JOIN amstruck_inward_requirement air ON air.requirement_id = arm.requirement_id
-            LEFT JOIN RMS_TRANS_RANGE RTR ON RTR.TRANS_RANGE_ID = AIR.LINE_ID
-            LEFT JOIN RMS_MATERIAL_TYPE RMT ON RMT.MATERIAL_TYPE_ID = RM.MATERIAL_TYPE_ID
-            WHERE
-            AIR.DELETED = 0
-            AND AIR.PURCHASE_ORDER_ID IS NULL
-            AND ARM.MATERIAL_LUNO IS NOT NULL
+        SELECT
+        RC.CAPACITY_NUMBER "capacityNo",
+        OO.ORDER_ID "orderId",
+        AIR.REQUIREMENT_NUMBER AS "requirementNumber",
+        RS.SHIPPER_NAME AS "shipperName",
+        AIR.INSERT_TIME AS "insertTime",
+        rw1.warehouse_name "unloadName",
+        rw2.warehouse_name "loadName",
+        arm.material_count "materialCount",
+        rm.material_name "materialName",
+        rm.material_specification "materialSpe",
+        rm.MATERIAL_MODEL "materialModel",
+        ARM.MATERIAL_LUNO "materialLuNo",
+        AIR.REQUIREMENT_ID "requirementId",
+        ARM.MATERIAL_WEIGHT "materialWeight",
+        decode(oo.ORDER_STATUS,2,'已收货',null) "orderStatus",
+        AIR.REQUIREMENT_SHIFT   "shift",
+        AIR.REQUIREMENT_CLASS   "class"
+        FROM
+        AMSTRUCK_INWARD_REQUIREMENT AIR
+        LEFT JOIN RMS_SHIPPER RS ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
+        LEFT JOIN amstruck_requirement_material arm ON air.requirement_id = arm.requirement_id
+        LEFT JOIN rms_warehouse rw1 ON rw1.warehouse_id = arm.requirement_unload_unit_id
+        LEFT JOIN rms_warehouse rw2 ON rw2.warehouse_id = arm.requirement_platform_id
+        LEFT JOIN rms_material rm ON rm.material_id = arm.material_id
+        LEFT JOIN RMS_TRANS_RANGE RTR ON RTR.TRANS_RANGE_ID = AIR.LINE_ID
+        LEFT JOIN RMS_MATERIAL_TYPE RMT ON RMT.MATERIAL_TYPE_ID = RM.MATERIAL_TYPE_ID
+        LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP ON ARP.REQUIREMENT_ID=AIR.REQUIREMENT_ID
+        LEFT JOIN AMSTRUCK_INWARD_PLAN AIP ON AIP.PLAN_ID = ARP.PLAN_ID
+        LEFT JOIN OMSTRUCK_ORDER OO ON OO.ORDER_PLAN_ID  = AIP.PLAN_ID
+        LEFT JOIN RMS_CAPACITY RC ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON  TTR.ORDER_ID = OO.ORDER_ID
+        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN TMSTRUCK_LOAD_RESULT TLR ON TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN TMSTRUCK_UNLOAD_RESULT TUR ON TUR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        WHERE
+        AIR.DELETED = 0
+        AND AIR.PURCHASE_ORDER_ID IS NULL
+        AND ARM.MATERIAL_LUNO IS NOT NULL
+        AND OO.ORDER_STATUS IN (2,4,5)
+        AND OO.ORDER_TYPE = 11
         <if test="oneDate != null">
             and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= AIR.INSERT_TIME
         </if>
@@ -1469,6 +1532,7 @@
             and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= AIR.INSERT_TIME
             and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= AIR.INSERT_TIME
         </if>
+        Order by air.insert_time desc
         )
     </select>
     <update id="closeOrderByRequirementId" parameterType="decimal">

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

@@ -478,4 +478,20 @@
                                   on air.requirement_id = arm.requirement_id
                  where air.requirement_id = #{requirementId}
                </select>
+    <select id="selectRequirementByLuhao" resultType="java.util.Map" parameterType="string">
+      select distinct ARM.REQUIREMENT_MATERIAL_ID "requirementMaterialId",oom.ORDER_MATERIAL_ID "orderMaterialId" from AMSTRUCK_REQUIREMENT_MATERIAL ARM
+      left join AMSTRUCK_REQUIREMENT_PLAN ARP on arp.REQUIREMENT_ID = arm.REQUIREMENT_ID
+      left join AMSTRUCK_INWARD_PLAN AIP on aip.PLAN_ID = arp.PLAN_ID
+      left join OMSTRUCK_ORDER OO on oo.ORDER_PLAN_ID = aip.PLAN_ID
+      left join OMSTRUCK_ORDER_MATERIAL OOM  on oom.ORDER_ID = oo.ORDER_ID
+      where
+            add_months(sysdate,-1) &lt;= arm.INSERT_TIME
+      and  arm.MATERIAL_WEIGHT is null
+      and  arm.MATERIAL_LUNO = #{checkLuNo}
+      and  oo.order_status in (2,4,5)
+    </select>
+  <select id="getSingleWeight" resultType="java.math.BigDecimal" parameterType="string">
+    select RCI.CHECK_SINGLE_WEIGHT from RMS_CHECK_INFO RCI
+    where RCI.CHECK_LUNO = #{luNo}
+  </select>
 </mapper>

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

@@ -14,16 +14,18 @@
     <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
     <result column="MATERIAL_DIRECTION" jdbcType="DECIMAL" property="materialDirection" />
     <result column="MATERIAL_PRIORITY" jdbcType="DECIMAL" property="materialPriority" />
+    <result column="MATERIAL_MEASSION" jdbcType="DECIMAL" property="materialMeassion" />
+    <result column="MATERIAL_LUNO" jdbcType="VARCHAR" property="materialLuno" />
   </resultMap>
   <sql id="columns">
-    ORDER_MATERIAL_ID, ORDER_ID, MATERIAL_ID, ORDER_MATERIAL_NUMBER, ORDER_MATERIAL_WEIGHT,
-    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
-    MATERIAL_DIRECTION, MATERIAL_PRIORITY
+    ORDER_MATERIAL_ID, ORDER_ID, MATERIAL_ID, ORDER_MATERIAL_NUMBER, ORDER_MATERIAL_WEIGHT, 
+    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, 
+    MATERIAL_DIRECTION, MATERIAL_PRIORITY, MATERIAL_MEASSION, MATERIAL_LUNO
   </sql>
   <sql id="columns_alias">
-    t.ORDER_MATERIAL_ID, t.ORDER_ID, t.MATERIAL_ID, t.ORDER_MATERIAL_NUMBER, t.ORDER_MATERIAL_WEIGHT,
-    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK,
-    t.MATERIAL_DIRECTION, t.MATERIAL_PRIORITY
+    t.ORDER_MATERIAL_ID, t.ORDER_ID, t.MATERIAL_ID, t.ORDER_MATERIAL_NUMBER, t.ORDER_MATERIAL_WEIGHT, 
+    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, 
+    t.MATERIAL_DIRECTION, t.MATERIAL_PRIORITY, t.MATERIAL_MEASSION, t.MATERIAL_LUNO
   </sql>
   <sql id="select">
     SELECT <include refid="columns" /> FROM OMSTRUCK_ORDER_MATERIAL
@@ -69,6 +71,12 @@
       <if test="materialPriority != null">
         and MATERIAL_PRIORITY = #{materialPriority}
       </if>
+      <if test="materialMeassion != null">
+        and MATERIAL_MEASSION = #{materialMeassion}
+      </if>
+      <if test="materialLuno != null and materialLuno != ''">
+        and MATERIAL_LUNO = #{materialLuno}
+      </if>
     </where>
   </sql>
   <sql id="whereLike">
@@ -109,6 +117,12 @@
       <if test="materialPriority != null">
         and MATERIAL_PRIORITY = #{materialPriority}
       </if>
+      <if test="materialMeassion != null">
+        and MATERIAL_MEASSION = #{materialMeassion}
+      </if>
+      <if test="materialLuno != null and materialLuno != ''">
+        and MATERIAL_LUNO LIKE '%${materialLuno}%'
+      </if>
     </where>
   </sql>
   <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
@@ -151,18 +165,26 @@
     <if test="materialPriority != null">
       or MATERIAL_PRIORITY = #{materialPriority}
     </if>
+    <if test="materialMeassion != null">
+      or MATERIAL_MEASSION = #{materialMeassion}
+    </if>
+    <if test="materialLuno != null and materialLuno != ''">
+      or MATERIAL_LUNO = #{materialLuno}
+    </if>
   </delete>
   <insert id="insert" parameterType="com.steerinfo.dil.model.OmstruckOrderMaterial">
     insert into OMSTRUCK_ORDER_MATERIAL (ORDER_MATERIAL_ID, ORDER_ID, MATERIAL_ID,
                                          ORDER_MATERIAL_NUMBER, ORDER_MATERIAL_WEIGHT,
                                          INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
                                          UPDATE_TIME, INSERT_UPDATE_REMARK, MATERIAL_DIRECTION,
-                                         MATERIAL_PRIORITY)
+                                         MATERIAL_PRIORITY, MATERIAL_MEASSION, MATERIAL_LUNO
+    )
     values (#{orderMaterialId,jdbcType=DECIMAL}, #{orderId,jdbcType=DECIMAL}, #{materialId,jdbcType=DECIMAL},
             #{orderMaterialNumber,jdbcType=DECIMAL}, #{orderMaterialWeight,jdbcType=DECIMAL},
             #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR},
             #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{materialDirection,jdbcType=DECIMAL},
-            #{materialPriority,jdbcType=DECIMAL})
+            #{materialPriority,jdbcType=DECIMAL}, #{materialMeassion,jdbcType=DECIMAL}, #{materialLuno,jdbcType=VARCHAR}
+           )
   </insert>
   <insert id="insertSelective" parameterType="com.steerinfo.dil.model.OmstruckOrderMaterial">
     insert into OMSTRUCK_ORDER_MATERIAL
@@ -203,6 +225,12 @@
       <if test="materialPriority != null">
         MATERIAL_PRIORITY,
       </if>
+      <if test="materialMeassion != null">
+        MATERIAL_MEASSION,
+      </if>
+      <if test="materialLuno != null">
+        MATERIAL_LUNO,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="orderMaterialId != null">
@@ -241,6 +269,12 @@
       <if test="materialPriority != null">
         #{materialPriority,jdbcType=DECIMAL},
       </if>
+      <if test="materialMeassion != null">
+        #{materialMeassion,jdbcType=DECIMAL},
+      </if>
+      <if test="materialLuno != null">
+        #{materialLuno,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.OmstruckOrderMaterial">
@@ -255,7 +289,9 @@
         UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
         INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
         MATERIAL_DIRECTION = #{materialDirection,jdbcType=DECIMAL},
-        MATERIAL_PRIORITY = #{materialPriority,jdbcType=DECIMAL}
+        MATERIAL_PRIORITY = #{materialPriority,jdbcType=DECIMAL},
+        MATERIAL_MEASSION = #{materialMeassion,jdbcType=DECIMAL},
+        MATERIAL_LUNO = #{materialLuno,jdbcType=VARCHAR}
     where ORDER_MATERIAL_ID = #{orderMaterialId,jdbcType=DECIMAL}
   </update>
   <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.OmstruckOrderMaterial">
@@ -294,6 +330,12 @@
       <if test="materialPriority != null">
         MATERIAL_PRIORITY = #{materialPriority,jdbcType=DECIMAL},
       </if>
+      <if test="materialMeassion != null">
+        MATERIAL_MEASSION = #{materialMeassion,jdbcType=DECIMAL},
+      </if>
+      <if test="materialLuno != null">
+        MATERIAL_LUNO = #{materialLuno,jdbcType=VARCHAR},
+      </if>
     </set>
     where ORDER_MATERIAL_ID = #{orderMaterialId,jdbcType=DECIMAL}
   </update>
@@ -316,7 +358,8 @@
     ORDER_MATERIAL_WEIGHT, INSERT_USERNAME,
     INSERT_TIME, UPDATE_USERNAME,
     UPDATE_TIME, INSERT_UPDATE_REMARK,
-    MATERIAL_DIRECTION, MATERIAL_PRIORITY
+    MATERIAL_DIRECTION, MATERIAL_PRIORITY,
+    MATERIAL_MEASSION, MATERIAL_LUNO
     )
     ( <foreach collection="list" item="item" separator="union all">
     select
@@ -325,7 +368,8 @@
     #{item.orderMaterialWeight,jdbcType=DECIMAL}, #{item.insertUsername,jdbcType=VARCHAR},
     #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
     #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
-    #{item.materialDirection,jdbcType=DECIMAL}, #{item.materialPriority,jdbcType=DECIMAL}
+    #{item.materialDirection,jdbcType=DECIMAL}, #{item.materialPriority,jdbcType=DECIMAL},
+    #{item.materialMeassion,jdbcType=DECIMAL}, #{item.materialLuno,jdbcType=VARCHAR}
     from dual
   </foreach> )
   </insert>
@@ -380,6 +424,14 @@
     <foreach close="end" collection="list" index="index" item="item" open="case ORDER_MATERIAL_ID" separator=" ">
       when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.materialPriority,jdbcType=DECIMAL}
     </foreach>
+    ,MATERIAL_MEASSION=
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_MATERIAL_ID" separator=" ">
+      when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.materialMeassion,jdbcType=DECIMAL}
+    </foreach>
+    ,MATERIAL_LUNO=
+    <foreach close="end" collection="list" index="index" item="item" open="case ORDER_MATERIAL_ID" separator=" ">
+      when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.materialLuno,jdbcType=VARCHAR}
+    </foreach>
     where ORDER_MATERIAL_ID in
     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
       #{item.orderMaterialId,jdbcType=DECIMAL}
@@ -394,6 +446,8 @@
   </delete>
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
 
   <select id="getMaterialList" parameterType="DECIMAL" resultType="java.util.Map">
     SELECT OOM.MATERIAL_ID           "materialId",

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

@@ -0,0 +1,375 @@
+<?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.RmsCheckInfoMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.RmsCheckInfo">
+    <id column="CHECK_ID" jdbcType="DECIMAL" property="checkId" />
+    <result column="CHECK_LUNO" jdbcType="VARCHAR" property="checkLuno" />
+    <result column="CHECK_COUNT" jdbcType="DECIMAL" property="checkCount" />
+    <result column="CHECK_WEIGHT" jdbcType="DECIMAL" property="checkWeight" />
+    <result column="CHECK_SINGLE_WEIGHT" jdbcType="DECIMAL" property="checkSingleWeight" />
+    <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" />
+  </resultMap>
+  <sql id="columns">
+    CHECK_ID, CHECK_LUNO, CHECK_COUNT, CHECK_WEIGHT, CHECK_SINGLE_WEIGHT, INSERT_USERNAME, 
+    INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED
+  </sql>
+  <sql id="columns_alias">
+    t.CHECK_ID, t.CHECK_LUNO, t.CHECK_COUNT, t.CHECK_WEIGHT, t.CHECK_SINGLE_WEIGHT, t.INSERT_USERNAME, 
+    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM RMS_CHECK_INFO
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM RMS_CHECK_INFO t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="checkId != null">
+        and CHECK_ID = #{checkId}
+      </if>
+      <if test="checkLuno != null and checkLuno != ''">
+        and CHECK_LUNO = #{checkLuno}
+      </if>
+      <if test="checkCount != null">
+        and CHECK_COUNT = #{checkCount}
+      </if>
+      <if test="checkWeight != null">
+        and CHECK_WEIGHT = #{checkWeight}
+      </if>
+      <if test="checkSingleWeight != null">
+        and CHECK_SINGLE_WEIGHT = #{checkSingleWeight}
+      </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>
+      <if test="deleted != null">
+        and DELETED = #{deleted}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="checkId != null">
+        and CHECK_ID = #{checkId}
+      </if>
+      <if test="checkLuno != null and checkLuno != ''">
+        and CHECK_LUNO LIKE '%${checkLuno}%'
+      </if>
+      <if test="checkCount != null">
+        and CHECK_COUNT = #{checkCount}
+      </if>
+      <if test="checkWeight != null">
+        and CHECK_WEIGHT = #{checkWeight}
+      </if>
+      <if test="checkSingleWeight != null">
+        and CHECK_SINGLE_WEIGHT = #{checkSingleWeight}
+      </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>
+      <if test="deleted != null">
+        and DELETED = #{deleted}
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+    delete from RMS_CHECK_INFO
+    where CHECK_ID = #{checkId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from RMS_CHECK_INFO
+    where 1!=1 
+      <if test="checkLuno != null and checkLuno != ''">
+        or CHECK_LUNO = #{checkLuno}
+      </if>
+      <if test="checkCount != null">
+        or CHECK_COUNT = #{checkCount}
+      </if>
+      <if test="checkWeight != null">
+        or CHECK_WEIGHT = #{checkWeight}
+      </if>
+      <if test="checkSingleWeight != null">
+        or CHECK_SINGLE_WEIGHT = #{checkSingleWeight}
+      </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>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.model.RmsCheckInfo">
+    insert into RMS_CHECK_INFO (CHECK_ID, CHECK_LUNO, CHECK_COUNT, 
+      CHECK_WEIGHT, CHECK_SINGLE_WEIGHT, INSERT_USERNAME, 
+      INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
+      INSERT_UPDATE_REMARK, DELETED)
+    values (#{checkId,jdbcType=DECIMAL}, #{checkLuno,jdbcType=VARCHAR}, #{checkCount,jdbcType=DECIMAL}, 
+      #{checkWeight,jdbcType=DECIMAL}, #{checkSingleWeight,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR}, 
+      #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{insertUpdateRemark,jdbcType=VARCHAR}, #{deleted,jdbcType=DECIMAL})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsCheckInfo">
+    insert into RMS_CHECK_INFO
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="checkId != null">
+        CHECK_ID,
+      </if>
+      <if test="checkLuno != null">
+        CHECK_LUNO,
+      </if>
+      <if test="checkCount != null">
+        CHECK_COUNT,
+      </if>
+      <if test="checkWeight != null">
+        CHECK_WEIGHT,
+      </if>
+      <if test="checkSingleWeight != null">
+        CHECK_SINGLE_WEIGHT,
+      </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>
+      <if test="deleted != null">
+        DELETED,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="checkId != null">
+        #{checkId,jdbcType=DECIMAL},
+      </if>
+      <if test="checkLuno != null">
+        #{checkLuno,jdbcType=VARCHAR},
+      </if>
+      <if test="checkCount != null">
+        #{checkCount,jdbcType=DECIMAL},
+      </if>
+      <if test="checkWeight != null">
+        #{checkWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="checkSingleWeight != null">
+        #{checkSingleWeight,jdbcType=DECIMAL},
+      </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>
+      <if test="deleted != null">
+        #{deleted,jdbcType=DECIMAL},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsCheckInfo">
+    update RMS_CHECK_INFO
+    set CHECK_LUNO = #{checkLuno,jdbcType=VARCHAR},
+      CHECK_COUNT = #{checkCount,jdbcType=DECIMAL},
+      CHECK_WEIGHT = #{checkWeight,jdbcType=DECIMAL},
+      CHECK_SINGLE_WEIGHT = #{checkSingleWeight,jdbcType=DECIMAL},
+      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}
+    where CHECK_ID = #{checkId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsCheckInfo">
+    update RMS_CHECK_INFO
+    <set>
+      <if test="checkLuno != null">
+        CHECK_LUNO = #{checkLuno,jdbcType=VARCHAR},
+      </if>
+      <if test="checkCount != null">
+        CHECK_COUNT = #{checkCount,jdbcType=DECIMAL},
+      </if>
+      <if test="checkWeight != null">
+        CHECK_WEIGHT = #{checkWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="checkSingleWeight != null">
+        CHECK_SINGLE_WEIGHT = #{checkSingleWeight,jdbcType=DECIMAL},
+      </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>
+      <if test="deleted != null">
+        DELETED = #{deleted,jdbcType=DECIMAL},
+      </if>
+    </set>
+    where CHECK_ID = #{checkId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where CHECK_ID = #{checkId,jdbcType=DECIMAL}
+  </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 RMS_CHECK_INFO 
+      (CHECK_ID, 
+      CHECK_LUNO, CHECK_COUNT, CHECK_WEIGHT, 
+      CHECK_SINGLE_WEIGHT, INSERT_USERNAME, 
+      INSERT_TIME, UPDATE_USERNAME, 
+      UPDATE_TIME, INSERT_UPDATE_REMARK, 
+      DELETED)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.checkId,jdbcType=DECIMAL}, 
+      #{item.checkLuno,jdbcType=VARCHAR}, #{item.checkCount,jdbcType=DECIMAL}, #{item.checkWeight,jdbcType=DECIMAL}, 
+      #{item.checkSingleWeight,jdbcType=DECIMAL}, #{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  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update RMS_CHECK_INFO
+     set
+       CHECK_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CHECK_ID" close="end">
+          when #{item.checkId,jdbcType=DECIMAL} then #{item.checkId,jdbcType=DECIMAL}
+       </foreach>
+       ,CHECK_LUNO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CHECK_ID" close="end">
+          when #{item.checkId,jdbcType=DECIMAL} then #{item.checkLuno,jdbcType=VARCHAR}
+       </foreach>
+       ,CHECK_COUNT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CHECK_ID" close="end">
+          when #{item.checkId,jdbcType=DECIMAL} then #{item.checkCount,jdbcType=DECIMAL}
+       </foreach>
+       ,CHECK_WEIGHT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CHECK_ID" close="end">
+          when #{item.checkId,jdbcType=DECIMAL} then #{item.checkWeight,jdbcType=DECIMAL}
+       </foreach>
+       ,CHECK_SINGLE_WEIGHT=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CHECK_ID" close="end">
+          when #{item.checkId,jdbcType=DECIMAL} then #{item.checkSingleWeight,jdbcType=DECIMAL}
+       </foreach>
+       ,INSERT_USERNAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CHECK_ID" close="end">
+          when #{item.checkId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CHECK_ID" close="end">
+          when #{item.checkId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_USERNAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CHECK_ID" close="end">
+          when #{item.checkId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CHECK_ID" close="end">
+          when #{item.checkId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,INSERT_UPDATE_REMARK=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CHECK_ID" close="end">
+          when #{item.checkId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+       </foreach>
+       ,DELETED=
+       <foreach collection="list" item="item" index="index" separator=" " open="case CHECK_ID" close="end">
+          when #{item.checkId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+       </foreach>
+     where CHECK_ID in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.checkId,jdbcType=DECIMAL}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from RMS_CHECK_INFO
+    where CHECK_ID in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+  <select id="getMaxId" resultType="java.lang.Integer">
+    select nvl(max(CHECK_ID),0) + 1 from RMS_CHECK_INFO
+  </select>
+  <select id="selectCheckLuNo" resultType="java.lang.Integer" parameterType="string">
+    select count(rci.CHECK_ID) from RMS_CHECK_INFO RCI
+    where rci.CHECK_LUNO = #{checkHeatNo}
+  </select>
+</mapper>