Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API into dev

pom.xml

@@ -120,11 +120,11 @@
                 <configuration>
                     <connUrl>jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri</connUrl>
                     <user>dil</user>
-                    <password>dil123789</password>
+                    <password>Dil123789</password>
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-<!--                        <param>TMSTRUCK_TIME_TSK_RESULT</param>-->
+                        <param>TMSTRUCK_WEIGHT_RESULT</param>
                     </tables>
                 </configuration>
                 <executions>

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

@@ -143,6 +143,16 @@ public class TmstruckLoadResultController extends BaseRESTfulController {
         return success(i);
     }
 
+    @ApiOperation(value="生成装车实绩 ：远程调用专用")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "resultId", value = "装车作业实绩ID", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/addLoadResult")
+    public RESTfulResult addLoadResult(@RequestBody(required=false) Map<String,Object> map){
+        int i = tmstruckLoadResultService.addLoadResult(map);
+        return success(i);
+    }
+
     @ApiOperation(value="修改n个装车点 ")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "resultId", value = "装车作业实绩ID", required = false, dataType = "Integer"),
@@ -201,7 +211,7 @@ public class TmstruckLoadResultController extends BaseRESTfulController {
     })
     @PostMapping("addSaleLoadResult")
     public RESTfulResult addSaleLoadResult(@RequestBody(required=false) Map<String, Object> map){
-        int i = tmstruckLoadResultService.addSaleLoadResult(map);
+        int i = tmstruckLoadResultService.addXSLoadResult(map);
         return success(i);
     }
     //内转物流新增装车实绩

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

@@ -3,6 +3,7 @@ package com.steerinfo.dil.mapper;
 import com.steerinfo.dil.model.TmstruckLoadResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
@@ -67,4 +68,19 @@ public interface TmstruckLoadResultMapper extends IBaseMapper<TmstruckLoadResult
 
     //通过物资id查找物资类型
     Integer selectMaterialTypeByMaterialId(Integer materialId);
+
+    //通过港口ID查询仓库表中的港存库ID
+    BigDecimal getWarehouseIdByPortId(BigDecimal portId);
+
+    /*
+    TangXiaoFeng
+     */
+    //通过物资ID和总实绩Id查询唯一的装车实绩Id
+    Integer getLoadResultIdByMIdAndTotalId(@Param("resultTotalId") Integer resultTotalId, @Param("materialId") Integer materialId);
+
+    //通过物资ID和运输订单号 查找最先扫描Id
+    Integer getMinScanIdByOrderNum(Map<String, Object> map);
+
+    //通过物资唯一编码 查找物资ID
+    BigDecimal getMaterialIdByMaterialCode(String materialCode);
 }

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

@@ -25,4 +25,25 @@ public interface TmstruckMeasureCommissionMapper extends IBaseMapper<TmstruckMea
     //查询销售计量委托
     Map<String, Object> getXSMeasureCommission(Map<String, Object> map);
 
+    /*
+     * from zhangXuan
+     */
+
+    //销售查询计毛
+    Map<String, Object> selectMakesureGrossForSaleByOrderNumber(Map<String, Object> map);
+
+    //销售查询计皮
+    Map<String, Object> selectMakesureTareForSaleByOrderNumber(Map<String, Object> map);
+
+    //内转查询计皮
+    Map<String, Object> selectMakesureTareForConvertedByOrderNumber(Map<String, Object> map);
+
+    //内转查询计毛
+    Map<String, Object> selectMakesureGrossForConvertedByOrderNumber(Map<String, Object> map);
+
+    //采购查询计皮
+    Map<String, Object> selectMakesureGrossForPurchase(Map<String, Object> map);
+
+    //采购查询计毛
+    Map<String, Object> selectMakesureTareForPurchase(Map<String, Object> map);
 }

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

@@ -21,7 +21,6 @@ public class TmstruckWeightResult implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="总实绩ID",required=false)
     private BigDecimal resultTotalId;
 
-
     /**
      * 磅单号(RESULT_POUND_NO,VARCHAR,20)
      */
@@ -112,6 +111,24 @@ public class TmstruckWeightResult implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="计皮点ID(汽车衡)",required=false)
     private BigDecimal resultTarePlaceId;
 
+    /**
+     * 物资ID(MATERIAL_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="物资ID",required=false)
+    private BigDecimal materialId;
+
+    /**
+     * 是否需要扣水扣杂(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;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -140,7 +157,6 @@ public class TmstruckWeightResult implements IBasePO<BigDecimal> {
         this.resultTotalId = resultTotalId;
     }
 
-
     public String getResultPoundNo() {
         return resultPoundNo;
     }
@@ -261,6 +277,30 @@ public class TmstruckWeightResult implements IBasePO<BigDecimal> {
         this.resultTarePlaceId = resultTarePlaceId;
     }
 
+    public BigDecimal getMaterialId() {
+        return materialId;
+    }
+
+    public void setMaterialId(BigDecimal materialId) {
+        this.materialId = materialId;
+    }
+
+    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;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -284,6 +324,9 @@ public class TmstruckWeightResult implements IBasePO<BigDecimal> {
         sb.append(", deleteTime=").append(deleteTime);
         sb.append(", resultGrossPlaceId=").append(resultGrossPlaceId);
         sb.append(", resultTarePlaceId=").append(resultTarePlaceId);
+        sb.append(", materialId=").append(materialId);
+        sb.append(", isdeduct=").append(isdeduct);
+        sb.append(", isquality=").append(isquality);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -23,11 +23,14 @@ public interface ITmstruckLoadResultService{
     //查询所有的装车实绩
     List<Map<String, Object>> getAllLoadResult(Map<String, Object> map);
 
-    //新增装车实绩
+    //生成装车实绩(销售)
+    int addLoadResult(Map<String, Object> map);
+
+    //新增采购装车实绩
     int addCGLoadResult(Map<String, Object> map);
 
-    //新增虚拟装车实绩
-    int addSaleLoadResult(Map<String, Object> map);
+    //修改销售装车实绩  （如果是多种物资【多拼】，通过物资Id和运输订单号来确定唯一的装车实绩进行修改）
+    int addXSLoadResult(Map<String, Object> map);
 
     //修改装车作业
     int updateLoadResult(TmstruckLoadResult tmstruckLoadResult);
@@ -38,7 +41,6 @@ public interface ITmstruckLoadResultService{
     //逻辑删除装车作业
     int deleteLoadResult(Integer resultId);
 
-
     //修改装车作业作业点
     int updateLoadingId(List<Map<String, Object>> map);
 

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

@@ -1,8 +1,6 @@
 package com.steerinfo.dil.service;
 
 
-import com.steerinfo.dil.model.TmstruckMeasureCommission;
-
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;

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

@@ -51,71 +51,45 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
 
 
     /**
-     * 新增装车实绩
-     * 运输订单号 或 运输订单Id
-     * 是否清场
-     * 装车日期
-     * 备注
-     * 计量吨位
-     *
+     * 查询所有装车实绩
      * @param map
      * @return
      */
