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

pom.xml

@@ -160,10 +160,29 @@
             <artifactId>slf4j-nop</artifactId>
             <version>1.7.21</version>
         </dependency>
+
+        <!-- ftpclient -->
+        <dependency>
+            <groupId>commons-net</groupId>
+            <artifactId>commons-net</artifactId>
+            <version>3.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.16.20</version>
+        </dependency>
+        <!--        SpringDataJpa-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+
     </dependencies>
     <build>
         <plugins>
-                        <!-- 自动生成代码文件-->
+<!--                         自动生成代码文件-->
 <!--            <plugin>-->
 <!--                <groupId>com.steerinfo</groupId>-->
 <!--                <artifactId>generator-maven-plugin</artifactId>-->
@@ -175,7 +194,8 @@
 <!--                    &lt;!&ndash;包名&ndash;&gt;-->
 <!--                    <targetPackage>com.steerinfo.dil</targetPackage>-->
 <!--                    <tables>-->
-<!--                        <table></table>-->
+<!--                        <table>
+</table>-->
 <!--                    </tables>-->
 <!--                </configuration>-->
 <!--                <executions>-->

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

@@ -41,57 +41,9 @@ public class RmsMaterialSteelController extends BaseRESTfulController {
 
 
     @PostMapping("/upload")
-    public Map<String, Object> fileupload(MultipartFile file, HttpServletRequest req) {
-        SimpleDateFormat sdf = new SimpleDateFormat("/yyyy/MM/dd/");
-        //首先要给文件找一个目录
-        //先写返回值
-        Map<String, Object> result = new HashMap<>();
-        //再用pdf格式开始书写,先找原始的名字
-        String originName = file.getOriginalFilename();
-        //判断文件类型是不是pdf
-        if(!originName.endsWith(".pdf")){
-            //如果不是的话，就返回类型
-            result.put("status","error");
-            result.put("msg","文件类型不对");
-            return result;
-        }
-        //如果是正确的话，就需要写保存文件的文件夹
-        //.format(new Date())的意思是 也就是格式化一个新的时间
-        //Date会创建一个时间，然后会按照当前的sdf格式调用format将当前时间创建出来 直接调用new Date()可能会出现这种格式
-        //Sun Feb 28 10:55:06 CST 2021
-        //再是getServletContext
-        String format=sdf.format(new Date());
-        //这也是一个临时的路径，项目重启之后，他就会变的
-        String realPath = req.getServletContext().getRealPath("/") +format;
-        //再是保存文件的文件夹
-        File folder = new File(realPath);
-        //如果不存在，就自己创建
-        if(!folder.exists()){
-            folder.mkdirs();
-        }
-        String newName = UUID.randomUUID().toString() + ".pdf";
-        //然后就可以保存了
-        try {
-            file.transferTo(new File(folder,newName));
-            //这个还有一个url
-            String url= req.getScheme()+"://"+req.getServerName()+":"+req.getServerPort()+format+newName;
-            //如果指向成功了
-            result.put("status","success");
-            result.put("url",url);
-            // 得到炉号
-            int index = originName.indexOf(".");
-            String materialFurnaceNumber = originName.substring(0, index);
-            Map<String,Object> map = new HashMap<>();
-            map.put("materialFurnaceNumber",materialFurnaceNumber);
-            map.put("conclusionUrl",realPath);
-            // 修改钢材质检结果
-            Integer code = rmsMaterialSteelService.updateMaterialQuality(map);
-        } catch (IOException e) {
-            //返回异常
-            result.put("status","error");
-            result.put("msg",e.getMessage());
-        }
-        return  result;
+    @ResponseBody
+    public Map<String, String> upFile(@RequestParam("file") MultipartFile file, HttpServletRequest request) throws IOException {
+        return rmsMaterialSteelService.upFile(file, request);//这里调用service的upfile方法，传入两个参数。
     }
 
 }

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

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.feign.TmstruckFeign;
+import com.steerinfo.dil.service.ITmstruckWeightResultService;
 import com.steerinfo.dil.service.impl.TmstruckWeightResultServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
@@ -63,14 +64,8 @@ public class TmstruckWeightResultController extends BaseRESTfulController {
     )
     @PostMapping("/receiveTmsTruckWeightResult")
     public RESTfulResult receiveTmsTruckWeightResult(@RequestBody(required = false) List<Map<String, Object>> mapList) {
-        int i = 0;
-        try {
-            i = tmstruckWeightResultServiceImpl.receiveTmsTruckWeightResult(mapList);
-        } catch (Exception e) {
-            String message = e.getMessage();
-            return failed(message);
-        }
-        return success(i);
+        String s = tmstruckWeightResultServiceImpl.receiveTmsTruckWeightResult(mapList);
+        return success(s);
     }
 
 

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

@@ -10,7 +10,7 @@ import java.util.Map;
  * @author HUJIANGUO
  * @create 2021-11-10 11:30
  */
-@FeignClient(value = "logistic",url = "172.16.33.122:44325")
+@FeignClient(value = "logistic",url = "172.16.33.166:8089")
 public interface EASFeign {
 
     @PostMapping("api/logistics/AbnormalReturn")

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

@@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.HashMap;
 
-@FeignClient(value = "DIL-IM-DEV", url = "172.16.33.161:8099")
+@FeignClient(value = "DIL-IM-DEV", url = "172.16.33.166:8055")
 public interface IMFeign {
     @PostMapping("/websocket/sendToUser")
     @ResponseBody

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

@@ -15,7 +15,7 @@ import java.util.Map;
  * @ time      :2021/12/3 1:14
  */
 
-@FeignClient(value = "dil-tms-truck-dev", url = "localhost:8088")
+@FeignClient(value = "dil-tms-truck-dev", url = "172.16.33.166:8088")
 public interface TmsFeign {
 
     @ApiOperation(value="更新计量实绩 ")

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

@@ -0,0 +1,18 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.TmstrainWeightResult;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface TmstrainWeightResultMapper extends IBaseMapper<TmstrainWeightResult, BigDecimal> {
+    @Select("select seq_train_weight_result.nextval from dual")
+    BigDecimal selectMaxId();
+
+    //通过采购订单号和车皮号查询火运总实绩ID
+    Map<String, Object> getResultIdByPurNoAndWagonNo(Map<String, Object> map);
+}

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

@@ -0,0 +1,348 @@
+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 TmstrainWeightResult implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(RESULT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal resultId;
+
+    /**
+     * 火运总实绩ID(RESULT_TOTAL_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="火运总实绩ID",required=false)
+    private BigDecimal resultTotalId;
+
+    /**
+     * 磅单号(RESULT_POUND_NO,VARCHAR,20)
+     */
+    @ApiModelProperty(value="磅单号",required=false)
+    private String resultPoundNo;
+
+    /**
+     * 物资ID(MATERIAL_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="物资ID",required=false)
+    private BigDecimal materialId;
+
+    /**
+     * 计毛点（轨道衡ID）(RESULT_GROSS_PLACE_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="计毛点（轨道衡ID）",required=false)
+    private BigDecimal resultGrossPlaceId;
+
+    /**
+     * 毛重（保留两位小数）(RESULT_GROSS_WEIGHT,DECIMAL,0)
+     */
+    @ApiModelProperty(value="毛重（保留两位小数）",required=false)
+    private BigDecimal resultGrossWeight;
+
+    /**
+     * 计毛重时间(RESULT_GROSS_WEIGHT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="计毛重时间",required=false)
+    private Date resultGrossWeightTime;
+
+    /**
+     * 计皮点（轨道衡ID）(RESULT_TARE_PLACE_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="计皮点（轨道衡ID）",required=false)
+    private BigDecimal resultTarePlaceId;
+
+    /**
+     * 皮重（保留两位小数）(RESULT_TARE_WEIGHT,DECIMAL,0)
+     */
+    @ApiModelProperty(value="皮重（保留两位小数）",required=false)
+    private BigDecimal resultTareWeight;
+
+    /**
+     * 计皮重时间(RESULT_TARE_WEIGHT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="计皮重时间",required=false)
+    private Date resultTareWeightTime;
+
+    /**
+     * 净重（保留两位小数）(RESULT_NET_WEIGHT,DECIMAL,0)
+     */
+    @ApiModelProperty(value="净重（保留两位小数）",required=false)
+    private BigDecimal resultNetWeight;
+
+    /**
+     * 记录创建人(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;
+
+    /**
+     * 废除人(DELETE_NAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="废除人",required=false)
+    private String deleteName;
+
+    /**
+     * 废除时间(DELETE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="废除时间",required=false)
+    private Date deleteTime;
+
+    /**
+     * 是否需要扣水扣杂(0:否，1：是)(ISDEDUCT,DECIMAL,38)
+     */
+    @ApiModelProperty(value="是否需要扣水扣杂(0:否，1：是)",required=false)
+    private BigDecimal isdeduct;
+
+    /**
+     * 是否完成扣水扣杂(0:否，1：是)(ISQUALITY,DECIMAL,38)
+     */
+    @ApiModelProperty(value="是否完成扣水扣杂(0:否，1：是)",required=false)
+    private BigDecimal isquality;
+
+    /**
+     * 是否需要质检 0 不需要 1 ：需要(RESULT_IS_QUALITY,DECIMAL,38)
+     */
+    @ApiModelProperty(value="是否需要质检 0 不需要 1 ：需要",required=false)
+    private BigDecimal resultIsQuality;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.resultId;
+    }
+
+    @Override
+    public void setId(BigDecimal resultId) {
+        this.resultId = resultId;
+    }
+
+    public BigDecimal getResultId() {
+        return resultId;
+    }
+
+    public void setResultId(BigDecimal resultId) {
+        this.resultId = resultId;
+    }
+
+    public BigDecimal getResultTotalId() {
+        return resultTotalId;
+    }
+
+    public void setResultTotalId(BigDecimal resultTotalId) {
+        this.resultTotalId = resultTotalId;
+    }
+
+    public String getResultPoundNo() {
+        return resultPoundNo;
+    }
+
+    public void setResultPoundNo(String resultPoundNo) {
+        this.resultPoundNo = resultPoundNo == null ? null : resultPoundNo.trim();
+    }
+
+    public BigDecimal getMaterialId() {
+        return materialId;
+    }
+
+    public void setMaterialId(BigDecimal materialId) {
+        this.materialId = materialId;
+    }
+
+    public BigDecimal getResultGrossPlaceId() {
+        return resultGrossPlaceId;
+    }
+
+    public void setResultGrossPlaceId(BigDecimal resultGrossPlaceId) {
+        this.resultGrossPlaceId = resultGrossPlaceId;
+    }
+
+    public BigDecimal getResultGrossWeight() {
+        return resultGrossWeight;
+    }
+
+    public void setResultGrossWeight(BigDecimal resultGrossWeight) {
+        this.resultGrossWeight = resultGrossWeight;
+    }
+
+    public Date getResultGrossWeightTime() {
+        return resultGrossWeightTime;
+    }
+
+    public void setResultGrossWeightTime(Date resultGrossWeightTime) {
+        this.resultGrossWeightTime = resultGrossWeightTime;
+    }
+
+    public BigDecimal getResultTarePlaceId() {
+        return resultTarePlaceId;
+    }
+
+    public void setResultTarePlaceId(BigDecimal resultTarePlaceId) {
+        this.resultTarePlaceId = resultTarePlaceId;
+    }
+
+    public BigDecimal getResultTareWeight() {
+        return resultTareWeight;
+    }
+
+    public void setResultTareWeight(BigDecimal resultTareWeight) {
+        this.resultTareWeight = resultTareWeight;
+    }
+
+    public Date getResultTareWeightTime() {
+        return resultTareWeightTime;
+    }
+
+    public void setResultTareWeightTime(Date resultTareWeightTime) {
+        this.resultTareWeightTime = resultTareWeightTime;
+    }
+
+    public BigDecimal getResultNetWeight() {
+        return resultNetWeight;
+    }
+
+    public void setResultNetWeight(BigDecimal resultNetWeight) {
+        this.resultNetWeight = resultNetWeight;
+    }
+
+    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 String getDeleteName() {
+        return deleteName;
+    }
+
+    public void setDeleteName(String deleteName) {
+        this.deleteName = deleteName == null ? null : deleteName.trim();
+    }
+
+    public Date getDeleteTime() {
+        return deleteTime;
+    }
+
+    public void setDeleteTime(Date deleteTime) {
+        this.deleteTime = deleteTime;
+    }
+
+    public BigDecimal getIsdeduct() {
+        return isdeduct;
+    }
+
+    public void setIsdeduct(BigDecimal isdeduct) {
+        this.isdeduct = isdeduct;
+    }
+
+    public BigDecimal getIsquality() {
+        return isquality;
+    }
+
+    public void setIsquality(BigDecimal isquality) {
+        this.isquality = isquality;
+    }
+
+    public BigDecimal getResultIsQuality() {
+        return resultIsQuality;
+    }
+
+    public void setResultIsQuality(BigDecimal resultIsQuality) {
+        this.resultIsQuality = resultIsQuality;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", resultId=").append(resultId);
+        sb.append(", resultTotalId=").append(resultTotalId);
+        sb.append(", resultPoundNo=").append(resultPoundNo);
+        sb.append(", materialId=").append(materialId);
+        sb.append(", resultGrossPlaceId=").append(resultGrossPlaceId);
+        sb.append(", resultGrossWeight=").append(resultGrossWeight);
+        sb.append(", resultGrossWeightTime=").append(resultGrossWeightTime);
+        sb.append(", resultTarePlaceId=").append(resultTarePlaceId);
+        sb.append(", resultTareWeight=").append(resultTareWeight);
+        sb.append(", resultTareWeightTime=").append(resultTareWeightTime);
+        sb.append(", resultNetWeight=").append(resultNetWeight);
+        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(", deleteName=").append(deleteName);
+        sb.append(", deleteTime=").append(deleteTime);
+        sb.append(", isdeduct=").append(isdeduct);
+        sb.append(", isquality=").append(isquality);
+        sb.append(", resultIsQuality=").append(resultIsQuality);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -1,5 +1,9 @@
 package com.steerinfo.dil.service;
 
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
 import java.util.Map;
 
 /**
@@ -29,4 +33,6 @@ public interface IRmsMaterialSteelService {
      * @return
      */
     Integer updateMaterialQuality(Map<String, Object> map);
+
+    Map<String, String> upFile(MultipartFile file, HttpServletRequest request) throws IOException;
 }

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

@@ -0,0 +1,23 @@
+package com.steerinfo.dil.service;
+
+import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.dil.model.TmstrainWeightResult;
+import java.util.Date;
+import java.math.BigDecimal;
+
+/**
+ * TmstrainWeightResult服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-12-08 04:34
+ * 类描述
+ * 修订历史：
+ * 日期：2021-12-08
+ * 作者：generator
+ * 参考：
+ * 描述：TmstrainWeightResult服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface ITmstrainWeightResultService{
+
+}

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

@@ -29,5 +29,5 @@ public interface ITmstruckWeightResultService {
      * @param mapList
      * @return
      */
-    int receiveTmsTruckWeightResult(List<Map<String, Object>> mapList) throws Exception;
+    String receiveTmsTruckWeightResult(List<Map<String, Object>> mapList);
 }

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

@@ -19,6 +19,7 @@ import java.util.Map;
 
 /**
  * AmsPurchaseOrder服务实现：
+ *
  * @author generator
  * @version 1.0-SNAPSHORT 2021-10-23 02:50
  * 类描述
@@ -27,8 +28,8 @@ import java.util.Map;
  * 作者：generator
  * 参考：
  * 描述：AmsPurchaseOrder服务实现
- * @see null
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ * @see null
  */
 @Service(value = "amsPurchaseOrderService")
 public class AmsPurchaseOrderServiceImpl implements IAmsPurchaseOrderService {
@@ -40,6 +41,7 @@ public class AmsPurchaseOrderServiceImpl implements IAmsPurchaseOrderService {
 
     /**
      * 采购订单管理
+     *
      * @param mapVal
      * @return
      */
@@ -55,28 +57,28 @@ public class AmsPurchaseOrderServiceImpl implements IAmsPurchaseOrderService {
         String materialCode = (String) mapVal.get("materialCode");
         // 得到外轮船名
         String resultForeignShipName = (String) mapVal.get("resultForeignShipName");
-        Map<String,Object> map = new HashMap<>();
-        map.put("materialCode",materialCode);
+        Map<String, Object> map = new HashMap<>();
+        map.put("materialCode", materialCode);
         BigDecimal materialId = amsPurchaseOrderMapper.getMaterialId(materialCode);
-        map.put("resultForeignShipName",resultForeignShipName);
+        map.put("resultForeignShipName", resultForeignShipName);
         // 得到批次
         BigDecimal batchId;
-        if (amsPurchaseOrderMapper.getBatchId(map) == null) {
-            DilBatch dilBatch = new DilBatch();
-            batchId = dilBatchMapper.selectBatchId();
-            dilBatch.setBatchId(batchId);
-            dilBatch.setResultForeignShipName(resultForeignShipName);
-            dilBatch.setMaterialId(materialId);
-            dilBatch.setInsertTime(new Date());
-            dilBatch.setUpdateTime(new Date());
-            dilBatch.setInsertUsername("admin");
-            dilBatch.setUpdateUsername("admin");
-            dilBatch.setInsertUpdateRemark("无");
-            dilBatchMapper.insertSelective(dilBatch);
-        }
-        else {
-            batchId = amsPurchaseOrderMapper.getBatchId(map);
-        }
+//        if (amsPurchaseOrderMapper.getBatchId(map) == null) {
+        DilBatch dilBatch = new DilBatch();
+        batchId = dilBatchMapper.selectBatchId();
+        dilBatch.setBatchId(batchId);
+        dilBatch.setResultForeignShipName(resultForeignShipName);
+        dilBatch.setMaterialId(materialId);
+        dilBatch.setInsertTime(new Date());
+        dilBatch.setUpdateTime(new Date());
+        dilBatch.setInsertUsername("admin");
+        dilBatch.setUpdateUsername("admin");
+        dilBatch.setInsertUpdateRemark("无");
+        dilBatchMapper.insertSelective(dilBatch);
+//        }
+//        else {
+//            batchId = amsPurchaseOrderMapper.getBatchId(map);
+//        }
         // 得到采购员
         String purchaseOrderBuyer = (String) mapVal.get("purchaseOrderBuyer");
 //        // 得到发货单位
@@ -117,10 +119,10 @@ public class AmsPurchaseOrderServiceImpl implements IAmsPurchaseOrderService {
         amsPurchaseOrder.setUpdateTime(new Date());
         amsPurchaseOrder.setUpdateUsername("admin");
         amsPurchaseOrder.setInsertUpdateRemark("无");
-        Map<String,Object> map1 = new HashMap<>();
+        Map<String, Object> map1 = new HashMap<>();
         BigDecimal deleted = new BigDecimal(0);
-        map1.put("purchaseOrderNo",purchaseOrderNo);
-        map1.put("deleted",deleted);
+        map1.put("purchaseOrderNo", purchaseOrderNo);
+        map1.put("deleted", deleted);
         List<AmsPurchaseOrder> amsPurchaseOrders = amsPurchaseOrderMapper.selectByParameters(map1);
         // 新增
         if (amsPurchaseOrders.size() == 0) {

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

@@ -2,9 +2,15 @@ package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.mapper.RmsMaterialSteelMapper;
 import com.steerinfo.dil.service.IRmsMaterialSteelService;
+import com.steerinfo.dil.util.FtpUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -26,6 +32,8 @@ public class RmsMaterialSteelServiceImpl implements IRmsMaterialSteelService {
     @Autowired
     private RmsMaterialSteelMapper rmsMaterialSteelMapper;
 
+    @Autowired
+    FtpUtil ftpUtil;
     /**
      * 得到没有质保书的炉号
      * @return
@@ -44,4 +52,38 @@ public class RmsMaterialSteelServiceImpl implements IRmsMaterialSteelService {
     public Integer updateMaterialQuality(Map<String, Object> map) {
         return rmsMaterialSteelMapper.updateMaterialQuality(map);
     }
+
+
+    /**
+     * PDF文件上传
+     * @param file
+     * @param request
+     * @return
+     * @throws IOException
+     */
+    @Override
+    public Map<String, String> upFile(MultipartFile file, HttpServletRequest request) throws IOException {
+        Map<String, String> map = new HashMap<>();
+        map.put("code", "500");
+        map.put("msg", "上传文件失败");
+        String fileName = file.getOriginalFilename();//获取文件名
+        String suffixName = fileName.substring(fileName.lastIndexOf("."));//获取文件的后缀名
+        // 得到文件名的前缀
+        String capacityNumberAndFurnaceNumber = fileName.substring(0,fileName.lastIndexOf("."));
+        //上传的文件名也需要加上后缀，不然虚拟机不知道文件格式
+        InputStream inputStream = file.getInputStream();
+        String filePath = null;
+        //关于ftp处理文件上传下载这里单独写了一个工具类ftpUtil，下面会写这个类
+        //@Autowired  private FtpUtil ftpUtil;service层上面引入了这个方法。
+        Boolean flag = ftpUtil.uploadFile(fileName, inputStream);//主要就是这里实现了ftp的文件上传
+        if (flag == true) {
+            //log.info("上传文件成功!");
+            filePath = ftpUtil.FTP_BASEPATH + fileName;
+            map.put("code", "200");
+            map.put("msg", "上传文件成功");
+        }
+        map.put("path", filePath);
+        System.out.println(map);
+        return map;
+    }
 }

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

@@ -0,0 +1,32 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.dil.model.TmstrainWeightResult;
+import com.steerinfo.dil.mapper.TmstrainWeightResultMapper;
+import com.steerinfo.dil.service.ITmstrainWeightResultService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.Date;
+import java.math.BigDecimal;
+
+/**
+ * TmstrainWeightResult服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-12-08 04:34
+ * 类描述
+ * 修订历史：
+ * 日期：2021-12-08
+ * 作者：generator
+ * 参考：
+ * 描述：TmstrainWeightResult服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "tmstrainWeightResultService")
+public class TmstrainWeightResultServiceImpl implements ITmstrainWeightResultService {
+
+    @Autowired
+    private TmstrainWeightResultMapper tmstrainWeightResultMapper;
+
+}

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

@@ -1,8 +1,10 @@
 package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.feign.TmsFeign;
+import com.steerinfo.dil.mapper.TmstrainWeightResultMapper;
 import com.steerinfo.dil.mapper.TmstruckReceiptResultMapper;
 import com.steerinfo.dil.mapper.UtilsMapper;
+import com.steerinfo.dil.model.TmstrainWeightResult;
 import com.steerinfo.dil.model.TmstruckReceiptResult;
 import com.steerinfo.dil.model.TmstruckWeightResult;
 import com.steerinfo.dil.mapper.TmstruckWeightResultMapper;
@@ -11,6 +13,7 @@ import com.steerinfo.dil.util.DataChange;
 import io.swagger.annotations.ApiModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -51,6 +54,9 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
     @Autowired
     TmstruckReceiptResultMapper tmstruckReceiptResultMapper;
 
+    @Autowired
+    TmstrainWeightResultMapper tmstrainWeightResultMapper;
+
     /**
      * 接收计量实绩信息
      *      "orderNumber":"WYSDD2021091000000002",
@@ -68,36 +74,58 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
      * @return
      */
     @Override
-    public int receiveTmsTruckWeightResult(List<Map<String, Object>> mapList) throws Exception {
+    @Transactional
+    public String receiveTmsTruckWeightResult(List<Map<String, Object>> mapList){
         //遍历列表
-        int count = 0;
+        StringBuilder sb = new StringBuilder();
         for (Map<String, Object> map : mapList) {
-            //通过传来的运输订单号 与 物资ID查询计重实绩ID
-            Map<String, Object> stringObjectMap = tmstruckWeightResultMapper.selectTotalIdByOrderNo(map);
-            if(stringObjectMap == null){
-                throw new Exception(map.get("orderNumber") + "没有此订单信息或物资信息(" + map.get("materialId") + ")错误");
+            sb.append(" ");
+            String resultTareCalculateNumber = (String) map.get("resultTareCalculateNumber");
+            //如果计量衡名字中含有铁专线 则代表是轨道衡 走轨道衡路线
+            if(resultTareCalculateNumber.contains("铁专线")){
+                sb.append(addTrainWeightResult(map));
+            }else {
+                //走汽车衡
+                sb.append(addTruckWeightResult(map));
             }
-            map.putAll(stringObjectMap);
-            TmstruckWeightResult tmstruckWeightResult = generateWeightResult(map);
-            count += tmstruckWeightResultMapper.updateByPrimaryKeySelective(tmstruckWeightResult);
-            BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderTypee"));
-            if("5678".contains(orderType.toString())){
-                if(map.get("resultTareWeightTime") != null ){
-                    //如果是采购订单 计皮后自动完成签收
-                    autoReceipt((String) map.get("orderNumber"));
-                }
+        }
+        return sb.toString();
+    }
+
+    /**
+     * 添加汽车衡计量实绩
+     * @param map
+     * @return
+     */
+    public String addTruckWeightResult(Map<String, Object> map) {
+        //通过传来的运输订单号 与 物资ID查询计重实绩ID
+        Map<String, Object> stringObjectMap = tmstruckWeightResultMapper.selectTotalIdByOrderNo(map);
+        if(stringObjectMap == null){
+            return map.get("orderNumber") + "没有此订单信息或物资信息(" + map.get("materialId") + ")错误";
+        }
+        map.putAll(stringObjectMap);
+        TmstruckWeightResult tmstruckWeightResult = null;
+        try {
+            tmstruckWeightResult = generateWeightResult(map);
+        } catch (Exception e) {
+            return e.getMessage();
+        }
+        int i = tmstruckWeightResultMapper.updateByPrimaryKeySelective(tmstruckWeightResult);
+        BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderTypee"));
+        if("5678".contains(orderType.toString())){
+            if(map.get("resultTareWeightTime") != null ){
+                //如果是采购订单 计皮后自动完成签收
+                autoReceipt((String) map.get("orderNumber"));
             }
-            //路段顺序号+1
-            utilsService.updateOrderLineSequence(map);
-            //推送数据
-            utilsService.pushMesToWebsocket((String) stringObjectMap.get("capacityNumber"), "计量");
         }
-        return count;
+        //推送数据
+        utilsService.pushMesToWebsocket((String) stringObjectMap.get("capacityNumber"), "计量");
+        return map.get("orderNumber") + "成功";
     }
 
 
     /**
-     * 生成计量实体类
+     * 生成汽运计量实体类
      * @param map
      * @return
      */
@@ -119,14 +147,17 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
                 //添加毛重汽车衡
                 Integer tareId = tmstruckWeightResultMapper.selectTruckCalculateId((String) map.get("resultTareCalculateNumber"));
                 if(tareId == null){
-                    throw new Exception("没有此汽车衡：" + map.get("resultTareCalculateNumber"));
+                    throw new Exception("没有此计量衡：" + map.get("resultTareCalculateNumber"));
                 }
-                tmstruckWeightResult.setResultTarePlaceId(new BigDecimal(tareId));
+                tmstruckWeightResult.setResultGrossPlaceId(new BigDecimal(tareId));
                 //设置毛重
                 BigDecimal resultTareWeight = DataChange.dataToBigDecimal(map.get("resultTareWeight"));
                 tmstruckWeightResult.setResultGrossWeight(resultTareWeight);
                 tmstruckWeightResult.setInsertTime(new Date());
                 tmstruckWeightResult.setInsertUsername("admin");
+                //更新订单中路段顺序号
+                map.put("segmentSqe", map.get("grossSegmentSqe")); //毛重路段顺序
+                utilsService.updateOrderLineSequence(map);
             }else {
                 //设置皮重汽车衡
                 Integer tareId = tmstruckWeightResultMapper.selectTruckCalculateId((String) map.get("resultTareCalculateNumber"));
@@ -156,6 +187,9 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
                 tmstruckWeightResult.setResultGrossWeightTime(sdf.parse(resultGrossWeightTime));
                 tmstruckWeightResult.setUpdateTime(new Date());
                 tmstruckWeightResult.setUpdateUsername("admin");
+                //更新订单中路段顺序号
+                map.put("segmentSqe", map.get("tareSegmentSqe")); //皮重路段顺序
+                utilsService.updateOrderLineSequence(map);
             }
         }
         return tmstruckWeightResult;
@@ -176,4 +210,97 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
         tmstruckReceiptResultMapper.updateByTotalResultId(tmstruckReceiptResult);
         System.out.println(orderNumber + "收货成功");
     }
+
+    /**
+     * 添加火车计量实绩
+     * @param map
+     * @return
+     */
+    public String addTrainWeightResult(Map<String, Object> map){
+        //通过采购订单号和车皮号 查询火运总实绩ID和物资ID
+        Map<String, Object> totalIdAndMateMap = tmstrainWeightResultMapper.getResultIdByPurNoAndWagonNo(map);
+        if(totalIdAndMateMap == null){
+            return "采购订单号"+ map.get("purchaseOrderNo")+"或车皮信息"+ map.get("orderNumber")+"错误";
+        }
+        if(totalIdAndMateMap.get("resultTotalId") == null){
+            return "采购订单号"+ map.get("purchaseOrderNo")+"或车皮信息"+ map.get("orderNumber")+"错误";
+        }
+        map.putAll(totalIdAndMateMap);
+        TmstrainWeightResult tmstrainWeightResult = null;
+        try {
+            tmstrainWeightResult = generateTrainWeightResult(map);
+        } catch (Exception e) {
+            return e.getMessage(); //捕获异常信息
+        }
+        tmstrainWeightResultMapper.insertSelective(tmstrainWeightResult);
+        return map.get("orderNumber") + "成功";
+    }
+
+    /**
+     * 生成火运计量实体
+     * @param map
+     * @return
+     */
+    public TmstrainWeightResult generateTrainWeightResult(Map<String, Object> map) throws Exception {
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+        TmstrainWeightResult tmstrainWeightResult = new TmstrainWeightResult();
+        tmstrainWeightResult.setResultId(tmstrainWeightResultMapper.selectMaxId());
+        //磅单号
+        tmstrainWeightResult.setResultPoundNo((String) map.get("resultPoundNo"));
+        //添加火运总实绩ID
+        tmstrainWeightResult.setResultTotalId(DataChange.dataToBigDecimal(map.get("resultTotalId")));
+        //设置物资ID
+        tmstrainWeightResult.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
+        //如果没有计毛时间 则是第一次计量
+        String resultCrossWeightTime = (String) map.get("resultCrossWeightTime");
+        if(resultCrossWeightTime == null || resultCrossWeightTime.length() == 0){
+            //设置毛重时间
+            String firstTime = (String) map.get("resultTareWeightTime");
+            tmstrainWeightResult.setResultGrossWeightTime(sdf.parse(firstTime));
+            //添加毛重汽车衡
+            Integer tareId = tmstruckWeightResultMapper.selectTruckCalculateId((String) map.get("resultTareCalculateNumber"));
+            if(tareId == null){
+                throw new Exception("没有此计量衡：" + map.get("resultTareCalculateNumber"));
+            }
+            tmstrainWeightResult.setResultGrossPlaceId(new BigDecimal(tareId));
+            //设置毛重
+            BigDecimal resultTareWeight = DataChange.dataToBigDecimal(map.get("resultTareWeight"));
+            tmstrainWeightResult.setResultGrossWeight(resultTareWeight);
+            tmstrainWeightResult.setInsertTime(new Date());
+            tmstrainWeightResult.setInsertUsername("admin");
+        }else {
+            //设置皮重汽车衡
+            Integer tareId = tmstruckWeightResultMapper.selectTruckCalculateId((String) map.get("resultTareCalculateNumber"));
+            if(tareId == null){
+                throw new Exception("没有此计量衡：" + map.get("resultTareCalculateNumber"));
+            }
+            tmstrainWeightResult.setResultTarePlaceId(new BigDecimal(tareId));
+            //设置毛重汽车衡
+            Integer crossId = tmstruckWeightResultMapper.selectTruckCalculateId((String) map.get("resultCrossCalculateNumber"));
+            if(crossId == null){
+                throw new Exception("没有此计量衡：" + map.get("resultCrossCalculateNumber"));
+            }
+            tmstrainWeightResult.setResultGrossPlaceId(new BigDecimal(crossId));
+            //毛重
+            BigDecimal resultCrossWeight = DataChange.dataToBigDecimal(map.get("resultCrossWeight"));
+            tmstrainWeightResult.setResultGrossWeight(resultCrossWeight);
+            //皮重
+            BigDecimal resultTareWeight = DataChange.dataToBigDecimal(map.get("resultTareWeight"));
+            tmstrainWeightResult.setResultTareWeight(resultTareWeight);
+            //净重
+            tmstrainWeightResult.setResultNetWeight(DataChange.dataToBigDecimal(map.get("resultNetWeight")));
+            //设置皮重时间
+            String resultTareWeightTime = (String) map.get("resultTareWeightTime");
+            tmstrainWeightResult.setResultTareWeightTime(sdf.parse(resultTareWeightTime));
+            //设置毛重时间
+            String resultGrossWeightTime = (String) map.get("resultCrossWeightTime");
+            tmstrainWeightResult.setResultGrossWeightTime(sdf.parse(resultGrossWeightTime));
+            tmstrainWeightResult.setUpdateTime(new Date());
+            tmstrainWeightResult.setUpdateUsername("admin");
+        }
+        return tmstrainWeightResult;
+    }
+
+
 }

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

@@ -80,8 +80,8 @@ public class UtilsServiceImpl implements IUtilsService {
     }
 
     /**
-     * 用于更新路段顺序号 + 1
-     * @param map 运输订单号 或者是运输订单ID
+     * 用于更新路段顺序号 取实绩中的路段顺序号
+     * @param map 运输订单号 或者是运输订单ID    实绩中的路段顺序号
      * @return
      */
     public int updateOrderLineSequence(Map<String, Object> map){
@@ -90,10 +90,10 @@ public class UtilsServiceImpl implements IUtilsService {
             //如果没有传入运输订单Id则需要传入了运输订单号
             orderId = utilsMapper.getOrderIdByOrderNumber((String) map.get("orderNumber"));
         }
-        Integer lineSequence = getLineSequenceByOrderId(orderId);
+        BigDecimal segmentSqe = DataChange.dataToBigDecimal(map.get("segmentSqe"));
         Map<String, Object> mesMap = new HashMap<>();
         mesMap.put("orderId", orderId);
-        mesMap.put("orderLineSequence", lineSequence == null? 1 : lineSequence + 1);
+        mesMap.put("orderLineSequence", segmentSqe);
         return utilsMapper.updateLineSeqByOrderIdOrNum(mesMap);
     }
 

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

@@ -0,0 +1,67 @@
+package com.steerinfo.dil.util;
+
+import org.apache.commons.net.ftp.FTPClient;
+import org.apache.commons.net.ftp.FTPReply;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * @Description:
+ * @Author:HuJianGuo
+ * @GreateTime:2021/12/8 10:58
+ * @Version:V2.0
+ */
+@Component//这就是我们刚才加入的依赖
+public class FtpUtil {
+
+    //ftp服务器ip地址
+    private static final String FTP_ADDRESS = "172.16.33.161";
+    //端口号
+    private static final int FTP_PORT = 21;
+    //用户名
+    private static final String FTP_USERNAME = "root";
+    //密码
+    private static final String FTP_PASSWORD = "Ils2021";
+    //路径都是/home/加上用户名
+    public final String FTP_BASEPATH = "/usr/local/src/file";
+
+    //参数传过来了文件和文件的输入流
+    public boolean uploadFile(String originFileName, InputStream input) {
+        boolean success = false;
+        FTPClient ftp = new FTPClient();//这是最开始引入的依赖里的方法
+        ftp.setControlEncoding("utf-8");
+        try {
+            int reply;
+            ftp.connect(FTP_ADDRESS, FTP_PORT);// 连接FTP服务器
+            ftp.login(FTP_USERNAME, FTP_PASSWORD);// 登录
+            reply = ftp.getReplyCode();//连接成功会的到一个返回状态码
+            System.out.println(reply);//输出看是否连接成功
+            ftp.setFileType(FTPClient.BINARY_FILE_TYPE);//设置文件类型
+            ftp.changeWorkingDirectory(FTP_BASEPATH);//修改操作空间
+            //所操作的文件夹必须要有可读权限
+            ftp.storeFile(originFileName, input);//这里开始上传文件
+            if (!FTPReply.isPositiveCompletion(reply)) {
+                ftp.disconnect();
+                System.out.println("连接失败");
+                return success;
+            }
+            System.out.println("连接成功！");
+
+            input.close();
+            ftp.logout();
+            success = true;
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            if (ftp.isConnected()) {
+                try {
+                    ftp.disconnect();
+                } catch (IOException ioe) {
+                }
+            }
+        }
+        return success;
+    }
+}

src/main/resources/application-prod.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
     url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
-    password: dil
-    username: Dil123789
+    password: Dil123789
+    username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dal-dazhou-join-api

src/main/resources/bootstrap.yml

@@ -16,7 +16,7 @@ spring:
 eureka:
   client:
     service-url:
-      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.161}:${EUREKA_PORT:8061}/eureka/
+      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.162}:${EUREKA_PORT:8081}/eureka/
   instance:
     prefer-ip-address: true
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/
@@ -51,4 +51,4 @@ mybatis:
     call-setters-on-nulls: true
 
 server:
-  port: 8066
+  port: 8006

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

@@ -0,0 +1,647 @@
+<?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.TmstrainWeightResultMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.TmstrainWeightResult">
+    <id column="RESULT_ID" jdbcType="DECIMAL" property="resultId" />
+    <result column="RESULT_TOTAL_ID" jdbcType="DECIMAL" property="resultTotalId" />
+    <result column="RESULT_POUND_NO" jdbcType="VARCHAR" property="resultPoundNo" />
+    <result column="MATERIAL_ID" jdbcType="DECIMAL" property="materialId" />
+    <result column="RESULT_GROSS_PLACE_ID" jdbcType="DECIMAL" property="resultGrossPlaceId" />
+    <result column="RESULT_GROSS_WEIGHT" jdbcType="DECIMAL" property="resultGrossWeight" />
+    <result column="RESULT_GROSS_WEIGHT_TIME" jdbcType="TIMESTAMP" property="resultGrossWeightTime" />
+    <result column="RESULT_TARE_PLACE_ID" jdbcType="DECIMAL" property="resultTarePlaceId" />
+    <result column="RESULT_TARE_WEIGHT" jdbcType="DECIMAL" property="resultTareWeight" />
+    <result column="RESULT_TARE_WEIGHT_TIME" jdbcType="TIMESTAMP" property="resultTareWeightTime" />
+    <result column="RESULT_NET_WEIGHT" jdbcType="DECIMAL" property="resultNetWeight" />
+    <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="DELETE_NAME" jdbcType="VARCHAR" property="deleteName" />
+    <result column="DELETE_TIME" jdbcType="TIMESTAMP" property="deleteTime" />
+    <result column="ISDEDUCT" jdbcType="DECIMAL" property="isdeduct" />
+    <result column="ISQUALITY" jdbcType="DECIMAL" property="isquality" />
+    <result column="RESULT_IS_QUALITY" jdbcType="DECIMAL" property="resultIsQuality" />
+  </resultMap>
+  <sql id="columns">
+    RESULT_ID, RESULT_TOTAL_ID, RESULT_POUND_NO, MATERIAL_ID, RESULT_GROSS_PLACE_ID, 
+    RESULT_GROSS_WEIGHT, RESULT_GROSS_WEIGHT_TIME, RESULT_TARE_PLACE_ID, RESULT_TARE_WEIGHT, 
+    RESULT_TARE_WEIGHT_TIME, RESULT_NET_WEIGHT, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, 
+    UPDATE_TIME, INSERT_UPDATE_REMARK, DELETE_NAME, DELETE_TIME, ISDEDUCT, ISQUALITY, 
+    RESULT_IS_QUALITY
+  </sql>
+  <sql id="columns_alias">
+    t.RESULT_ID, t.RESULT_TOTAL_ID, t.RESULT_POUND_NO, t.MATERIAL_ID, t.RESULT_GROSS_PLACE_ID, 
+    t.RESULT_GROSS_WEIGHT, t.RESULT_GROSS_WEIGHT_TIME, t.RESULT_TARE_PLACE_ID, t.RESULT_TARE_WEIGHT, 
+    t.RESULT_TARE_WEIGHT_TIME, t.RESULT_NET_WEIGHT, t.INSERT_USERNAME, t.INSERT_TIME, 
+    t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETE_NAME, t.DELETE_TIME, 
+    t.ISDEDUCT, t.ISQUALITY, t.RESULT_IS_QUALITY
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns" /> FROM TMSTRAIN_WEIGHT_RESULT
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias" /> FROM TMSTRAIN_WEIGHT_RESULT t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="resultId != null">
+        and RESULT_ID = #{resultId}
+      </if>
+      <if test="resultTotalId != null">
+        and RESULT_TOTAL_ID = #{resultTotalId}
+      </if>
+      <if test="resultPoundNo != null and resultPoundNo != ''">
+        and RESULT_POUND_NO = #{resultPoundNo}
+      </if>
+      <if test="materialId != null">
+        and MATERIAL_ID = #{materialId}
+      </if>
+      <if test="resultGrossPlaceId != null">
+        and RESULT_GROSS_PLACE_ID = #{resultGrossPlaceId}
+      </if>
+      <if test="resultGrossWeight != null">
+        and RESULT_GROSS_WEIGHT = #{resultGrossWeight}
+      </if>
+      <if test="resultGrossWeightTime != null">
+        and TO_CHAR(RESULT_GROSS_WEIGHT_TIME,'yyyy-MM-dd') = #{resultGrossWeightTime}
+      </if>
+      <if test="resultTarePlaceId != null">
+        and RESULT_TARE_PLACE_ID = #{resultTarePlaceId}
+      </if>
+      <if test="resultTareWeight != null">
+        and RESULT_TARE_WEIGHT = #{resultTareWeight}
+      </if>
+      <if test="resultTareWeightTime != null">
+        and TO_CHAR(RESULT_TARE_WEIGHT_TIME,'yyyy-MM-dd') = #{resultTareWeightTime}
+      </if>
+      <if test="resultNetWeight != null">
+        and RESULT_NET_WEIGHT = #{resultNetWeight}
+      </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="deleteName != null and deleteName != ''">
+        and DELETE_NAME = #{deleteName}
+      </if>
+      <if test="deleteTime != null">
+        and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
+      </if>
+      <if test="isdeduct != null">
+        and ISDEDUCT = #{isdeduct}
+      </if>
+      <if test="isquality != null">
+        and ISQUALITY = #{isquality}
+      </if>
+      <if test="resultIsQuality != null">
+        and RESULT_IS_QUALITY = #{resultIsQuality}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="resultId != null">
+        and RESULT_ID = #{resultId}
+      </if>
+      <if test="resultTotalId != null">
+        and RESULT_TOTAL_ID = #{resultTotalId}
+      </if>
+      <if test="resultPoundNo != null and resultPoundNo != ''">
+        and RESULT_POUND_NO LIKE '%${resultPoundNo}%'
+      </if>
+      <if test="materialId != null">
+        and MATERIAL_ID = #{materialId}
+      </if>
+      <if test="resultGrossPlaceId != null">
+        and RESULT_GROSS_PLACE_ID = #{resultGrossPlaceId}
+      </if>
+      <if test="resultGrossWeight != null">
+        and RESULT_GROSS_WEIGHT = #{resultGrossWeight}
+      </if>
+      <if test="resultGrossWeightTime != null">
+        and TO_CHAR(RESULT_GROSS_WEIGHT_TIME,'yyyy-MM-dd') = #{resultGrossWeightTime}
+      </if>
+      <if test="resultTarePlaceId != null">
+        and RESULT_TARE_PLACE_ID = #{resultTarePlaceId}
+      </if>
+      <if test="resultTareWeight != null">
+        and RESULT_TARE_WEIGHT = #{resultTareWeight}
+      </if>
+      <if test="resultTareWeightTime != null">
+        and TO_CHAR(RESULT_TARE_WEIGHT_TIME,'yyyy-MM-dd') = #{resultTareWeightTime}
+      </if>
+      <if test="resultNetWeight != null">
+        and RESULT_NET_WEIGHT = #{resultNetWeight}
+      </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="deleteName != null and deleteName != ''">
+        and DELETE_NAME LIKE '%${deleteName}%'
+      </if>
+      <if test="deleteTime != null">
+        and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
+      </if>
+      <if test="isdeduct != null">
+        and ISDEDUCT = #{isdeduct}
+      </if>
+      <if test="isquality != null">
+        and ISQUALITY = #{isquality}
+      </if>
+      <if test="resultIsQuality != null">
+        and RESULT_IS_QUALITY = #{resultIsQuality}
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+    delete from TMSTRAIN_WEIGHT_RESULT
+    where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from TMSTRAIN_WEIGHT_RESULT
+    where 1!=1 
+      <if test="resultTotalId != null">
+        or RESULT_TOTAL_ID = #{resultTotalId}
+      </if>
+      <if test="resultPoundNo != null and resultPoundNo != ''">
+        or RESULT_POUND_NO = #{resultPoundNo}
+      </if>
+      <if test="materialId != null">
+        or MATERIAL_ID = #{materialId}
+      </if>
+      <if test="resultGrossPlaceId != null">
+        or RESULT_GROSS_PLACE_ID = #{resultGrossPlaceId}
+      </if>
+      <if test="resultGrossWeight != null">
+        or RESULT_GROSS_WEIGHT = #{resultGrossWeight}
+      </if>
+      <if test="resultGrossWeightTime != null">
+        or TO_CHAR(RESULT_GROSS_WEIGHT_TIME,'yyyy-MM-dd') = '#{resultGrossWeightTime}'
+      </if>
+      <if test="resultTarePlaceId != null">
+        or RESULT_TARE_PLACE_ID = #{resultTarePlaceId}
+      </if>
+      <if test="resultTareWeight != null">
+        or RESULT_TARE_WEIGHT = #{resultTareWeight}
+      </if>
+      <if test="resultTareWeightTime != null">
+        or TO_CHAR(RESULT_TARE_WEIGHT_TIME,'yyyy-MM-dd') = '#{resultTareWeightTime}'
+      </if>
+      <if test="resultNetWeight != null">
+        or RESULT_NET_WEIGHT = #{resultNetWeight}
+      </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="deleteName != null and deleteName != ''">
+        or DELETE_NAME = #{deleteName}
+      </if>
+      <if test="deleteTime != null">
+        or TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = '#{deleteTime}'
+      </if>
+      <if test="isdeduct != null">
+        or ISDEDUCT = #{isdeduct}
+      </if>
+      <if test="isquality != null">
+        or ISQUALITY = #{isquality}
+      </if>
+      <if test="resultIsQuality != null">
+        or RESULT_IS_QUALITY = #{resultIsQuality}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.model.TmstrainWeightResult">
+    insert into TMSTRAIN_WEIGHT_RESULT (RESULT_ID, RESULT_TOTAL_ID, RESULT_POUND_NO, 
+      MATERIAL_ID, RESULT_GROSS_PLACE_ID, RESULT_GROSS_WEIGHT, 
+      RESULT_GROSS_WEIGHT_TIME, RESULT_TARE_PLACE_ID, 
+      RESULT_TARE_WEIGHT, RESULT_TARE_WEIGHT_TIME, 
+      RESULT_NET_WEIGHT, INSERT_USERNAME, INSERT_TIME, 
+      UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, 
+      DELETE_NAME, DELETE_TIME, ISDEDUCT, 
+      ISQUALITY, RESULT_IS_QUALITY)
+    values (#{resultId,jdbcType=DECIMAL}, #{resultTotalId,jdbcType=DECIMAL}, #{resultPoundNo,jdbcType=VARCHAR}, 
+      #{materialId,jdbcType=DECIMAL}, #{resultGrossPlaceId,jdbcType=DECIMAL}, #{resultGrossWeight,jdbcType=DECIMAL}, 
+      #{resultGrossWeightTime,jdbcType=TIMESTAMP}, #{resultTarePlaceId,jdbcType=DECIMAL}, 
+      #{resultTareWeight,jdbcType=DECIMAL}, #{resultTareWeightTime,jdbcType=TIMESTAMP}, 
+      #{resultNetWeight,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, 
+      #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, 
+      #{deleteName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=TIMESTAMP}, #{isdeduct,jdbcType=DECIMAL}, 
+      #{isquality,jdbcType=DECIMAL}, #{resultIsQuality,jdbcType=DECIMAL})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmstrainWeightResult">
+    insert into TMSTRAIN_WEIGHT_RESULT
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="resultId != null">
+        RESULT_ID,
+      </if>
+      <if test="resultTotalId != null">
+        RESULT_TOTAL_ID,
+      </if>
+      <if test="resultPoundNo != null">
+        RESULT_POUND_NO,
+      </if>
+      <if test="materialId != null">
+        MATERIAL_ID,
+      </if>
+      <if test="resultGrossPlaceId != null">
+        RESULT_GROSS_PLACE_ID,
+      </if>
+      <if test="resultGrossWeight != null">
+        RESULT_GROSS_WEIGHT,
+      </if>
+      <if test="resultGrossWeightTime != null">
+        RESULT_GROSS_WEIGHT_TIME,
+      </if>
+      <if test="resultTarePlaceId != null">
+        RESULT_TARE_PLACE_ID,
+      </if>
+      <if test="resultTareWeight != null">
+        RESULT_TARE_WEIGHT,
+      </if>
+      <if test="resultTareWeightTime != null">
+        RESULT_TARE_WEIGHT_TIME,
+      </if>
+      <if test="resultNetWeight != null">
+        RESULT_NET_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="deleteName != null">
+        DELETE_NAME,
+      </if>
+      <if test="deleteTime != null">
+        DELETE_TIME,
+      </if>
+      <if test="isdeduct != null">
+        ISDEDUCT,
+      </if>
+      <if test="isquality != null">
+        ISQUALITY,
+      </if>
+      <if test="resultIsQuality != null">
+        RESULT_IS_QUALITY,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="resultId != null">
+        #{resultId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultTotalId != null">
+        #{resultTotalId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultPoundNo != null">
+        #{resultPoundNo,jdbcType=VARCHAR},
+      </if>
+      <if test="materialId != null">
+        #{materialId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultGrossPlaceId != null">
+        #{resultGrossPlaceId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultGrossWeight != null">
+        #{resultGrossWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="resultGrossWeightTime != null">
+        #{resultGrossWeightTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="resultTarePlaceId != null">
+        #{resultTarePlaceId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultTareWeight != null">
+        #{resultTareWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="resultTareWeightTime != null">
+        #{resultTareWeightTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="resultNetWeight != null">
+        #{resultNetWeight,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="deleteName != null">
+        #{deleteName,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteTime != null">
+        #{deleteTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="isdeduct != null">
+        #{isdeduct,jdbcType=DECIMAL},
+      </if>
+      <if test="isquality != null">
+        #{isquality,jdbcType=DECIMAL},
+      </if>
+      <if test="resultIsQuality != null">
+        #{resultIsQuality,jdbcType=DECIMAL},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmstrainWeightResult">
+    update TMSTRAIN_WEIGHT_RESULT
+    set RESULT_TOTAL_ID = #{resultTotalId,jdbcType=DECIMAL},
+      RESULT_POUND_NO = #{resultPoundNo,jdbcType=VARCHAR},
+      MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
+      RESULT_GROSS_PLACE_ID = #{resultGrossPlaceId,jdbcType=DECIMAL},
+      RESULT_GROSS_WEIGHT = #{resultGrossWeight,jdbcType=DECIMAL},
+      RESULT_GROSS_WEIGHT_TIME = #{resultGrossWeightTime,jdbcType=TIMESTAMP},
+      RESULT_TARE_PLACE_ID = #{resultTarePlaceId,jdbcType=DECIMAL},
+      RESULT_TARE_WEIGHT = #{resultTareWeight,jdbcType=DECIMAL},
+      RESULT_TARE_WEIGHT_TIME = #{resultTareWeightTime,jdbcType=TIMESTAMP},
+      RESULT_NET_WEIGHT = #{resultNetWeight,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},
+      DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
+      DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
+      ISDEDUCT = #{isdeduct,jdbcType=DECIMAL},
+      ISQUALITY = #{isquality,jdbcType=DECIMAL},
+      RESULT_IS_QUALITY = #{resultIsQuality,jdbcType=DECIMAL}
+    where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmstrainWeightResult">
+    update TMSTRAIN_WEIGHT_RESULT
+    <set>
+      <if test="resultTotalId != null">
+        RESULT_TOTAL_ID = #{resultTotalId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultPoundNo != null">
+        RESULT_POUND_NO = #{resultPoundNo,jdbcType=VARCHAR},
+      </if>
+      <if test="materialId != null">
+        MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultGrossPlaceId != null">
+        RESULT_GROSS_PLACE_ID = #{resultGrossPlaceId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultGrossWeight != null">
+        RESULT_GROSS_WEIGHT = #{resultGrossWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="resultGrossWeightTime != null">
+        RESULT_GROSS_WEIGHT_TIME = #{resultGrossWeightTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="resultTarePlaceId != null">
+        RESULT_TARE_PLACE_ID = #{resultTarePlaceId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultTareWeight != null">
+        RESULT_TARE_WEIGHT = #{resultTareWeight,jdbcType=DECIMAL},
+      </if>
+      <if test="resultTareWeightTime != null">
+        RESULT_TARE_WEIGHT_TIME = #{resultTareWeightTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="resultNetWeight != null">
+        RESULT_NET_WEIGHT = #{resultNetWeight,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="deleteName != null">
+        DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteTime != null">
+        DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="isdeduct != null">
+        ISDEDUCT = #{isdeduct,jdbcType=DECIMAL},
+      </if>
+      <if test="isquality != null">
+        ISQUALITY = #{isquality,jdbcType=DECIMAL},
+      </if>
+      <if test="resultIsQuality != null">
+        RESULT_IS_QUALITY = #{resultIsQuality,jdbcType=DECIMAL},
+      </if>
+    </set>
+    where RESULT_ID = #{resultId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+    <include refid="select" />
+    where RESULT_ID = #{resultId,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 TMSTRAIN_WEIGHT_RESULT 
+      (RESULT_ID, 
+      RESULT_TOTAL_ID, RESULT_POUND_NO, 
+      MATERIAL_ID, RESULT_GROSS_PLACE_ID, 
+      RESULT_GROSS_WEIGHT, RESULT_GROSS_WEIGHT_TIME, 
+      RESULT_TARE_PLACE_ID, RESULT_TARE_WEIGHT, 
+      RESULT_TARE_WEIGHT_TIME, RESULT_NET_WEIGHT, 
+      INSERT_USERNAME, INSERT_TIME, 
+      UPDATE_USERNAME, UPDATE_TIME, 
+      INSERT_UPDATE_REMARK, DELETE_NAME, 
+      DELETE_TIME, ISDEDUCT, ISQUALITY, 
+      RESULT_IS_QUALITY)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.resultId,jdbcType=DECIMAL}, 
+      #{item.resultTotalId,jdbcType=DECIMAL}, #{item.resultPoundNo,jdbcType=VARCHAR}, 
+      #{item.materialId,jdbcType=DECIMAL}, #{item.resultGrossPlaceId,jdbcType=DECIMAL}, 
+      #{item.resultGrossWeight,jdbcType=DECIMAL}, #{item.resultGrossWeightTime,jdbcType=TIMESTAMP}, 
+      #{item.resultTarePlaceId,jdbcType=DECIMAL}, #{item.resultTareWeight,jdbcType=DECIMAL}, 
+      #{item.resultTareWeightTime,jdbcType=TIMESTAMP}, #{item.resultNetWeight,jdbcType=DECIMAL}, 
+      #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP}, 
+      #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
+      #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleteName,jdbcType=VARCHAR}, 
+      #{item.deleteTime,jdbcType=TIMESTAMP}, #{item.isdeduct,jdbcType=DECIMAL}, #{item.isquality,jdbcType=DECIMAL}, 
+      #{item.resultIsQuality,jdbcType=DECIMAL} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update TMSTRAIN_WEIGHT_RESULT
+     set
+       RESULT_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultId,jdbcType=DECIMAL}
+       </foreach>
+       ,RESULT_TOTAL_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultTotalId,jdbcType=DECIMAL}
+       </foreach>
+       ,RESULT_POUND_NO=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultPoundNo,jdbcType=VARCHAR}
+       </foreach>
+       ,MATERIAL_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.materialId,jdbcType=DECIMAL}
+       </foreach>
+       ,RESULT_GROSS_PLACE_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultGrossPlaceId,jdbcType=DECIMAL}
+       </foreach>
+       ,RESULT_GROSS_WEIGHT=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultGrossWeight,jdbcType=DECIMAL}
+       </foreach>
+       ,RESULT_GROSS_WEIGHT_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultGrossWeightTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,RESULT_TARE_PLACE_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultTarePlaceId,jdbcType=DECIMAL}
+       </foreach>
+       ,RESULT_TARE_WEIGHT=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultTareWeight,jdbcType=DECIMAL}
+       </foreach>
+       ,RESULT_TARE_WEIGHT_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultTareWeightTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,RESULT_NET_WEIGHT=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultNetWeight,jdbcType=DECIMAL}
+       </foreach>
+       ,INSERT_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,INSERT_UPDATE_REMARK=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+       </foreach>
+       ,DELETE_NAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.deleteName,jdbcType=VARCHAR}
+       </foreach>
+       ,DELETE_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.deleteTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,ISDEDUCT=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.isdeduct,jdbcType=DECIMAL}
+       </foreach>
+       ,ISQUALITY=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.isquality,jdbcType=DECIMAL}
+       </foreach>
+       ,RESULT_IS_QUALITY=
+       <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+          when #{item.resultId,jdbcType=DECIMAL} then #{item.resultIsQuality,jdbcType=DECIMAL}
+       </foreach>
+     where RESULT_ID in 
+     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+    #{item.resultId,jdbcType=DECIMAL}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from TMSTRAIN_WEIGHT_RESULT
+    where RESULT_ID in 
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+
+<!-- 通过采购订单号和车皮号查询火运总实绩ID和物资ID -->
+  <select id="getResultIdByPurNoAndWagonNo" parameterType="java.util.Map" resultType="java.util.Map">
+    select TTR.TOTAL_RESULT_ID "resultTotalId",
+           DB.MATERIAL_ID   "materialId"
+    from TMSTRAIN_LOADING_RESULT TLR
+        left join TMSTRAIN_TOTAL_RESULT TTR
+        on TTR.LOADING_ID = TLR.RESULT_ID
+        left join AMS_PURCHASE_ORDER APO
+            on APO.PURCHASE_ORDER_ID = TLR.PURCHASE_ORDER_RAIL_PLAN_ID
+        left join DIL_BATCH DB
+            on DB.BATCH_ID = APO.BATCH_ID
+    where TLR.RESULT_WAGON_NO = #{orderNumber} and APO.PURCHASE_ORDER_NO = #{purchaseOrderNo}
+  </select>
+
+</mapper>

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

@@ -683,7 +683,9 @@
                 OO.ORDER_TYPE "orderTypee",
                 TWR.WEIGHT_TASK_RESULT_ID "weightTaskResultId",
                 TTR.RESULT_TOTAL_ID "resultTotalId",
-                RC.CAPACITY_NUMBER  "capacityNumber"
+                RC.CAPACITY_NUMBER  "capacityNumber",
+                TWR.TARE_SEGMENT_SQE "tareSegmentSqe",
+                TWR.GROSS_SEGMENT_SQE "grossSegmentSqe"
         from OMSTRUCK_ORDER OO
         left join TMSTRUCK_TOTAL_RESULT TTR
             on OO.ORDER_ID = TTR.ORDER_ID