-    @Transactional
-    public int addLoadResult11(Map<String, Object> map) {
-        //通过运输订单号 或 运单Id 查询实绩总表ID  此方法在 进厂作业mapper中
-        Integer totalId = tmstruckEnfactoryResultMapper.selectOrderIdByCpAndOn(map);
-        // 新增装车实绩
-        TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
-        //添加主键Id
-        tmstruckLoadResult.setResultId(tmstruckLoadResultMapper.selectMaxId());
-        //新增计量吨位 装车所装的重量
-        BigDecimal resultMeasuredTonnage = DataChange.dataToBigDecimal(map.get("resultMeasuredTonnage"));
-        tmstruckLoadResult.setResultMeasuredTonnage(resultMeasuredTonnage);
-        tmstruckLoadResult.setStatus(new BigDecimal(0));
-        tmstruckLoadResult.setResultTotalId(new BigDecimal(totalId));
-        String resultIsclear = (String) (map.get("resultIsclear"));
-        tmstruckLoadResult.setResultIsclear(resultIsclear);
-        tmstruckLoadResult.setResultLoadStartTime(new Date((long) map.get("resultLoadStartTime")));
-        tmstruckLoadResult.setInsertUpdateRemark((String) map.get("insertUpdateRemark"));
-        int i = tmstruckLoadResultMapper.insertSelective(tmstruckLoadResult);
-
-        //修改订单状态为执行中 1
-        int i1 = utilsService.updateOrderStatus(map, 1);
+    @Override
+    public List<Map<String, Object>> getAllLoadResult(Map<String, Object> map) {
+        Integer orderType = (Integer) map.get("orderTypee");
+        switch (orderType) {
+            case 1:
+            case 2:
+            case 3:
+            case 4:
+                map.put("status", 0);
+                return tmstruckLoadResultMapper.getXSLoadResult(map);
+            case 5:
+                break;
+            case 6:
+                break;
+            case 7:
+                break;
+            case 8:
+                return tmstruckLoadResultMapper.getCGJKLoadResult(map);
+            case 9:
 
-        //修改运力状态为执行中 1
-        int i2 = utilsService.updateCapacityStatus(map, 1);
+                break;
+            case 10:
 
-        //新增港存库出库实绩 并修改实时库存
-        BigDecimal portId = tmstruckLoadResultMapper.getPortIdBySendStationId(DataChange.dataToBigDecimal(map.get("loadingId")));
-        if (portId != null) {
-            BigDecimal batchId = tmstruckLoadResultMapper.getBatchIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
-            if (batchId != null) {
-                Map<String, Object> hashMap = new HashMap<>();
-                hashMap.put("batchId", batchId);
-                hashMap.put("portId", portId);
-                hashMap.put("resultTonnage", resultMeasuredTonnage);
-                hashMap.put("isClean", resultIsclear);
-                wmshBoundFeign.addResult(hashMap);
-            }
+                break;
+            case 11:
         }
-        return i + i1 + i2;
+        return null;
     }
 
-    /**
 
-     * 添加装货实绩
-     *
-     * @param map
-     * @return
+    /**
+     * 新增采购装车实绩
+     * @param map  resultMeasuredTonnage ：计量吨位  portId：港口ID
+     *             resultLoadStartTime：装车时间 resultIsclear：是否清场
      */
-    public int addLoadResult(Map<String, Object> map) {
-        return 0;
-    }
-
-        /**
-         *
-         */
     @Transactional
     public int addCGLoadResult(Map<String,Object> map){
         //通过运输订单号 或 运单Id 查询实绩总表ID  此方法在 进厂作业mapper中
@@ -135,6 +109,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         tmstruckLoadResult.setInsertUpdateRemark((String) map.get("insertUpdateRemark"));
         Object portId = map.get("portId"); //获取港口
         if(portId != null){
+            //通过订单ID获取批次Id
             BigDecimal batchId = tmstruckLoadResultMapper.getBatchIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
             if(batchId != null){
                 Map<String, Object> hashMap = new HashMap<>();
@@ -143,14 +118,14 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
                 hashMap.put("resultTonnage",resultMeasuredTonnage);
                 hashMap.put("isClean", resultIsclear);
                 wmshBoundFeign.addResult(hashMap);
-                tmstruckLoadResult.setLoadingId(DataChange.dataToBigDecimal(portId)); // 添加装货点为港口
+                // 通过港口ID查询仓库表中的港存库ID
+                BigDecimal warehouseId = tmstruckLoadResultMapper.getWarehouseIdByPortId(DataChange.dataToBigDecimal(portId));
+                tmstruckLoadResult.setLoadingId(warehouseId); // 添加装货点为港口
             }
         }
         int i = tmstruckLoadResultMapper.insertSelective(tmstruckLoadResult);
-
         //修改订单状态为执行中 1
         int i1 = utilsService.updateOrderStatus(map, 1);
-
         //修改运力状态为执行中 1
 //        int i2 = utilsService.updateCapacityStatus(map, 1);
         return i + i1;
@@ -158,91 +133,58 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
 
 
     /**
-     * 遗留问题  （销售装车）
-     *
+     * 生成销售装车实绩（虚拟装车实绩）
      * @param map
      * @return
      */
-    public int addLoadResult1(Map<String, Object> map) {
-//        String orderNumber = map.get("orderNumber").toString();
-        //通过运输订单号查找物资
-        List<Map<String, Object>> materialList = tmstruckLoadResultMapper.selectMaterialIdByOrderNumber(map);
-        for (int i = 0; i < materialList.size(); i++) {
-            Map<String, Object> map3 = materialList.get(i);
-            BigDecimal materialId = (BigDecimal) map3.get("materialId");
-            //通过运输订单号 或 运单Id 查询实绩总表ID  此方法在 进厂作业mapper中
-            Integer totalId = tmstruckEnfactoryResultMapper.selectOrderIdByCpAndOn(map);
-            // 新增装车实绩
-            TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
-            //添加主键Id
-            tmstruckLoadResult.setResultId(tmstruckLoadResultMapper.selectMaxId());
-            //新增计量吨位 装车所装的重量
-            BigDecimal resultMeasuredTonnage = DataChange.dataToBigDecimal(map.get("resultMeasuredTonnage"));
-            tmstruckLoadResult.setResultMeasuredTonnage(resultMeasuredTonnage);
-            tmstruckLoadResult.setStatus(new BigDecimal(0));
-            tmstruckLoadResult.setResultTotalId(new BigDecimal(totalId));
-            String resultIsclear = (String) (map.get("resultIsclear"));
-            tmstruckLoadResult.setResultIsclear(resultIsclear);
-            //根据运输订单号查找运输订单类型
-            Integer orderType = tmstruckLoadResultMapper.selectOrderTypeByOrderNumber((String) map.get("orderNumber"));
-            int i2 = 0;
-            int i1 = 0;
-            switch (orderType) {
-                case 3:
-                    tmstruckLoadResult.setResultLoadStartTime(new Date((long) map.get("resultLoadStartTime")));
-                    //修改订单状态为执行中 1
-                    i1 = utilsService.updateOrderStatus(map, 1);
-                    //修改运力状态为执行中 1
-                    i2 = utilsService.updateCapacityStatus(map, 1);
-                    //新增出库实绩 并修改实时库存
-                    BigDecimal portId = tmstruckLoadResultMapper.getPortIdBySendStationId(DataChange.dataToBigDecimal(map.get("loadingId")));
-                    if (portId != null) {
-                        BigDecimal batchId = tmstruckLoadResultMapper.getBatchIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
-                        if (batchId != null) {
-                            HashMap<String, Object> hashMap = new HashMap<>();
-                            hashMap.put("batchId", batchId);
-                            hashMap.put("portId", portId);
-                            hashMap.put("resultTonnage", resultMeasuredTonnage);
-                            hashMap.put("isClean", resultIsclear);
-                            wmshBoundFeign.addResult(hashMap);
-                        }
-                    }
-                case 1:
-                    List list = tmstruckLoadResultMapper.selectResultIdByOrderNumber((String) map.get("orderNumber"));
-                    //查询最大id和最小id
-                    Integer maxResultId = (Integer) Collections.max(list);
-                    Integer minResultId = (Integer) Collections.min(list);
-                    //根据最大id查找扫描时间
-                    Map map1 = tmstruckLoadResultMapper.selectLoadTimeByResultId(minResultId);
-                    Date startdate = (Date) map1.get("loadTime");
-                    Integer loaderId = tmstruckLoadResultMapper.selecLoadIdByresultId(minResultId);
-                    //根据最小id查找扫描时间
-                    Map map2 = tmstruckLoadResultMapper.selectLoadTimeByResultId(maxResultId);
-                    Date endDate = (Date) map2.get("loadTime");
-                    tmstruckLoadResult.setResultLoadStartTime(startdate);
-                    tmstruckLoadResult.setResultLoadEndTime(endDate);
-                    //开始时间
-                    long startTime = startdate.getTime();
-                    long endTime = endDate.getTime();
-                    long time = endTime - startTime;
-                    long l = time / 1000;
-                    tmstruckLoadResult.setResultLoadDuration(new BigDecimal(l));
-                    tmstruckLoadResult.setLoaderId(new BigDecimal(loaderId));
-                    //新增出库实绩
-                    wmsFeign.insertOutBoundResult(map);
-
-            }
-            tmstruckLoadResult.setMaterialId(materialId);
-            tmstruckLoadResult.setInsertUpdateRemark((String) map.get("insertUpdateRemark"));
-            int i3 = tmstruckLoadResultMapper.insertSelective(tmstruckLoadResult);
-            return i3 + i1 + i2;
-        }
-
-        return 6;
+    public int addLoadResult(Map<String, Object> map){
+        TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
+        //添加主键Id
+        tmstruckLoadResult.setResultId(tmstruckLoadResultMapper.selectMaxId());
+        //添加物资Id
+        tmstruckLoadResult.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
+        //添加总实绩ID
+        tmstruckLoadResult.setResultTotalId(DataChange.dataToBigDecimal(map.get("resultTotalId")));
+        return tmstruckLoadResultMapper.insertSelective(tmstruckLoadResult);
     }
+
     /**
-     * 新增销售装车
+     * 修改销售装车实绩  （如果是多种物资【多拼】，通过物资Id和运输订单号来确定唯一的装车实绩进行修改）
+     * @param map 物资唯一编码  运输订单号
+     * @return
      */
+    public int addXSLoadResult(Map<String, Object> map){
+        //通过物资唯一编码查找物资Id
+        BigDecimal materialId = tmstruckLoadResultMapper.getMaterialIdByMaterialCode((String) map.get("materialCode"));
+        //通过运输订单号查找总实绩ID
+        Integer resultTotalId = tmstruckEnfactoryResultMapper.selectOrderIdByCpAndOn(map);
+        //通过总实绩ID与物资ID查找装车实绩主键ID
+        Integer resultId = tmstruckLoadResultMapper.getLoadResultIdByMIdAndTotalId(resultTotalId, materialId.intValue());
+        TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
+        tmstruckLoadResult.setStatus(new BigDecimal(0)); // 添加状态0:正常
+        //添加主键
+        tmstruckLoadResult.setResultId(new BigDecimal(resultId));
+        //新增计量吨位 装车所装的重量
+        tmstruckLoadResult.setResultMeasuredTonnage(DataChange.dataToBigDecimal(map.get("resultMeasuredTonnage")));
+        //获取扫描实绩最小Id  添加扫描开始时间
+        Integer scanId = tmstruckLoadResultMapper.getMinScanIdByOrderNum(map);
+        Map timeMap = tmstruckLoadResultMapper.selectLoadTimeByResultId(scanId);
+        Date resultLoadStartTime = (Date) timeMap.get("loadTime");
+        tmstruckLoadResult.setResultLoadStartTime(resultLoadStartTime);
+        //添加扫描结束时间
+        Date resultLoadEndTime = new Date();
+        tmstruckLoadResult.setResultLoadEndTime(resultLoadEndTime);
+        //添加装车实绩时长  ----  计算装车时长
+        long time = (resultLoadEndTime.getTime() - resultLoadStartTime.getTime()) / 60000; // 分钟
+        tmstruckLoadResult.setResultLoadDuration(new BigDecimal(time));
+        //添加装卸工Id
+        tmstruckLoadResult.setLoaderId(new BigDecimal(1));
+        //添加备注
+        tmstruckLoadResult.setInsertUpdateRemark((String) map.get("insertUpdateRemark"));
+        //新增出库实绩
+//        wmsFeign.insertOutBoundResult(map);
+        return tmstruckLoadResultMapper.insertSelective(tmstruckLoadResult);
+    }
 
     /**
      * 修改装车作业
@@ -268,7 +210,6 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
 
     /**
      * 逻辑删除装车实绩 状态 1
-     *
      * @param resultId
      * @return
      */
@@ -282,7 +223,6 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
 
     /**
      * 修改装车作业点 多个装车点随机分配给多个装车实绩
-     *
      * @param mapList
      * @return
      */
@@ -304,7 +244,6 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
 
     /**
      * 查询销售合同装车实绩
-     *
      * @param map
      * @return
      */
@@ -313,73 +252,6 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         return tmstruckLoadResultMapper.selectLoadResultForSale(map);
     }
 
-    /**
-     * 新增销售装车实绩(虚拟)
-     *
-     * @param map {orderId 运输订单Id}
-     * @return
-     */
-    public int addSaleLoadResult(Map<String, Object> map) {
-//        String orderNumber = (String) map.get("orderNumber");
-        List<Map<String, Object>> materialList = tmstruckLoadResultMapper.selectMaterialIdByOrderNumber(map);
-        int i = 0;
-        for (Map<String, Object> materialMap : materialList) {
-            TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
-            //添加物资ID
-            tmstruckLoadResult.setMaterialId(DataChange.dataToBigDecimal(materialMap.get("materialId")));
-            //添加总实绩ID
-            Integer totalId = tmstruckEnfactoryResultMapper.selectOrderIdByCpAndOn(map);
-            tmstruckLoadResult.setResultTotalId(new BigDecimal(totalId));
-            //添加主键
-            tmstruckLoadResult.setResultId(tmstruckLoadResultMapper.selectMaxId());
-            i += tmstruckLoadResultMapper.insertSelective(tmstruckLoadResult);
-        }
-        return i;
-    }
-
-    /**
-     * 查询所有装车实绩
-     *
-     * @param map
-     * @return
-     */
-    @Override
-    public List<Map<String, Object>> getAllLoadResult(Map<String, Object> map) {
-        Integer orderType = (Integer) map.get("orderTypee");
-        switch (orderType) {
-            case 1:
-                return tmstruckLoadResultMapper.getXSLoadResult(map);
-            case 2:
-
-                break;
-            case 3:
-
-                break;
-            case 4:
-
-                break;
-            case 5:
-
-                break;
-            case 6:
-
-                break;
-            case 7:
-
-                break;
-            case 8:
-                return tmstruckLoadResultMapper.getCGJKLoadResult(map);
-            case 9:
-
-                break;
-            case 10:
-
-                break;
-            case 11:
-        }
-        return null;
-    }
-
     //内转物流，新增装车实绩
     @Override
     public int addLoadResultForconverted(Map<String, Object> map) {

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

@@ -70,8 +70,8 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
     }
 
     /**
-     * 添加计皮委托 并发送计皮委托
-     * @param map {orderTypee: 订单类型  resultTotalId：总实绩ID}
+     * 添加计毛委托 并发送计毛委托
+     * @param map {orderTypee: 订单类型  resultTotalId：总实绩ID orderNumber：运输订单号}
      * @return
      */
     public int addMaoMeasureCommission(Map<String, Object> map){
@@ -85,7 +85,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
 
     /**
      * 添加计皮委托 并发送计皮委托
-     * @param map {orderTypee: 订单类型  resultTotalId：总实绩ID}
+     * @param map {orderTypee: 订单类型  resultTotalId：总实绩ID  orderNumber：运输订单号}
      * @return
      */
     public int addPiMeasureCommission(Map<String, Object> map){
@@ -119,37 +119,48 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
 
     /**
      * 查询计量委托并向计量系统发送数据  调用他们接口
-     * @param map orderTypee 订单类型  type 计皮还是计毛类型  resultTotalId  总实绩ID
+     * 1：销售订单；2：焦炭发运计划；3：水渣发运计划；4：内转到异地库；5：采购辅料订单；6：采购老区燃料订单；
+     * 7：采购新区燃料订单；8：采购进口矿(万州-厂内)；9：采购内转(达州-厂内)；10：采购内转(老区-厂内)； 11：厂内内转
+     * @param map orderTypee 订单类型  type 计皮0还是计毛1类型  resultTotalId  总实绩ID
      */
     public void sendMeasureCommissionMes(Map<String, Object> map){
-        List<Map<String, Object>> measureCommission = null;
+        Map<String, Object> measureCommission = null;
         //查询计量委托
         BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderTypee"));
+        Integer type = (Integer) map.get("type");
         switch (orderType.intValue()){
             case 1:
+                if(type == 0) {
+                    measureCommission =  tmstruckMeasureCommissionMapper.selectMakesureTareForSaleByOrderNumber(map);
+                }else {
+                    measureCommission =  tmstruckMeasureCommissionMapper.selectMakesureGrossForSaleByOrderNumber(map);
+                }
                 break;
             case 2:
                 break;
             case 3:
                 break;
+            case 10:
+            case 11:
             case 4:
+                if(type == 0) {
+                    measureCommission =  tmstruckMeasureCommissionMapper.selectMakesureTareForConvertedByOrderNumber(map);
+                }else {
+                    measureCommission =  tmstruckMeasureCommissionMapper.selectMakesureGrossForConvertedByOrderNumber(map);
+                }
                 break;
             case 5:
-                break;
             case 6:
-                break;
             case 7:
-                break;
             case 8:
-                break;
             case 9:
-                break;
-            case 10:
-                break;
-            case 11:
-        }
+                if(type == 0) {
+                    measureCommission =  tmstruckMeasureCommissionMapper.selectMakesureGrossForPurchase(map);
+                }else {
+                    measureCommission =  tmstruckMeasureCommissionMapper.selectMakesureTareForPurchase(map);
+                }
 
-//        Map<String, Object> mes = measureCommission.get(0);
+        }
         /*访问接口发送数据*/
         /********************************************/
     }

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

@@ -127,9 +127,10 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
         //生成最大主键ID
         tmstruckWeightResult.setWeightTaskResultId(tmstruckWeightResultMapper.selectMaxId());
         tmstruckWeightResult.setResultTotalId(DataChange.dataToBigDecimal(map.get("resultTotalId")));
-        // 添加计皮计毛作业点ID
-//        tmstruckWeightResult.setResultGrossPlaceId(DataChange.dataToBigDecimal(map.get("truckCalculateIdMao")));
-//        tmstruckWeightResult.setResultTarePlaceId(DataChange.dataToBigDecimal(map.get("truckCalculateIdPi")));
+        //添加是否需要扣水扣杂
+        tmstruckWeightResult.setIsdeduct(DataChange.dataToBigDecimal(map.get("isdeduct")));
+        // 添加物资Id (销售、内转到异地库）
+        tmstruckWeightResult.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
         return tmstruckWeightResultMapper.insertSelective(tmstruckWeightResult);
     }
 

src/main/resources/bootstrap.yml

@@ -22,7 +22,7 @@ openfeign:
   BmsTruckFeign:
     url: ${BMSTRUCKFEIGN_URL:localhost:8076}
   WmshBoundFeign:
-    url: ${WMSHBOUNDFEIGN_URL:172.16.33.161:8070}
+    url: ${WMSHBOUNDFEIGN_URL:localhost:8070}
   WMSFeign:
     url: ${WMSHBOUNDFEIGN_URL:localhost:8093}
   OmsFeign:
@@ -35,7 +35,7 @@ openfeign:
 eureka:
   client:
     service-url:
-      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.161}:${EUREKA_PORT:8061}/eureka/
+      defaultZone: http://root:root@${EUREKA_HOST:localhost}:${EUREKA_PORT:8061}/eureka/
 
   instance:
     prefer-ip-address: true

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

@@ -621,7 +621,6 @@
             <if test="orderId != null">
                 OO.ORDER_ID = #{orderId}
             </if>
-
             <if test="orderNumber != null">
                 and OO.ORDER_NUMBER = #{orderNumber}
             </if>

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

@@ -719,6 +719,18 @@
         where OO.ORDER_NUMBER = #{oderNumber}
     </select>
 
+<!--  通过运输订单号查询 出库实绩 最小Id（第一件扫描时间）  0 成功  1 失败-->
+    <select id="getMinScanIdByOrderNum" parameterType="string" resultType="int">
+        select MIN(WOSR.RESULT_ID)
+        from OMSTRUCK_ORDER OO
+                 left join WMSP_OUTBOUND_RESULT WOR
+                           on OO.ORDER_ID = WOR.BILL_LADING_ID
+                 left join WMSP_OUTBOUND_SCAN_RESULT WOSR
+                           on WOSR.OUTBOUND_RESULT_ID = WOR.RESULT_ID
+        WHERE OO.ORDER_NUMBER = #{orderNumber} and WOR.MATERIAL_ID = #{materailId}
+          and WOSR.RESULT_CHECK = 0
+    </select>
+
     <!-- 根据运输订单号查找 -->
     <select id="selectResultIdByOrderNumber" resultType="java.lang.Integer" parameterType="java.lang.String">
         select WOSR.RESULT_ID "resultId"
@@ -729,7 +741,7 @@
                  left join WMSP_OUTBOUND_SCAN_RESULT WOSR
                            on WOSR.OUTBOUND_RESULT_ID = WOR.RESULT_ID
         WHERE OO.ORDER_NUMBER = #{orderNumber}
-          and WOSR.RESULT_CHECK = 1
+          and WOSR.RESULT_CHECK = 0
     </select>
 
     <!-- 根据实绩id查找扫描时间 -->
@@ -882,47 +894,75 @@
 
     <!--  查询销售装车实绩  -->
     <select id="getXSLoadResult" parameterType="java.util.Map" resultType="java.util.Map">
-        select *
-        from (
-        select TLR.RESULT_ID "resultId",
-        APO.PURCHASE_ORDER_NO "purchaseOrderNo",
-        RM.MATERIAL_NAME "materialName",
-        OO.ORDER_NUMBER "orderNumber",
-        RC.CAPACITY_NUMBER "capacityNumber",
-        TLR.RESULT_MEASURED_TONNAGE "resultMeasuredTonnage",
-        TLR.RESULT_ISCLEAR "resultIsclear",
-        TLR.RESULT_LOAD_START_TIME "resultLoadStartTime",
-        TLR.INSERT_UPDATE_REMARK "insertUpdateRemark",
-        TLR.INSERT_TIME "insertTime",
-        RCON. CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
-        RS.SUPPLIER_NAME "supplierName"
-        from TMSTRUCK_LOAD_RESULT TLR
-        left join TMSTRUCK_TOTAL_RESULT TTR
-        on TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
-        left join OMSTRUCK_ORDER OO
-        on TTR.ORDER_ID = OO.ORDER_ID
-        left join OMSTRUCK_ORDER_MATERIAL OOM
-        on OO.ORDER_ID = OOM.ORDER_ID
-        left join AMS_PURCHASE_ORDER APO
-        on OO.ORDER_PLAN_ID = APO.PURCHASE_ORDER_ID
-        left join DIL_BATCH DB
-        on DB.BATCH_ID = APO.BATCH_ID
-        left join RMS_MATERIAL RM
-        on OOM.MATERIAL_ID = RM.MATERIAL_ID
-        left join RMS_DRIVER_CAPACITY RDC
-        on RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
-        left join RMS_CAPACITY RC
-        on RC.CAPACITY_ID = RDC.CAPACITY_ID
-        left join RMS_SUPPLIER RS
-        on RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
-        left join RMS_CONSIGNEE RCON
-        on RCON.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
-        where TLR.STATUS = #{status} and OO.ORDER_TYPE = #{orderTypee}
+        SELECT *
+        FROM (
+            SELECT OO.ORDER_NUMBER "orderNumber",
+                   RC.CAPACITY_NUMBER "capacityNumber",
+                   TLR.RESULT_LOAD_START_TIME "resultLoadStartTime",
+                   TLR.RESULT_LOAD_END_TIME "resultLoadEndTime",
+                   TLR.RESULT_LOAD_DURATION "resultLoadDuration",
+                   RSD.STANDARD_DATA_MAX "standardDataMax",
+                   RP.PERSONNEL_NAME "personnelName",
+                   (CASE WHEN OO.ORDER_TYPE = 1
+                        THEN (
+                                SELECT ASO.SALE_NUMBER
+                                FROM AMS_SALE_ORDER_MATERIAL ASOM
+                                LEFT JOIN AMS_SALE_ORDER ASO ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+                                WHERE ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+                            )
+                        WHEN OO.ORDER_TYPE IN (2, 3)
+                        THEN (
+                                SELECT ARD.DAYPLAN_NO
+                                FROM AMSTRUCK_RAIL_DAYPLAN ARD
+                                WHERE ARD.DAYPLAN_ID = OO.ORDER_PLAN_ID
+                            )
+                   END) "saleNum",
+                   (CASE WHEN   OO.ORDER_TYPE = 1
+                        THEN (
+                                SELECT RM.MATERIAL_NAME
+                                FROM RMS_MATERIAL_STEEL RMS
+                                LEFT JOIN RMS_MATERIAL RM ON RMS.MATERIAL_ID = RM.MATERIAL_ID
+                                WHERE RMS.MATERIAL_STEEL_ID = OOM.MATERIAL_ID
+                            )
+                        WHEN OO.ORDER_TYPE IN (2, 3)
+                        THEN (
+                                SELECT RM2.MATERIAL_NAME
+                                FROM RMS_MATERIAL RM2
+                                WHERE RM2.MATERIAL_ID = OOM.MATERIAL_ID
+                            )
+                    END) "materialName",
+                   (CASE WHEN   OO.ORDER_TYPE = 1
+                        THEN OOM.ORDER_MATERIAL_NUMBER
+                        WHEN OO.ORDER_TYPE IN (2, 3)
+                        THEN OOM.ORDER_MATERIAL_WEIGHT
+                     END) "materialNumWei",
+                   (CASE WHEN   OO.ORDER_TYPE = 1
+                        THEN   (SELECT MATERIAL_THEORETICAL_WEIGHT
+                                FROM RMS_MATERIAL_STEEL RMS2
+                                WHERE OOM.MATERIAL_ID = RMS2.MATERIAL_STEEL_ID
+                            )
+                     END) "materialTheoreticalWeight"
+            FROM TMSTRUCK_LOAD_RESULT TLR
+            LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+                ON TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+            LEFT JOIN OMSTRUCK_ORDER OO
+                ON OO.ORDER_ID = TTR.ORDER_ID
+            LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
+                ON OOM.ORDER_ID = OO.ORDER_ID
+            LEFT JOIN RMS_DRIVER_CAPACITY RDC
+                ON RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
+            LEFT JOIN RMS_CAPACITY RC
+                ON RC.CAPACITY_ID = RDC.CAPACITY_ID
+            LEFT JOIN RMS_STANDARD_DATA RSD
+                ON RSD.STANDARD_DATA_ID = TLR.LOAD_STANDARD_TIME_ID
+            LEFT JOIN RMS_PERSONNEL RP
+                ON TLR.LOADER_ID = RP.PERSONNEL_ID
+
         )
         <where>
-            <if test="purchaseOrderId != null">
-                <foreach collection="purchaseOrderId" item="item" open="(" separator="or" close=")">
-                    "purchaseOrderId" like '%${item}%'
+            <if test="orderNumber != null">
+                <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
+                    "orderNumber" like '%${item}%'
                 </foreach>
             </if>
             <if test="materialName != null">
@@ -931,10 +971,16 @@
                     "materialName" like '%${item}%'
                 </foreach>
             </if>
-            <if test="orderNumber != null">
+            <if test="materialNumWei != null">
                 and
-                <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
-                    "orderNumber" like '%${item}%'
+                <foreach collection="materialNumWei" item="item" open="(" separator="or" close=")">
+                    "materialNumWei" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialTheoreticalWeight != null">
+                and
+                <foreach collection="materialTheoreticalWeight" item="item" open="(" separator="or" close=")">
+                    "materialTheoreticalWeight" like '%${item}%'
                 </foreach>
             </if>
             <if test="capacityNumber != null">
@@ -943,28 +989,34 @@
                     "capacityNumber" like '%${item}%'
                 </foreach>
             </if>
-            <if test="orderMaterialWeight != null">
+            <if test="resultLoadStartTime != null">
                 and
-                <foreach collection="orderMaterialWeight" item="item" open="(" separator="or" close=")">
-                    "orderMaterialWeight" like '%${item}%'
+                <foreach collection="resultLoadStartTime" item="item" open="(" separator="or" close=")">
+                    "resultLoadStartTime" like '%${item}%'
                 </foreach>
             </if>
-            <if test="resultIsclear != null">
+            <if test="resultLoadEndTime != null">
                 and
-                <foreach collection="resultIsclear" item="item" open="(" separator="or" close=")">
-                    "resultIsclear" like '%${item}%'
+                <foreach collection="resultLoadEndTime" item="item" open="(" separator="or" close=")">
+                    "resultLoadEndTime" like '%${item}%'
                 </foreach>
             </if>
-            <if test="resultLoadStartTime != null">
+            <if test="resultLoadDuration != null">
                 and
-                <foreach collection="resultLoadStartTime" item="item" open="(" separator="or" close=")">
-                    "resultLoadStartTime" like '%${item}%'
+                <foreach collection="resultLoadDuration" item="item" open="(" separator="or" close=")">
+                    "resultLoadDuration" like '%${item}%'
                 </foreach>
             </if>
-            <if test="insertUpdateRemark != null">
+            <if test="standardDataMax != null">
                 and
-                <foreach collection="insertUpdateRemark" item="item" open="(" separator="or" close=")">
-                    "insertUpdateRemark" like '%${item}%'
+                <foreach collection="standardDataMax" item="item" open="(" separator="or" close=")">
+                    "standardDataMax" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="personnelName != null">
+                and
+                <foreach collection="personnelName" item="item" open="(" separator="or" close=")">
+                    "personnelName" like '%${item}%'
                 </foreach>
             </if>
         </where>
@@ -974,4 +1026,26 @@
         </if>
     </select>
 
+<!--  通过港口ID获取仓库ID  -->
+    <select id="getWarehouseIdByPortId" parameterType="java.math.BigDecimal" resultType="java.math.BigDecimal">
+        select RW.WAREHOUSE_ID
+        from RMS_WAREHOUSE RW
+        where RW.WAREHOUSE_TYPE_ID = 4 and RW.PORT_ID = #{portId}
+    </select>
+
+<!--  通过物资ID和总实绩Id查询唯一的装车实绩Id  -->
+    <select id="getLoadResultIdByMIdAndTotalId" parameterType="int" resultType="java.lang.Integer">
+        select TLR.RESULT_ID
+        from TMSTRUCK_LOAD_RESULT TLR
+        where TLR.RESULT_TOTAL_ID = #{resultTotalId}
+          and TLR.MATERIAL_ID = #{materialId}
+    </select>
+
+<!--    通过物资唯一编码 查找物资ID -->
+    <select id="getMaterialIdByMaterialCode" parameterType="string" resultType="java.math.BigDecimal">
+        select MATERIAL_ID
+        from RMS_MATERIAL
+        where MATERIAL_CODE = #{materialCode}
+    </select>
+
 </mapper>

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

@@ -528,4 +528,187 @@
         where TMC.COMMSSION_TYPE = #{type} and TMC.RESULT_TOTAL_ID = #{resultTotalId}
     </select>
 
+    <!--计量委托查询所需数据-->
+    <!--销售查询计毛 -->
+    <select id="selectMakesureGrossForSaleByOrderNumber" parameterType="java.lang.String" resultType="java.util.Map">
+        SELECT
+            OO.ORDER_NUMBER "orderNumber",
+            RC.CAPACITY_NUMBER "capacityNumber",
+            ASO.SALE_NUMBER "saleNumber",
+            RTC.TRUCK_CALCULATE_NUMBER "calcuateNumber",
+            RM.MATERIAL_NAME "materialName",
+            RMS.MATERIAL_THEORETICAL_WEIGHT "materialTheoretialWeight",
+            RS.SHIPPER_NAME "shipperName",
+            RRA.ADDRESS_DELIVERY_ADDRESS "addressDelivery"
+        FROM
+            OMSTRUCK_ORDER OO
+                LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
+                LEFT JOIN AMS_SALE_ORDER ASO ON OO.ORDER_PLAN_ID = ASO.SALE_ORDER_ID
+                LEFT JOIN RMS_DRIVER_CAPACITY RDC
+                          ON RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
+                LEFT JOIN RMS_CAPACITY RC
+                          ON  RC.CAPACITY_ID = RDC.CAPACITY_ID
+                LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                LEFT JOIN RMS_TRUCK_CALCULATE RTC ON TWR.RESULT_GROSS_PLACE_ID = RTC.TRUCK_CALCULATE_ID
+                LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM ON OO.ORDER_ID = OOM.ORDER_ID
+                LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+                LEFT JOIN RMS_MATERIAL_STEEL RMS ON OOM.MATERIAL_ID = RMS.MATERIAL_ID
+                LEFT JOIN RMS_SHIPPER RS ON RS.SHIPPER_ID = ASO.SHIPPER_ID
+                LEFT JOIN RMS_RECEIVE_ADDRESS RRA ON RRA.ADDRESS_ID = ASO.RECEIVE_ID
+        WHERE
+            OO.ORDER_NUMBER = #{orderNumber}
+    </select>
+
+    <!--销售物流查询计皮作业  -->
+    <select id="selectMakesureTareForSaleByOrderNumber" resultType="java.util.Map" parameterType="java.lang.String">
+        SELECT
+            OO.ORDER_NUMBER "orderNumber",
+            RC.CAPACITY_NUMBER "capacityNumber",
+            ASO.SALE_NUMBER "saleNumber",
+            RTC.TRUCK_CALCULATE_NUMBER "calcuateNumber",
+            RM.MATERIAL_NAME "materialName",
+            RMS.MATERIAL_THEORETICAL_WEIGHT "materialTheoretialWeight",
+            RS.SHIPPER_NAME "shipperName",
+            RRA.ADDRESS_DELIVERY_ADDRESS "addressDelivery"
+        FROM
+            OMSTRUCK_ORDER OO
+                LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
+                LEFT JOIN AMS_SALE_ORDER ASO ON OO.ORDER_PLAN_ID = ASO.SALE_ORDER_ID
+                LEFT JOIN RMS_DRIVER_CAPACITY RDC
+                          ON RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
+                LEFT JOIN RMS_CAPACITY RC
+                          ON  RC.CAPACITY_ID = RDC.CAPACITY_ID
+                LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                LEFT JOIN RMS_TRUCK_CALCULATE RTC ON TWR.RESULT_TARE_PLACE_ID = RTC.TRUCK_CALCULATE_ID
+                LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM ON OO.ORDER_ID = OOM.ORDER_ID
+                LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+                LEFT JOIN RMS_MATERIAL_STEEL RMS ON OOM.MATERIAL_ID = RMS.MATERIAL_ID
+                LEFT JOIN RMS_SHIPPER RS ON RS.SHIPPER_ID = ASO.SHIPPER_ID
+                LEFT JOIN RMS_RECEIVE_ADDRESS RRA ON RRA.ADDRESS_ID = ASO.RECEIVE_ID
+        WHERE
+            OO.ORDER_NUMBER = #{orderNumber}
+    </select>
+
+    <!--内转物流查询计皮作业 -->
+    <select id="selectMakesureTareForConvertedByOrderNumber" resultType="java.util.Map" parameterType="java.lang.String">
+        SELECT OO.ORDER_NUMBER "orderNumber",
+               ARP.REQUIREMENT_NUMBER "requirementNumber",
+               OOM.ORDER_MATERIAL_NUMBER "orderMaterialNumber",
+               OOM.ORDER_MATERIAL_WEIGHT "materialWeight",
+               RMS.MATERIAL_THEORETICAL_WEIGHT "theoreticalWeight",
+               RL.LINE_START_NODE_DESC "startNode",
+               RL.LINE_END_NODE_DESC "endNode",
+               RC.CAPACITY_NUMBER "capacityNumber",
+               RTC.TRUCK_CALCULATE_NUMBER "calculateNumber"
+        FROM  OMSTRUCK_ORDER OO
+                  LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM ON OO.ORDER_ID = OOM.ORDER_ID
+                  LEFT JOIN  AMSTRUCK_INWARD_REQUIREMENT ARP  ON ARP.REQUIREMENT_ID=OO.ORDER_PLAN_ID
+                  LEFT JOIN RMS_DRIVER_CAPACITY RDC
+                            ON RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
+                  LEFT JOIN RMS_CAPACITY RC
+                            ON  RC.CAPACITY_ID = RDC.CAPACITY_ID
+                  LEFT JOIN RMS_MATERIAL_STEEL RMS ON OOM.MATERIAL_ID = RMS.MATERIAL_ID
+                  LEFT JOIN  RMS_LINE RL ON ARP.LINE_ID = RL.LINE_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 RMS_TRUCK_CALCULATE  RTC
+                            ON RTC.TRUCK_CALCULATE_ID=TWR.RESULT_TARE_PLACE_ID
+        WHERE OO.ORDER_NUMBER = #{orderNumber}
+    </select>
+
+    <!-- 内转物流查询计毛作业 -->
+    <select id="selectMakesureGrossForConvertedByOrderNumber" resultType="java.util.Map" parameterType="java.lang.String">
+        SELECT OO.ORDER_NUMBER "orderNumber",
+               ARP.REQUIREMENT_NUMBER "requirementNumber",
+               OOM.ORDER_MATERIAL_NUMBER "orderMaterialNumber",
+               OOM.ORDER_MATERIAL_WEIGHT "materialWeight",
+               RMS.MATERIAL_THEORETICAL_WEIGHT "theoreticalWeight",
+               RL.LINE_START_NODE_DESC "startNode",
+               RL.LINE_END_NODE_DESC "endNode",
+               RC.CAPACITY_NUMBER "capacityNumber",
+               RTC.TRUCK_CALCULATE_NUMBER "calculateNumber"
+        FROM  OMSTRUCK_ORDER OO
+                  LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM ON OO.ORDER_ID = OOM.ORDER_ID
+                  LEFT JOIN  AMSTRUCK_INWARD_REQUIREMENT ARP  ON ARP.REQUIREMENT_ID=OO.ORDER_PLAN_ID
+                  LEFT JOIN RMS_DRIVER_CAPACITY RDC
+                            ON RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
+                  LEFT JOIN RMS_CAPACITY RC
+                            ON  RC.CAPACITY_ID = RDC.CAPACITY_ID
+                  LEFT JOIN RMS_MATERIAL_STEEL RMS ON OOM.MATERIAL_ID = RMS.MATERIAL_ID
+                  LEFT JOIN  RMS_LINE RL ON ARP.LINE_ID = RL.LINE_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 RMS_TRUCK_CALCULATE  RTC   ON RTC.TRUCK_CALCULATE_ID=TWR.RESULT_GROSS_PLACE_ID
+        WHERE OO.ORDER_NUMBER = #{orderNumber}
+    </select>
+
+    <!-- 采购查询计毛 -->
+    <select id="selectMakesureGrossForPurchase" parameterType="java.lang.String" resultType="java.util.Map">
+        SELECT OO.ORDER_NUMBER "orderNumber",
+               APO.PURCHASE_ORDER_NO "purchaseOrderNo",
+               OOM.ORDER_MATERIAL_WEIGHT "materialWeight",
+               OOM.ORDER_MATERIAL_NUMBER "materialNumber",
+               RTC.TRUCK_CALCULATE_NUMBER "calculateNumber",
+               RS.SHIPPER_NAME "shipperName",
+               RRA.ADDRESS_DELIVERY_ADDRESS "deliveryAdress",
+               RMS.MATERIAL_THEORETICAL_WEIGHT "theoreticalWeight",
+               RC.CAPACITY_NUMBER "capacityNumber"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN AMS_PURCHASE_ORDER APO
+                           ON OO.ORDER_PLAN_ID=APO.PURCHASE_ORDER_ID
+                 LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
+                           ON OO.ORDER_ID=OOM.ORDER_ID
+                 LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+                           ON OO.ORDER_ID = TTR.ORDER_ID
+                 LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+                           ON TWR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+                 LEFT JOIN RMS_TRUCK_CALCULATE RTC
+                           ON RTC.TRUCK_CALCULATE_ID=TWR.RESULT_GROSS_PLACE_ID
+                 LEFT JOIN RMS_SHIPPER RS
+                           ON RS.SHIPPER_ID=APO.SUPPLIER_UNIT_ID
+                 LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+                           ON RRA.ADDRESS_ID=APO.RECEIVE_UNIT_ID
+                 LEFT JOIN RMS_MATERIAL_STEEL RMS
+                           ON  RMS.MATERIAL_ID=OOM.MATERIAL_ID
+                 LEFT JOIN RMS_DRIVER_CAPACITY RDC
+                           ON RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON  RC.CAPACITY_ID = RDC.CAPACITY_ID
+        WHERE OO.ORDER_NUMBER = #{orderNumber}
+    </select>
+
+    <!-- 采购查询计皮 -->
+    <select id="selectMakesureTareForPurchase" parameterType="java.lang.String" resultType="java.util.Map">
+        SELECT OO.ORDER_NUMBER "orderNumber",
+               APO.PURCHASE_ORDER_NO "purchaseOrderNo",
+               OOM.ORDER_MATERIAL_WEIGHT "materialWeight",
+               OOM.ORDER_MATERIAL_NUMBER "materialNumber",
+               RTC.TRUCK_CALCULATE_NUMBER "calculateNumber",
+               RS.SHIPPER_NAME "shipperName",
+               RRA.ADDRESS_DELIVERY_ADDRESS "deliveryAdress",
+               RMS.MATERIAL_THEORETICAL_WEIGHT "theoreticalWeight",
+               RC.CAPACITY_NUMBER "capacityNumber"
+        FROM   OMSTRUCK_ORDER OO
+                   LEFT JOIN AMS_PURCHASE_ORDER APO
+                             ON OO.ORDER_PLAN_ID=APO.PURCHASE_ORDER_ID
+                   LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
+                             ON OO.ORDER_ID=OOM.ORDER_ID
+                   LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+                             ON OO.ORDER_ID = TTR.ORDER_ID
+                   LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+                             ON TWR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+                   LEFT JOIN RMS_TRUCK_CALCULATE RTC
+                             ON RTC.TRUCK_CALCULATE_ID=TWR.RESULT_TARE_PLACE_ID
+                   LEFT JOIN RMS_SHIPPER RS
+                             ON RS.SHIPPER_ID = APO.SUPPLIER_UNIT_ID
+                   LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+                             ON RRA.ADDRESS_ID = APO.RECEIVE_UNIT_ID
+                   LEFT JOIN RMS_MATERIAL_STEEL RMS
+                             ON  RMS.MATERIAL_ID = OOM.MATERIAL_ID
+                   LEFT JOIN RMS_DRIVER_CAPACITY RDC
+                             ON RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
+                   LEFT JOIN RMS_CAPACITY RC
+                             ON  RC.CAPACITY_ID = RDC.CAPACITY_ID
+        WHERE OO.ORDER_NUMBER = #{orderNumber}
+    </select>
 </mapper>

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

@@ -2,46 +2,45 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.steerinfo.dil.mapper.TmstruckWeightResultMapper">
     <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.TmstruckWeightResult">
-        <id column="WEIGHT_TASK_RESULT_ID" jdbcType="DECIMAL" property="weightTaskResultId"/>
-        <result column="RESULT_TOTAL_ID" jdbcType="DECIMAL" property="resultTotalId"/>
-
-        <result column="RESULT_POUND_NO" jdbcType="VARCHAR" property="resultPoundNo"/>
-        <result column="RESULT_GROSS_WEIGHT" jdbcType="DECIMAL" property="resultGrossWeight"/>
-        <result column="RESULT_GROSS_WEIGHT_TIME" jdbcType="TIMESTAMP" property="resultGrossWeightTime"/>
-        <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="RESULT_GROSS_PLACE_ID" jdbcType="DECIMAL" property="resultGrossPlaceId"/>
-        <result column="RESULT_TARE_PLACE_ID" jdbcType="DECIMAL" property="resultTarePlaceId"/>
+        <id column="WEIGHT_TASK_RESULT_ID" jdbcType="DECIMAL" property="weightTaskResultId" />
+        <result column="RESULT_TOTAL_ID" jdbcType="DECIMAL" property="resultTotalId" />
+        <result column="RESULT_POUND_NO" jdbcType="VARCHAR" property="resultPoundNo" />
+        <result column="RESULT_GROSS_WEIGHT" jdbcType="DECIMAL" property="resultGrossWeight" />
+        <result column="RESULT_GROSS_WEIGHT_TIME" jdbcType="TIMESTAMP" property="resultGrossWeightTime" />
+        <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="RESULT_GROSS_PLACE_ID" jdbcType="DECIMAL" property="resultGrossPlaceId" />
+        <result column="RESULT_TARE_PLACE_ID" jdbcType="DECIMAL" property="resultTarePlaceId" />
+        <result column="MATERIAL_ID" jdbcType="DECIMAL" property="materialId" />
+        <result column="ISDEDUCT" jdbcType="DECIMAL" property="isdeduct" />
+        <result column="ISQUALITY" jdbcType="DECIMAL" property="isquality" />
     </resultMap>
     <sql id="columns">
-        WEIGHT_TASK_RESULT_ID, RESULT_TOTAL_ID,  RESULT_POUND_NO, RESULT_GROSS_WEIGHT,
-    RESULT_GROSS_WEIGHT_TIME, 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, RESULT_GROSS_PLACE_ID, RESULT_TARE_PLACE_ID
+        WEIGHT_TASK_RESULT_ID, RESULT_TOTAL_ID, RESULT_POUND_NO, RESULT_GROSS_WEIGHT, RESULT_GROSS_WEIGHT_TIME, 
+    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, 
+    RESULT_GROSS_PLACE_ID, RESULT_TARE_PLACE_ID, MATERIAL_ID, ISDEDUCT, ISQUALITY
     </sql>
     <sql id="columns_alias">
-        t.WEIGHT_TASK_RESULT_ID, t.RESULT_TOTAL_ID,  t.RESULT_POUND_NO, t.RESULT_GROSS_WEIGHT,
-    t.RESULT_GROSS_WEIGHT_TIME, 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.RESULT_GROSS_PLACE_ID, t.RESULT_TARE_PLACE_ID
+        t.WEIGHT_TASK_RESULT_ID, t.RESULT_TOTAL_ID, t.RESULT_POUND_NO, t.RESULT_GROSS_WEIGHT, 
+    t.RESULT_GROSS_WEIGHT_TIME, 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.RESULT_GROSS_PLACE_ID, t.RESULT_TARE_PLACE_ID, t.MATERIAL_ID, 
+    t.ISDEDUCT, t.ISQUALITY
     </sql>
     <sql id="select">
-        SELECT
-        <include refid="columns"/>
-        FROM TMSTRUCK_WEIGHT_RESULT
+        SELECT <include refid="columns" /> FROM TMSTRUCK_WEIGHT_RESULT
     </sql>
     <sql id="select_alias">
-        SELECT
-        <include refid="columns_alias"/>
-        FROM TMSTRUCK_WEIGHT_RESULT t
+        SELECT <include refid="columns_alias" /> FROM TMSTRUCK_WEIGHT_RESULT t
     </sql>
     <sql id="where">
         <where>
@@ -96,6 +95,15 @@
             <if test="resultTarePlaceId != null">
                 and RESULT_TARE_PLACE_ID = #{resultTarePlaceId}
             </if>
+            <if test="materialId != null">
+                and MATERIAL_ID = #{materialId}
+            </if>
+            <if test="isdeduct != null">
+                and ISDEDUCT = #{isdeduct}
+            </if>
+            <if test="isquality != null">
+                and ISQUALITY = #{isquality}
+            </if>
         </where>
     </sql>
     <sql id="whereLike">
@@ -151,11 +159,19 @@
             <if test="resultTarePlaceId != null">
                 and RESULT_TARE_PLACE_ID = #{resultTarePlaceId}
             </if>
+            <if test="materialId != null">
+                and MATERIAL_ID = #{materialId}
+            </if>
+            <if test="isdeduct != null">
+                and ISDEDUCT = #{isdeduct}
+            </if>
+            <if test="isquality != null">
+                and ISQUALITY = #{isquality}
+            </if>
         </where>
     </sql>
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
-        delete
-        from TMSTRUCK_WEIGHT_RESULT
+        delete from TMSTRUCK_WEIGHT_RESULT
         where WEIGHT_TASK_RESULT_ID = #{weightTaskResultId,jdbcType=DECIMAL}
     </delete>
     <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
@@ -209,25 +225,33 @@
         <if test="resultTarePlaceId != null">
             or RESULT_TARE_PLACE_ID = #{resultTarePlaceId}
         </if>
+        <if test="materialId != null">
+            or MATERIAL_ID = #{materialId}
+        </if>
+        <if test="isdeduct != null">
+            or ISDEDUCT = #{isdeduct}
+        </if>
+        <if test="isquality != null">
+            or ISQUALITY = #{isquality}
+        </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.TmstruckWeightResult">
         insert into TMSTRUCK_WEIGHT_RESULT (WEIGHT_TASK_RESULT_ID, RESULT_TOTAL_ID,
-                                            RESULT_POUND_NO, RESULT_GROSS_WEIGHT,
-                                            RESULT_GROSS_WEIGHT_TIME, 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, RESULT_GROSS_PLACE_ID, RESULT_TARE_PLACE_ID)
+                                            RESULT_POUND_NO, RESULT_GROSS_WEIGHT, RESULT_GROSS_WEIGHT_TIME,
+                                            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, RESULT_GROSS_PLACE_ID,
+                                            RESULT_TARE_PLACE_ID, MATERIAL_ID, ISDEDUCT,
+                                            ISQUALITY)
         values (#{weightTaskResultId,jdbcType=DECIMAL}, #{resultTotalId,jdbcType=DECIMAL},
-                #{resultPoundNo,jdbcType=VARCHAR}, #{resultGrossWeight,jdbcType=DECIMAL},
-                #{resultGrossWeightTime,jdbcType=TIMESTAMP}, #{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}, #{resultGrossPlaceId,jdbcType=DECIMAL},
-                #{resultTarePlaceId,jdbcType=DECIMAL})
+                #{resultPoundNo,jdbcType=VARCHAR}, #{resultGrossWeight,jdbcType=DECIMAL}, #{resultGrossWeightTime,jdbcType=TIMESTAMP},
+                #{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}, #{resultGrossPlaceId,jdbcType=DECIMAL},
+                #{resultTarePlaceId,jdbcType=DECIMAL}, #{materialId,jdbcType=DECIMAL}, #{isdeduct,jdbcType=DECIMAL},
+                #{isquality,jdbcType=DECIMAL})
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmstruckWeightResult">
         insert into TMSTRUCK_WEIGHT_RESULT
@@ -283,6 +307,15 @@
             <if test="resultTarePlaceId != null">
                 RESULT_TARE_PLACE_ID,
             </if>
+            <if test="materialId != null">
+                MATERIAL_ID,
+            </if>
+            <if test="isdeduct != null">
+                ISDEDUCT,
+            </if>
+            <if test="isquality != null">
+                ISQUALITY,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="weightTaskResultId != null">
@@ -336,26 +369,38 @@
             <if test="resultTarePlaceId != null">
                 #{resultTarePlaceId,jdbcType=DECIMAL},
             </if>
+            <if test="materialId != null">
+                #{materialId,jdbcType=DECIMAL},
+            </if>
+            <if test="isdeduct != null">
+                #{isdeduct,jdbcType=DECIMAL},
+            </if>
+            <if test="isquality != null">
+                #{isquality,jdbcType=DECIMAL},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmstruckWeightResult">
         update TMSTRUCK_WEIGHT_RESULT
-        set RESULT_TOTAL_ID          = #{resultTotalId,jdbcType=DECIMAL},
-            RESULT_POUND_NO          = #{resultPoundNo,jdbcType=VARCHAR},
-            RESULT_GROSS_WEIGHT      = #{resultGrossWeight,jdbcType=DECIMAL},
+        set RESULT_TOTAL_ID = #{resultTotalId,jdbcType=DECIMAL},
+            RESULT_POUND_NO = #{resultPoundNo,jdbcType=VARCHAR},
+            RESULT_GROSS_WEIGHT = #{resultGrossWeight,jdbcType=DECIMAL},
             RESULT_GROSS_WEIGHT_TIME = #{resultGrossWeightTime,jdbcType=TIMESTAMP},
-            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},
-            RESULT_GROSS_PLACE_ID    = #{resultGrossPlaceId,jdbcType=DECIMAL},
-            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},
+            RESULT_GROSS_PLACE_ID = #{resultGrossPlaceId,jdbcType=DECIMAL},
+            RESULT_TARE_PLACE_ID = #{resultTarePlaceId,jdbcType=DECIMAL},
+            MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
+            ISDEDUCT = #{isdeduct,jdbcType=DECIMAL},
+            ISQUALITY = #{isquality,jdbcType=DECIMAL}
         where WEIGHT_TASK_RESULT_ID = #{weightTaskResultId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmstruckWeightResult">
@@ -409,20 +454,29 @@
             <if test="resultTarePlaceId != null">
                 RESULT_TARE_PLACE_ID = #{resultTarePlaceId,jdbcType=DECIMAL},
             </if>
+            <if test="materialId != null">
+                MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
+            </if>
+            <if test="isdeduct != null">
+                ISDEDUCT = #{isdeduct,jdbcType=DECIMAL},
+            </if>
+            <if test="isquality != null">
+                ISQUALITY = #{isquality,jdbcType=DECIMAL},
+            </if>
         </set>
         where WEIGHT_TASK_RESULT_ID = #{weightTaskResultId,jdbcType=DECIMAL}
     </update>
     <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
-        <include refid="select"/>
+        <include refid="select" />
         where WEIGHT_TASK_RESULT_ID = #{weightTaskResultId,jdbcType=DECIMAL}
     </select>
     <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-        <include refid="select"/>
-        <include refid="where"/>
+        <include refid="select" />
+        <include refid="where" />
     </select>
     <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
-        <include refid="select"/>
-        <include refid="whereLike"/>
+        <include refid="select" />
+        <include refid="whereLike" />
     </select>
     <insert id="batchInsert" parameterType="java.util.List">
         insert into TMSTRUCK_WEIGHT_RESULT
@@ -434,7 +488,8 @@
         INSERT_TIME, UPDATE_USERNAME,
         UPDATE_TIME, INSERT_UPDATE_REMARK,
         DELETE_NAME, DELETE_TIME, RESULT_GROSS_PLACE_ID,
-        RESULT_TARE_PLACE_ID)
+        RESULT_TARE_PLACE_ID, MATERIAL_ID,
+        ISDEDUCT, ISQUALITY)
         ( <foreach collection="list" item="item" separator="union all">
         select
         #{item.weightTaskResultId,jdbcType=DECIMAL},
@@ -444,99 +499,94 @@
         #{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.resultGrossPlaceId,jdbcType=DECIMAL},
-        #{item.resultTarePlaceId,jdbcType=DECIMAL} from dual
+        #{item.deleteName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=TIMESTAMP}, #{item.resultGrossPlaceId,jdbcType=DECIMAL},
+        #{item.resultTarePlaceId,jdbcType=DECIMAL}, #{item.materialId,jdbcType=DECIMAL},
+        #{item.isdeduct,jdbcType=DECIMAL}, #{item.isquality,jdbcType=DECIMAL} from dual
     </foreach> )
     </insert>
     <update id="batchUpdate" parameterType="java.util.List">
         update TMSTRUCK_WEIGHT_RESULT
         set
         WEIGHT_TASK_RESULT_ID=
-        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID"
-                 separator=" ">
+        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.weightTaskResultId,jdbcType=DECIMAL}
         </foreach>
         ,RESULT_TOTAL_ID=
-        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID"
-                 separator=" ">
+        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultTotalId,jdbcType=DECIMAL}
         </foreach>
         ,RESULT_POUND_NO=
-        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID"
-                 separator=" ">
+        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultPoundNo,jdbcType=VARCHAR}
         </foreach>
         ,RESULT_GROSS_WEIGHT=
-        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID"
-                 separator=" ">
+        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultGrossWeight,jdbcType=DECIMAL}
         </foreach>
         ,RESULT_GROSS_WEIGHT_TIME=
-        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID"
-                 separator=" ">
+        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultGrossWeightTime,jdbcType=TIMESTAMP}
         </foreach>
         ,RESULT_TARE_WEIGHT=
-        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID"
-                 separator=" ">
+        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultTareWeight,jdbcType=DECIMAL}
         </foreach>
         ,RESULT_TARE_WEIGHT_TIME=
-        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID"
-                 separator=" ">
+        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultTareWeightTime,jdbcType=TIMESTAMP}
         </foreach>
         ,RESULT_NET_WEIGHT=
-        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID"
-                 separator=" ">
+        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultNetWeight,jdbcType=DECIMAL}
         </foreach>
         ,INSERT_USERNAME=
-        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID"
-                 separator=" ">
+        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
         </foreach>
         ,INSERT_TIME=
-        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID"
-                 separator=" ">
+        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
         </foreach>
         ,UPDATE_USERNAME=
-        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID"
-                 separator=" ">
+        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
         </foreach>
         ,UPDATE_TIME=
-        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID"
-                 separator=" ">
+        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
         </foreach>
         ,INSERT_UPDATE_REMARK=
-        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID"
-                 separator=" ">
+        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
         </foreach>
         ,DELETE_NAME=
-        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID"
-                 separator=" ">
+        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.deleteName,jdbcType=VARCHAR}
         </foreach>
         ,DELETE_TIME=
-        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID"
-                 separator=" ">
+        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.deleteTime,jdbcType=TIMESTAMP}
         </foreach>
         ,RESULT_GROSS_PLACE_ID=
-        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID"
-                 separator=" ">
+        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultGrossPlaceId,jdbcType=DECIMAL}
         </foreach>
         ,RESULT_TARE_PLACE_ID=
-        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID"
-                 separator=" ">
+        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
             when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.resultTarePlaceId,jdbcType=DECIMAL}
         </foreach>
+        ,MATERIAL_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
+            when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.materialId,jdbcType=DECIMAL}
+        </foreach>
+        ,ISDEDUCT=
+        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
+            when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.isdeduct,jdbcType=DECIMAL}
+        </foreach>
+        ,ISQUALITY=
+        <foreach close="end" collection="list" index="index" item="item" open="case WEIGHT_TASK_RESULT_ID" separator=" ">
+            when #{item.weightTaskResultId,jdbcType=DECIMAL} then #{item.isquality,jdbcType=DECIMAL}
+        </foreach>
         where WEIGHT_TASK_RESULT_ID in
         <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
             #{item.weightTaskResultId,jdbcType=DECIMAL}