dev

pom.xml

@@ -111,7 +111,12 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
+<<<<<<< HEAD
                         <param>RMS_CAPACITY</param>
+=======
+                        <param>TMSSHIP_WATER_QUALITY_RESULT</param>
+                        <param></param>
+>>>>>>> 42f2b387e811a0965c1c2783a5628f720bf8a7b5
                     </tables>
                 </configuration>
                 <executions>

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

@@ -23,7 +23,7 @@ public class ShipDynamicsController extends BaseRESTfulController {
     public RESTfulResult selectAllShipDynamaics() {
         //返回值mapList
         //获取视图里的所有外轮船名，物资名称
-        List<Map<String, Object>> list = iShipDynamicsService.selectAll();
+         List<Map<String, Object>> list = iShipDynamicsService.selectAll();
         if (list.size()==0){
 //            System.out.println("暂时没有位置作业");
             return failed("暂时没有船舶动态");
@@ -34,6 +34,7 @@ public class ShipDynamicsController extends BaseRESTfulController {
         Double capacityNumberSum2 = 0.0;
         Double capacityNumberSum3 = 0.0;
         Double capacityNumberSum4 = 0.0;
+        Double  materialSum1=0.0;
         //获取下游港口吨位的总和
         Double tonnageSum=0.0;
         //1：未到闸船舶2：等闸船舶3：已过闸船舶4：到港待卸船舶的和
@@ -45,12 +46,15 @@ public class ShipDynamicsController extends BaseRESTfulController {
             if(i>0&&!list.get(i).get("batchId").equals(list.get(i-1).get("batchId"))){
                 Map<String,Object> map=new LinkedHashMap<>();
                 map.put("batchId",list.get(i-1).get("batchId"));
+                map.put("materialType",list.get(i-1).get("materialTypeName"));
+                map.put("materialName",list.get(i-1).get("materialName"));
                 map.put("pm",list.get(i).get("materialName").toString() +"\n\n\n\n\n"+
                         "\""+list.get(i).get("shipName").toString()+"\""+"\n\n\n\n\n"+
                         list.get(i).get("dateOfLoans").toString().substring(0, 10)+"\n\n\n\n\n"+"放"+
                         list.get(i).get("numberOfLoans").toString()+"吨");
                 map.put("tonnage",list.get(i-1).get("tonnage"));
                 map.put("portName", list.get(i-1).get("portName"));
+                map.put("materialType",list.get(i-1).get("materialTypeName"));
                 tonnageSum+=Double.parseDouble(list.get(i-1).get("tonnage").toString());
                 map.put("capacity1","小计");
                 map.put("capacity2","小计");
@@ -69,6 +73,7 @@ public class ShipDynamicsController extends BaseRESTfulController {
                         list.get(i-1).get("dateOfLoans").toString().substring(0, 10)+"放货"+
                         list.get(i-1).get("numberOfLoans").toString());
                 map2.put("tonnage",list.get(i-1).get("tonnage"));
+                map2.put("materialType",list.get(i-1).get("materialTypeName"));
                 map2.put("portName", list.get(i-1).get("portName"));
                 map2.put("capacity1",capacityNumberSum1+capacityNumberSum2+capacityNumberSum3+capacityNumberSum4);
                 map2.put("type",1);
@@ -78,6 +83,7 @@ public class ShipDynamicsController extends BaseRESTfulController {
                capacityNumberSum2 = 0.0;
                capacityNumberSum3 = 0.0;
                capacityNumberSum4 = 0.0;
+
             }
             Map<String, Object> map = new HashMap<>();
             map.put("batchId",list.get(i).get("batchId"));
@@ -91,6 +97,7 @@ public class ShipDynamicsController extends BaseRESTfulController {
             list.get(i).get("numberOfLoans").toString()+"吨";
             map.put("pm",pm);
             map.put("tonnage",list.get(i).get("tonnage"));
+            map.put("materialType",list.get(i).get("materialTypeName"));
             //1：未到闸船舶2：等闸船舶3：已过闸船舶4：到港待卸船舶
             String capacity1=null;
             String capacity2=null;
@@ -163,6 +170,8 @@ public class ShipDynamicsController extends BaseRESTfulController {
         }
         Map<String,Object> map=new HashMap<>();
         map.put("batchId",list.get(list.size()-1).get("batchId"));
+        map.put("materialType",list.get(list.size()-1).get("materialTypeName"));
+        map.put("materialName",list.get(list.size()-1).get("materialName"));
         map.put("pm",list.get(list.size()-1).get("shipName").toString()+
                 list.get(list.size()-1).get("materialName").toString()+
                 list.get(list.size()-1).get("dateOfLoans").toString().substring(0, 10)+"放货"+
@@ -186,6 +195,8 @@ public class ShipDynamicsController extends BaseRESTfulController {
                 list.get(list.size()-1).get("materialName").toString()+
                 list.get(list.size()-1).get("dateOfLoans").toString().substring(0, 10)+"放货"+
                 list.get(list.size()-1).get("numberOfLoans").toString());
+        map2.put("materialName",list.get(list.size()-1).get("materialName"));
+        map2.put("materialType",list.get(list.size()-1).get("materialTypeName"));
         map2.put("tonnage",list.get(list.size()-1).get("tonnage"));
         map.put("portName", list.get(list.size()-1).get("portName"));
         map2.put("capacity1",capacityNumberSum1+capacityNumberSum2+capacityNumberSum3+capacityNumberSum4);

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

@@ -69,7 +69,7 @@ public class TmsshipLoadShipResultController extends BaseRESTfulController {
 
     /**
      * 修改装船作业信息
-     * @param tmsshipLoadShipResult
+     * @param map
      * @return
      */
     @ApiOperation(value="修改装船作业信息", notes="根据TmsshipLoadShipResult对象修改")
@@ -77,8 +77,8 @@ public class TmsshipLoadShipResultController extends BaseRESTfulController {
             @ApiImplicitParam(name = "tmsshipLoadShipResult",value = "装船作业字段",required = true,paramType = "TmsshipLoadShipResult")
     })
     @PostMapping("/updateLoadShip")
-    public RESTfulResult updateLoadShip(@RequestBody TmsshipLoadShipResult tmsshipLoadShipResult) {
-        int code = tmsshipLoadShipResultService.updateLoadShip(tmsshipLoadShipResult);
+    public RESTfulResult updateLoadShip(@RequestBody Map<String,Object> map) {
+        int code = tmsshipLoadShipResultService.updateLoadShip(map);
         return success(code);
     }
 

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

@@ -156,11 +156,12 @@ public class TmsshipWaterQualityResultController extends BaseRESTfulController {
 })
 @PostMapping("/getMoistureAndInstallations")
 public RESTfulResult getMoistureAndInstallations(@RequestBody(required = false) Map<String,Object> map) {
-    Map<String,Object> result = tmsshipWaterQualityResultService.getMoistureAndInstallations(map);
-
+        Map<String,Object> result = tmsshipWaterQualityResultService.getMoistureAndInstallations(map);
+        if (result.get("errCode")=="001"){
+            return failed("请勾选船舶信息");
+        }
        return success(result);
 
-
 }
 
 }

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

@@ -66,5 +66,5 @@ public interface TmsshipWaterQualityResultMapper extends IBaseMapper<TmsshipWate
     List<Map<String,Object>> getResultActualInstallations(BigDecimal batchId);
 
     //获得合同含水值
-    String getPurchaseContractMoisture(BigDecimal batchId);
+    String getPurchaseContractMoisture(BigDecimal batchInfactoryId);
 }

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

@@ -3,19 +3,20 @@ 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 TmsshipWaterQualityResult implements IBasePO<BigDecimal> {
     /**
-     * 主键ID(RESULT_ID,DECIMAL,38)
+     * 主键ID(RESULT_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="主键ID",required=true)
     private BigDecimal resultId;
 
     /**
-     * 总实绩ID(TOTAL_RESULT_ID,DECIMAL,38)
+     * 总实绩ID(TOTAL_RESULT_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="总实绩ID",required=false)
     private BigDecimal totalResultId;
@@ -39,10 +40,10 @@ public class TmsshipWaterQualityResult implements IBasePO<BigDecimal> {
     private BigDecimal resultShipmentRatio;
 
     /**
-     * 空舱/重载水尺米(RESULT_EMPTY_HEAVY_WATER_METER,DECIMAL,0)
+     * 空舱/重载水尺米(RESULT_EMPTY_HEAVY_WATER_METER,VARCHAR,20)
      */
     @ApiModelProperty(value="空舱/重载水尺米",required=false)
-    private BigDecimal resultEmptyHeavyWaterMeter;
+    private String resultEmptyHeavyWaterMeter;
 
     /**
      * 含水率(RESULT_MOISTURE_CONTENT,DECIMAL,0)
@@ -107,6 +108,7 @@ public class TmsshipWaterQualityResult implements IBasePO<BigDecimal> {
     /**
      * 预计放货日期(RESULT_ES_DELIVERY_DATE,TIMESTAMP,7)
      */
+ 
     @ApiModelProperty(value="预计放货日期",required=false)
     private Date resultEsDeliveryDate;
 
@@ -116,6 +118,18 @@ public class TmsshipWaterQualityResult implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="逻辑删除",required=false)
     private BigDecimal deleted;
 
+    /**
+     * 单价(WATER_UNIT_PRICE,DECIMAL,0)
+     */
+    @ApiModelProperty(value="单价",required=false)
+    private BigDecimal waterUnitPrice;
+
+    /**
+     * 是否需要拼装(IS_NEED_ASSEMBLE,VARCHAR,20)
+     */
+    @ApiModelProperty(value="是否需要拼装",required=false)
+    private String isNeedAssemble;
+
     private static final long serialVersionUID = 1L;
 
     @Override
@@ -168,12 +182,12 @@ public class TmsshipWaterQualityResult implements IBasePO<BigDecimal> {
         this.resultShipmentRatio = resultShipmentRatio;
     }
 
-    public BigDecimal getResultEmptyHeavyWaterMeter() {
+    public String getResultEmptyHeavyWaterMeter() {
         return resultEmptyHeavyWaterMeter;
     }
 
-    public void setResultEmptyHeavyWaterMeter(BigDecimal resultEmptyHeavyWaterMeter) {
-        this.resultEmptyHeavyWaterMeter = resultEmptyHeavyWaterMeter;
+    public void setResultEmptyHeavyWaterMeter(String resultEmptyHeavyWaterMeter) {
+        this.resultEmptyHeavyWaterMeter = resultEmptyHeavyWaterMeter == null ? null : resultEmptyHeavyWaterMeter.trim();
     }
 
     public BigDecimal getResultMoistureContent() {
@@ -272,6 +286,22 @@ public class TmsshipWaterQualityResult implements IBasePO<BigDecimal> {
         this.deleted = deleted;
     }
 
+    public BigDecimal getWaterUnitPrice() {
+        return waterUnitPrice;
+    }
+
+    public void setWaterUnitPrice(BigDecimal waterUnitPrice) {
+        this.waterUnitPrice = waterUnitPrice;
+    }
+
+    public String getIsNeedAssemble() {
+        return isNeedAssemble;
+    }
+
+    public void setIsNeedAssemble(String isNeedAssemble) {
+        this.isNeedAssemble = isNeedAssemble == null ? null : isNeedAssemble.trim();
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -296,6 +326,8 @@ public class TmsshipWaterQualityResult implements IBasePO<BigDecimal> {
         sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
         sb.append(", resultEsDeliveryDate=").append(resultEsDeliveryDate);
         sb.append(", deleted=").append(deleted);
+        sb.append(", waterUnitPrice=").append(waterUnitPrice);
+        sb.append(", isNeedAssemble=").append(isNeedAssemble);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

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

@@ -46,10 +46,10 @@ public interface ITmsshipLoadShipResultService {
 
     /**
      * 根据主键修改
-     * @param tmsshipLoadShipResult
+     * @param map
      * @return
      */
-    int updateLoadShip(TmsshipLoadShipResult tmsshipLoadShipResult);
+    int updateLoadShip(Map<String,Object> map);
 
 
     /**

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

@@ -1,18 +1,13 @@
 package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.feign.WmshboundFeign;
-import com.steerinfo.dil.mapper.TmsshipEntryWharyResultMapper;
-import com.steerinfo.dil.mapper.TmsshipOutWharyResultMapper;
-import com.steerinfo.dil.mapper.TmsshipShipLocationMapper;
-import com.steerinfo.dil.model.TmsshipEntryWharyResult;
-import com.steerinfo.dil.model.TmsshipOutWharyResult;
-import com.steerinfo.dil.model.TmsshipShipLocation;
+import com.steerinfo.dil.mapper.*;
+import com.steerinfo.dil.model.*;
 import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.util.NoUtil;
 import com.steerinfo.framework.controller.RESTfulResult;
-import com.steerinfo.dil.model.TmsshipLoadShipResult;
-import com.steerinfo.dil.mapper.TmsshipLoadShipResultMapper;
 import com.steerinfo.dil.service.ITmsshipLoadShipResultService;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -51,6 +46,9 @@ public class TmsshipLoadShipResultServiceImpl implements ITmsshipLoadShipResultS
     @Autowired
     TmsshipShipLocationMapper tmsshipShipLocationMapper;
 
+    @Autowired
+    TmsshipWaterQualityResultMapper tmsshipWaterQualityResultMapper;
+
     @Autowired
     WmshboundFeign wmshboundFeign;
     @Autowired
@@ -67,18 +65,16 @@ public class TmsshipLoadShipResultServiceImpl implements ITmsshipLoadShipResultS
         int i=0;
         Map<String,Object> mapVal = (Map<String, Object>) map.get("mapVal");
         Map<String,Object> rowMap = (Map<String, Object>) map.get("rowMap");
+        String userId =(String) mapVal.get("userId");
         TmsshipLoadShipResult tmsshipLoadShipResult = new TmsshipLoadShipResult();
         TmsshipEntryWharyResult tmsshipEntryWharyResult = new TmsshipEntryWharyResult();
         BigDecimal orderId = new BigDecimal((Integer) rowMap.get("orderId"));
-        BigDecimal batchId= DataChange.dataToBigDecimal(rowMap.get("batchId"));
-        Map<String,Object> ppMap = tmsshipLoadShipResultMapper.getPortAndPier(batchId);
+        BigDecimal batchInfactoryId= DataChange.dataToBigDecimal(rowMap.get("batchInfactoryId"));
+        Map<String,Object> ppMap = tmsshipLoadShipResultMapper.getPortAndPier(batchInfactoryId);
         BigDecimal pierId = (BigDecimal) ppMap.get("pierId");
         Date noticeDeliveryTime = (Date) ppMap.get("noticeDeliveryTime");
         BigDecimal startPortId = DataChange.dataToBigDecimal(ppMap.get("startPortId"));
         String resultMemo = (String) mapVal.get("resultMemo");
-        // 抵港
-        Date resultPortDeclarationTime = new Date((Long) mapVal.get("resultPortDeclarationTime"));
-        String resultPortDeclarationName = (String) mapVal.get("resultPortDeclarationName");
         Date resultArrivalTime = new Date((Long)mapVal.get("resultArrivalTime"));
         tmsshipLoadShipResult.setResultArrivalPortTime(resultArrivalTime);
         BigDecimal totalResultId = tmsshipTotalResultService.getResultTotalId(orderId);
@@ -88,22 +84,17 @@ public class TmsshipLoadShipResultServiceImpl implements ITmsshipLoadShipResultS
         String resultEntryNumber = noUtil.setResultNo("DG",resultEntryId);
         tmsshipEntryWharyResult.setResultNumber(resultEntryNumber);
         tmsshipEntryWharyResult.setWharyId(pierId);
-        tmsshipEntryWharyResult.setResultPortDeclarationTime(resultPortDeclarationTime);
-        tmsshipEntryWharyResult.setResultPortDeclarationName(resultPortDeclarationName);
+        //抵港时间
         tmsshipEntryWharyResult.setResultArrivalTime(resultArrivalTime);
         if (resultMemo!=null) {
             tmsshipEntryWharyResult.setResultMemo(resultMemo);
         }
+        //离港确认人
+        String resultOutWharyName =(String) mapVal.get("resultOutWharyName");
+        tmsshipEntryWharyResult.setResultPortDeclarationName(resultOutWharyName);
         // 设置常规字段
         tmsshipEntryWharyResult.setInsertTime(new Date());
-        tmsshipEntryWharyResult.setUpdateTime(new Date());
-        tmsshipEntryWharyResult.setInsertUsername("admin");
-        tmsshipEntryWharyResult.setUpdateUsername("admin");
-        tmsshipEntryWharyResult.setInsertUpdateRemark("无");
-        //离港
-        String resultOutWharyName = (String) mapVal.get("resultOutWharyName");
-        Date resultOutWharyTime = new Date((Long) mapVal.get("resultOutWharyTime"));
-        tmsshipLoadShipResult.setResultOutPortTime(resultOutWharyTime);
+        tmsshipEntryWharyResult.setInsertUsername(userId);
         TmsshipOutWharyResult tmsshipOutWharyResult = new TmsshipOutWharyResult();
         tmsshipOutWharyResult.setTotalResultId(totalResultId);
         BigDecimal resultOutId = tmsshipOutWharyResultMapper.selectOutId();
@@ -111,24 +102,18 @@ public class TmsshipLoadShipResultServiceImpl implements ITmsshipLoadShipResultS
         String resultOutNumber = noUtil.setResultNo("LG",resultOutId);
         tmsshipOutWharyResult.setResultNumber(resultOutNumber);
         tmsshipOutWharyResult.setWharyId(pierId);
-        tmsshipOutWharyResult.setResultOutWharyTime(resultOutWharyTime);
-        tmsshipOutWharyResult.setResultOutWharyName(resultOutWharyName);
         if (resultMemo!=null) {
             tmsshipOutWharyResult.setResultMemo(resultMemo);
         }
         // 设置常规字段
         tmsshipOutWharyResult.setInsertTime(new Date());
-        tmsshipOutWharyResult.setUpdateTime(new Date());
-        tmsshipOutWharyResult.setInsertUsername("admin");
-        tmsshipOutWharyResult.setUpdateUsername("admin");
-        tmsshipOutWharyResult.setInsertUpdateRemark("无");
+        tmsshipOutWharyResult.setInsertUsername(userId);
         // 装船
         BigDecimal resultId = tmsshipLoadShipResultMapper.selectLoadId();
-
         //通过总实绩id查找船运起运港口
         //根据港口和批次Id查询实时库存id
         Map<String,Object> idMap=new HashMap<>();
-        idMap.put("batchId",batchId);
+        idMap.put("batchInfactoryId",batchInfactoryId);
         idMap.put("downSwimPortId",startPortId);
         //查询实时库存
         Map<String,Object> gmMap = tmsshipLoadShipResultMapper.selectGmIdByPortId(idMap);
@@ -148,28 +133,20 @@ public class TmsshipLoadShipResultServiceImpl implements ITmsshipLoadShipResultS
         tmsshipLoadShipResult.setResultIsclear(resultIsClear);
         if (resultIsClear.equals("清场")){
            wmshboundFeign.clearWmshGridMaterial(gmMap);
-//        }else {
-//            //调用出库
-//            idMap.put("resultTonnage", resultActualInstallations);
-//            Map<String, Object> resTfulResult = wmshboundFeign.addResult(idMap);
-//            if (DataChange.dataToBigDecimal(resTfulResult.get("code")).intValue()!=200) {
-//                String data = (String) resTfulResult.get("data");
-//                return data;
-//            }
         }
         String resultNumber = noUtil.setResultNo("ZC",resultEntryId);
         tmsshipLoadShipResult.setResultId(resultId);
         tmsshipLoadShipResult.setTotalResultId(totalResultId);
-        tmsshipLoadShipResult.setBatchId(batchId);
+        tmsshipLoadShipResult.setBatchId(batchInfactoryId);
         tmsshipLoadShipResult.setResultDeliveryDate(noticeDeliveryTime);
+        long resultOutWharyTime = (long) mapVal.get("resultOutWharyTime");
+        tmsshipLoadShipResult.setResultOutPortTime(new Date(resultOutWharyTime));
+        tmsshipEntryWharyResult.setResultPortDeclarationName((String) map.get("resultOutWharyName"));
         tmsshipLoadShipResult.setResultActualInstallations(resultActualInstallations);
         tmsshipLoadShipResult.setResultNumber(resultNumber);
         // 设置常规字段
         tmsshipLoadShipResult.setInsertTime(new Date());
-        tmsshipLoadShipResult.setInsertUsername("admin");
-        tmsshipLoadShipResult.setInsertUpdateRemark("无");
-        tmsshipLoadShipResult.setUpdateTime(new Date());
-        tmsshipLoadShipResult.setUpdateUsername("admin");
+        tmsshipLoadShipResult.setInsertUsername(userId);
         tmsshipLoadShipResult.setDeleted(new BigDecimal(0));
         i += tmsshipEntryWharyResultMapper.insertSelective(tmsshipEntryWharyResult);
         i += tmsshipOutWharyResultMapper.insertSelective(tmsshipOutWharyResult);
@@ -187,6 +164,34 @@ public class TmsshipLoadShipResultServiceImpl implements ITmsshipLoadShipResultS
         tmsshipShipLocation.setDeleted(new BigDecimal(0));
         i += tmsshipShipLocationMapper.insertSelective(tmsshipShipLocation);
         i += tmsshipLoadShipResultMapper.insertSelective(tmsshipLoadShipResult);
+        //新增水分质检
+        TmsshipWaterQualityResult tmsshipWaterQualityResult=new TmsshipWaterQualityResult();
+        BigDecimal qualityId = tmsshipWaterQualityResultMapper.selectQualityId();
+        tmsshipWaterQualityResult.setTotalResultId(totalResultId);
+        tmsshipWaterQualityResult.setResultId(qualityId);
+        //计划日期
+        long resultPlannedDate = (long) mapVal.get("resultPlannedDate");
+        tmsshipWaterQualityResult.setResultPlannedDate(new Date(resultPlannedDate));
+       //预计放货日期
+        long expectNoticeDate = (long) mapVal.get("expectNoticeDate");
+        tmsshipWaterQualityResult.setResultEsDeliveryDate(new Date(expectNoticeDate));
+       //是否需要拼装
+        String isNeedAssemble =(String) mapVal.get("isNeedAssemble");
+        tmsshipWaterQualityResult.setIsNeedAssemble(isNeedAssemble);
+        //单价
+        BigDecimal waterUnitPrice =DataChange.dataToBigDecimal(mapVal.get("waterUnitPrice"));
+        tmsshipWaterQualityResult.setWaterUnitPrice(waterUnitPrice);
+        //空载
+        String resultEmptyHeavyWaterMeter = (String) mapVal.get("resultEmptyHeavyWaterMeter");
+        tmsshipWaterQualityResult.setResultEmptyHeavyWaterMeter(resultEmptyHeavyWaterMeter);
+        BigDecimal contractMoistureValue = DataChange.dataToBigDecimal(mapVal.get("contractMoistureValue"));
+        tmsshipWaterQualityResult.setResultMoistureContent(contractMoistureValue);
+        //检测费
+        BigDecimal resultInspectionFees = DataChange.dataToBigDecimal(map.get("resultInspectionFees"));
+        tmsshipWaterQualityResult.setResultInspectionFees(resultInspectionFees);
+        BigDecimal moistureTonnage =DataChange.dataToBigDecimal(mapVal.get("moistureTonnage"));
+        tmsshipWaterQualityResult.setResultWaterTonnage(moistureTonnage);
+        i+=tmsshipWaterQualityResultMapper.insertSelective(tmsshipWaterQualityResult);
         return i;
     }
 
@@ -214,13 +219,41 @@ public class TmsshipLoadShipResultServiceImpl implements ITmsshipLoadShipResultS
 
     /**
      * 根据主键修改
-     * @param tmsshipLoadShipResult
+     * @param
      * @return
      */
     @Override
-    public int updateLoadShip(TmsshipLoadShipResult tmsshipLoadShipResult) {
+    public int updateLoadShip(Map<String,Object> map) {
+        int i=0;
+        TmsshipLoadShipResult tmsshipLoadShipResult=new TmsshipLoadShipResult();
+        tmsshipLoadShipResult.setResultId(DataChange.dataToBigDecimal(map.get("resultId")));
+        long resultLoadShipDate =(long) map.get("resultLoadShipDate");
+        tmsshipLoadShipResult.setResultLoadShipDate(new Date(resultLoadShipDate));
+        tmsshipLoadShipResult.setResultActualInstallations(DataChange.dataToBigDecimal(map.get("resultActualInstallations")));
+        long resultOutPortTime =(long) map.get("resultOutPortTime");
+        tmsshipLoadShipResult.setResultOutPortTime(new Date(resultOutPortTime));
+        long resultArrivalPortTime = (long) map.get("resultArrivalPortTime");
+        tmsshipLoadShipResult.setResultArrivalPortTime(new Date(resultArrivalPortTime));
         tmsshipLoadShipResult.setUpdateTime(new Date());
-        return tmsshipLoadShipResultMapper.updateByPrimaryKeySelective(tmsshipLoadShipResult);
+        tmsshipLoadShipResult.setUpdateUsername((String) map.get("userId"));
+        String resultIsClear = (String) map.get("resultIsClear");
+        tmsshipLoadShipResult.setResultIsclear(resultIsClear);
+        TmsshipWaterQualityResult tmsshipWaterQualityResult=new TmsshipWaterQualityResult();
+        tmsshipWaterQualityResult.setResultId(DataChange.dataToBigDecimal(map.get("waterQualiyResultId")));
+        long planDate =(long) map.get("planDate");
+        tmsshipWaterQualityResult.setResultPlannedDate(new Date(planDate));
+        long planDeliveryDate =(long) map.get("planDeliveryDate");
+        tmsshipWaterQualityResult.setResultEsDeliveryDate(new Date(planDeliveryDate));
+        String resultHeavyWeight =(String) map.get("resultHeavyWeight");
+        tmsshipWaterQualityResult.setResultEmptyHeavyWaterMeter(resultHeavyWeight);
+        TmsshipOutWharyResult tmsshipOutWharyResult=new TmsshipOutWharyResult();
+        tmsshipOutWharyResult.setResultId(DataChange.dataToBigDecimal(map.get("outWharyResultId")));
+        tmsshipOutWharyResult.setResultOutWharyTime(new Date(resultOutPortTime));
+        tmsshipOutWharyResult.setResultOutWharyName((String) map.get("resultOutPortName"));
+        i += tmsshipOutWharyResultMapper.updateByPrimaryKeySelective(tmsshipOutWharyResult);
+        i += tmsshipLoadShipResultMapper.updateByPrimaryKeySelective(tmsshipLoadShipResult);
+        i +=tmsshipWaterQualityResultMapper.updateByPrimaryKeySelective(tmsshipWaterQualityResult);
+        return i;
     }
 
     /**

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

@@ -66,11 +66,7 @@ public class TmsshipWaterQualityResultServiceImpl implements ITmsshipWaterQualit
         TmsshipLoadShipResult tmsshipLoadShipResult=new TmsshipLoadShipResult();
         //空舱/重载水尺米
        String resultEmptyHeavyWaterMeter= (String) mapVal.get("resultEmptyHeavyWaterMeter");
-        if(resultEmptyHeavyWaterMeter.equals("电子磅交接")){
-            tmsshipWaterQualityResult.setResultEmptyHeavyWaterMeter(new BigDecimal(0));
-        }else if(resultEmptyHeavyWaterMeter.equals("地磅交接")){
-            tmsshipWaterQualityResult.setResultEmptyHeavyWaterMeter(new BigDecimal(1));
-        }
+       tmsshipWaterQualityResult.setResultEmptyHeavyWaterMeter(resultEmptyHeavyWaterMeter);
 
       //  Date resultEsDeliveryDate = tmsshipWaterQualityResultMapper.getDeliveryDate(orderId);
 
@@ -225,32 +221,30 @@ public class TmsshipWaterQualityResultServiceImpl implements ITmsshipWaterQualit
     //根据选中的批次id获取合同水分值、实装吨位
     @Override
      public Map<String,Object> getMoistureAndInstallations(Map<String,Object> map) {
-        DilBatch dilBatch=new DilBatch();
+        Map<String,Object> map1=new HashMap<>();
         TmsshipWaterQualityResult tmsshipWaterQualityResult=new TmsshipWaterQualityResult();
-        TmsshipLoadShipResult tmsshipLoadShipResult=new TmsshipLoadShipResult();
+        BigDecimal resultActualInstallations1 =DataChange.dataToBigDecimal(map.get("resultActualInstallations"));
         AmsshipDeliveryNotice amsshipDeliveryNotice=new AmsshipDeliveryNotice();
         //获得批次号id
-        BigDecimal batchId = new BigDecimal((Integer) map.get("batchId"));
-        dilBatch.setBatchId(batchId);
-        //获得含水率
-        BigDecimal resultMoistureContent = new BigDecimal(map.get("resultMoistureContent").toString());
-        tmsshipWaterQualityResult.setResultMoistureContent(resultMoistureContent);
-       //获得实装吨位
-        List<Map<String,Object>> resultActualInstallations = getResultActualInstallations(batchId);
-        Map<String, Object> stringObjectMap = resultActualInstallations.get(0);
-        BigDecimal resultActualInstallations1 =DataChange.dataToBigDecimal(stringObjectMap.get("resultActualInstallations"));
-        tmsshipLoadShipResult.setResultActualInstallations(resultActualInstallations1);
-        //获得合同含水率
-        String purchaseContractMoisture=getPurchaseContractMoisture(batchId);
-        amsshipDeliveryNotice.setPurchaseContractMoisture(purchaseContractMoisture);
-        //根据获得的含水率和实装吨位，计算水分吨位
-        DecimalFormat df=new DecimalFormat("#.0000");
-        String resultWaterTonnage=df.format(resultActualInstallations1.doubleValue() * resultMoistureContent.doubleValue());
-        tmsshipWaterQualityResult.setResultWaterTonnage(new BigDecimal(resultWaterTonnage));
-        Map<String,Object> map1=new HashMap<>();
-        map1.put("purchaseContractMoisture",purchaseContractMoisture);
-        map1.put("resultActualInstallations",resultActualInstallations1);
-        map1.put("resultWaterTonnage",resultWaterTonnage );
+        if (map.get("batchInfactoryId")==null||"".equals(map.get("batchInfactoryId"))){
+            map.put("errCode","001");
+            return map;
+        }else {
+            BigDecimal batchInfactoryId = DataChange.dataToBigDecimal(map.get("batchInfactoryId"));
+            String purchaseContractMoisture=getPurchaseContractMoisture(batchInfactoryId);
+            //获得含水率
+            BigDecimal resultMoistureContent = new BigDecimal(map.get("resultMoistureContent").toString());
+            tmsshipWaterQualityResult.setResultMoistureContent(resultMoistureContent);
+            //获得合同含水率
+            amsshipDeliveryNotice.setPurchaseContractMoisture(purchaseContractMoisture);
+            //根据获得的含水率和实装吨位，计算水分吨位
+            DecimalFormat df=new DecimalFormat("#.0000");
+            String resultWaterTonnage=df.format(resultActualInstallations1.doubleValue() * resultMoistureContent.doubleValue());
+            tmsshipWaterQualityResult.setResultWaterTonnage(new BigDecimal(resultWaterTonnage));
+            map1.put("purchaseContractMoisture",purchaseContractMoisture);
+            map1.put("resultWaterTonnage",resultWaterTonnage );
+        }
+
         return map1;
     }
 
@@ -260,7 +254,7 @@ public class TmsshipWaterQualityResultServiceImpl implements ITmsshipWaterQualit
     }
 
     //获得合同含水值
-    public String getPurchaseContractMoisture(BigDecimal batchId){
-        return tmsshipWaterQualityResultMapper.getPurchaseContractMoisture(batchId);
+    public String getPurchaseContractMoisture(BigDecimal batchInfactoryId){
+        return tmsshipWaterQualityResultMapper.getPurchaseContractMoisture(batchInfactoryId);
     }
 }

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/shipTms
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev}
   jackson:
         date-format: yyyy-MM-dd HH:mm:ss
         time-zone: GMT+8

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

@@ -302,14 +302,20 @@
   <select id="getBatchListFortTransfer" resultType="java.util.Map" parameterType="java.util.Map">
     select DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
            RM.MATERIAL_NAME "materialName",
-           DB.BATCH_ID "batchId"
+           DBI.BATCH_INFACOTRY_ID "batchId",
+           APO.PURCHASE_ORDER_NO "purchaseOrderNo",
+           DBI.INFACTORY_SHIP_NAME "infactoryShipName"
 
-    from AMSSHIP_CARGO_TRANSFER_RESULT ACTR
+    from AMSSHIP_DELIVERY_NOTICE ADN
+    LEFT JOIN DIL_BATCH_INFACOTRY DBI
+    ON DBI.BATCH_INFACOTRY_ID = ADN.BATCH_ID
     LEFT JOIN DIL_BATCH DB
-    on ACTR.BATCH_ID = DB.BATCH_ID
+    on DBI.BATCH_ID = DB.BATCH_ID
+    left join AMS_PURCHASE_ORDER APO
+     ON APO.BATCH_ID=DB.BATCH_ID
     LEFT JOIN RMS_MATERIAL RM
     ON RM.MATERIAL_ID=DB.MATERIAL_ID
-    where ACTR.DELETED=0
+    where ADN.DELETED=0
     order by  DB.INSERT_TIME desc
 </select>
 <!--  根据用户输入模糊查询江船船名-->

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

@@ -620,11 +620,10 @@
 
     <!-- 得到港口和码头 -->
     <select id="getPortAndPier" parameterType="DECIMAL" resultType="java.util.Map">
-        SELECT DISTINCT ACTR.GROUP_ID AS "pierId",
+        SELECT DISTINCT ADN.GROUP_ID AS "pierId",
                         ADN.PORT_ID   AS "portId"
-        FROM AMSSHIP_CARGO_TRANSFER_RESULT ACTR
-        LEFT JOIN AMSSHIP_DELIVERY_NOTICE ADN
-        ON ADN.BATCH_ID = ACTR.BATCH_ID
+
+        FROM AMSSHIP_DELIVERY_NOTICE ADN
         WHERE ADN.BATCH_ID = #{batchId}
     </select>
 <!-- 获得港口名称模态框-->

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

@@ -6,8 +6,8 @@
         select db.BATCH_ID "batchId",
                db.result_foreign_ship_name "shipName",
                rm.material_name "materialName",
-               actr.result_date_of_loans "dateOfLoans",
-               actr.RESULT_NUMBER_OF_LOANS "numberOfLoans",
+               adn.NOTICE_DELIVERY_TIME "dateOfLoans",
+               adn.RESULT_NUMBER_OF_LOANS "numberOfLoans",
                rp.port_name "portName",
                wgm.gm_tonnage "tonnage",
                rc.capacity_number "capacity",
@@ -16,11 +16,13 @@
                tlsr.RESULT_ARRIVAL_PORT_TIME "dgsj",
                tsl.LOCATION_STATUS "locationStatus",
                tsl.LOCATION_VALUE "locationValue",
-               tsl.LOCATION_ROUTE_TIME
-                 from DIL_BATCH db
+               tsl.LOCATION_ROUTE_TIME,
+               RMT.MATERIAL_TYPE_NAME "materialTypeName",
+               RMT.MATERIAL_TYPE_ID "materialTypeId"
+                 from DIL_BATCH_INFACOTRY DBI2
+                 JOIN DIL_BATCH DB ON DBI2.BATCH_ID=DB.BATCH_ID
                  join rms_material rm on db.material_id=rm.material_id
-                 left join AMSSHIP_CARGO_TRANSFER_RESULT actr on db.batch_id=actr.batch_id
-                 left join AMSSHIP_DELIVERY_NOTICE adn on adn.batch_id=db.batch_id
+                 left join AMSSHIP_DELIVERY_NOTICE adn on adn.batch_id=DBI2.BATCH_INFACOTRY_ID
                  left join rms_port rp on rp.port_id=adn.port_id
                  left join (select * from WMSH_GRID_MATERIAL wgm where wgm.GM_ID in
                                                                        (SELECT
@@ -39,11 +41,12 @@
                                                                                     WMSH_GRID_MATERIAL wgm
                                                                             ) wgm
                                                                         WHERE
-                                                                            rn = 1)) wgm on wgm.batch_id=db.batch_id
-                 left join TMSSHIP_LOAD_SHIP_RESULT tlsr on db.batch_id=tlsr.batch_id
+                                                                            rn = 1)) wgm on wgm.batch_id=DBI2.BATCH_INFACOTRY_ID
+                 left join TMSSHIP_LOAD_SHIP_RESULT tlsr on DBI2.BATCH_INFACOTRY_ID=tlsr.batch_id
                  left join tmsship_total_result ttr on ttr.result_id=tlsr.TOTAL_RESULT_ID
                  left join omsship_instructions_capacity oic on ttr.order_id=oic.instructions_capacity_id
                  left join rms_capacity rc on oic.capacity_id=rc.capacity_id
+                 left join RMS_MATERIAL_TYPE RMT on adn.MATERIAL_TYPE_ID =  RMT.MATERIAL_TYPE_ID
                  left join (select * from tmsship_ship_location t where t.location_id in
                                                                         (SELECT
                                                                              t.location_id
@@ -63,7 +66,7 @@
                                                                          WHERE
                                                                              rn = 1)) tsl on tsl.total_result_id=ttr.result_id
         where ttr.ship_status = 0 and tsl.LOCATION_STATUS is not null and tlsr.DELETED=0
-        and actr.DELETED =0 and adn.DELETED=0 and oic.DELETED=0
+        and  adn.DELETED=0 and oic.DELETED=0
     </select>
     <select id="selectByshipName" resultType="java.util.Map" parameterType="java.util.Map">
         select sd.GM_TONNAGE as "tonnage",

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

@@ -611,7 +611,7 @@
         adn.NOTICE_DELIVERY_TIME as "noticeTime",
         rm.MATERIAL_NAME as "materialName",
         db.RESULT_FOREIGN_SHIP_NAME as "foreignShipName",
-        actr.RESULT_NUMBER_OF_LOANS as "amount",
+        adn.RESULT_NUMBER_OF_LOANS as "amount",
         rrmr.GM_TONNAGE as "portAmount",
         rc.CAPACITY_NUMBER as "capacityName",
         oic.INSTRUCTION_PLANNED_LOADING as "planWeight",
@@ -623,7 +623,8 @@
         rpe.PORT_NAME as "arrivePortName",
         tlsr.RESULT_LOAD_SHIP_DATE as "loadTime",
         tlsr.RESULT_ISCLEAR as "isClear",
-        tlsr.INSERT_UPDATE_REMARK as "memo"
+        tlsr.INSERT_UPDATE_REMARK as "memo",
+        DBI.INFACTORY_SHIP_NAME "infactoryShipName"
         FROM TMSSHIP_LOAD_SHIP_RESULT tlsr
         LEFT JOIN TMSSHIP_TOTAL_RESULT ttr
         ON tlsr.TOTAL_RESULT_ID = ttr.RESULT_ID
@@ -633,8 +634,10 @@
         ON osi.SHIPMENT_INSTRUCTIONS_ID = oic.INSTRUCTIONS_ID
         LEFT JOIN RMS_CAPACITY rc
         ON rc.CAPACITY_ID = oic.CAPACITY_ID
+        LEFT JOIN DIL_BATCH_INFACOTRY DBI
+        ON DBI.BATCH_INFACOTRY_ID=osi.BATCH_ID
         LEFT JOIN DIL_BATCH db
-        ON tlsr.BATCH_ID = db.BATCH_ID
+        ON DBI.BATCH_ID = db.BATCH_ID
         LEFT JOIN RMS_MATERIAL rm
         ON db.MATERIAL_ID = rm.MATERIAL_ID
         LEFT JOIN AMSSHIP_DELIVERY_ATTORNEY ada
@@ -643,8 +646,6 @@
         ON ada.BATCH_ID = adn.BATCH_ID
         LEFT JOIN RMS_PORT rp
         ON rp.PORT_ID = adn.PORT_ID
-        LEFT JOIN AMSSHIP_CARGO_TRANSFER_RESULT actr
-        ON adn.BATCH_ID = actr.BATCH_ID
         LEFT JOIN WMSH_GRID_MATERIAL rrmr
         ON tlsr.RWAREHOUSE_MATERIAL_ID = rrmr.GM_ID
         LEFT JOIN TMSSHIP_SHIP_LOCATION tsl
@@ -655,7 +656,7 @@
         ON ada.DOWN_SWIM_PORT_ID = rps.PORT_ID
         LEFT JOIN RMS_PORT rpe
         ON ada.PORT_ID = rpe.PORT_ID
-        WHERE tlsr.DELETED = 0 AND actr.DELETED=0 AND adn.DELETED=0
+        WHERE tlsr.DELETED = 0  AND adn.DELETED=0
             AND ADA.DELETED=0 )
         <where>
             <if test="noticePort != null">
@@ -776,16 +777,26 @@
 
     <select id="selectLoadShip" parameterType="DECIMAL" resultType="java.util.Map">
         SELECT
-               BATCH_ID                    "batchId",
-               RESULT_DELIVERY_DATE        "resultDeliveryDate",
-               RESULT_ACTUAL_INSTALLATIONS "resultActualInstallations",
-               RWAREHOUSE_MATERIAL_ID      "rwarehouseMaterialId",
-               RESULT_ARRIVAL_PORT_TIME    "resultArrivalPortTime",
-               RESULT_OUT_PORT_TIME        "resultOutPortTime",
-               RESULT_LOAD_SHIP_DATE       "resultLoadShipDate",
-               RESULT_ISCLEAR              "resultIsClear"
-        FROM TMSSHIP_LOAD_SHIP_RESULT
-        WHERE RESULT_ID = #{resultId}
+               TLSR.BATCH_ID                    "batchId",
+               TLSR.RESULT_DELIVERY_DATE        "resultDeliveryDate",
+               TLSR.RESULT_ACTUAL_INSTALLATIONS "resultActualInstallations",
+               TLSR.RWAREHOUSE_MATERIAL_ID      "rwarehouseMaterialId",
+               TLSR.RESULT_ARRIVAL_PORT_TIME    "resultArrivalPortTime",
+               TLSR.RESULT_OUT_PORT_TIME        "resultOutPortTime",
+               TLSR.RESULT_LOAD_SHIP_DATE       "resultLoadShipDate",
+               TLSR.RESULT_ISCLEAR              "resultIsClear",
+               TWQR.RESULT_ES_DELIVERY_DATE    "planDeliveryDate",
+               TWQR.RESULT_PLANNED_DATE "planDate",
+               TWQR.RESULT_EMPTY_HEAVY_WATER_METER "resultHeavyWeight",
+               TWQR.RESULT_ID "waterQualiyResultId",
+               TOWR.RESULT_ID "outWharyResultId",
+               TOWR.RESULT_OUT_WHARY_NAME "resultOutPortName"
+        FROM TMSSHIP_LOAD_SHIP_RESULT TLSR
+        left join TMSSHIP_WATER_QUALITY_RESULT TWQR
+        ON TLSR.TOTAL_RESULT_ID=TWQR.TOTAL_RESULT_ID
+        left join TMSSHIP_OUT_WHARY_RESULT TOWR
+        ON TOWR.TOTAL_RESULT_ID=TLSR.TOTAL_RESULT_ID
+        WHERE TLSR.RESULT_ID = #{resultId}
     </select>
 
     <!-- 通过外轮船名和物资名称得到批次id -->
@@ -800,16 +811,14 @@
 
     <!-- 得到码头和港口 -->
     <select id="getPortAndPier" parameterType="DECIMAL" resultType="java.util.Map">
-        SELECT ADN.PORT_ID              AS "startPortId",
+        SELECT DISTINCT ADN.PORT_ID              AS "startPortId",
                ADA.DOWN_SWIM_PORT_ID    AS "arrivePortId",
-               ACTR.GROUP_ID            AS "pierId",
+               ADN.GROUP_ID            AS "pierId",
                ADN.NOTICE_DELIVERY_TIME AS "noticeDeliveryTime"
         FROM AMSSHIP_DELIVERY_NOTICE ADN
                  LEFT JOIN AMSSHIP_DELIVERY_ATTORNEY ADA
                            ON ADA.BATCH_ID = ADN.BATCH_ID
-                 LEFT JOIN AMSSHIP_CARGO_TRANSFER_RESULT ACTR
-                           ON ACTR.BATCH_ID = ADN.BATCH_ID
-        WHERE ADA.BATCH_ID = #{batchId}
+        WHERE ADA.BATCH_ID = #{batchInfactoryId}
     </select>
 
 <!-- 通过港口查询港存库实时库存id  -->
@@ -817,8 +826,6 @@
         select WGM.GM_ID "gmId",
                WGM.GM_TONNAGE "tonnage"
         from WMSH_GRID_MATERIAL WGM
-        left join AMSSHIP_DELIVERY_ATTORNEY ADA
-        on ADA.BATCH_ID=WGM.BATCH_ID
-        WHERE WGM.BATCH_ID=#{batchId} and ADA.DOWN_SWIM_PORT_ID=#{downSwimPortId}
+        WHERE WGM.BATCH_ID=#{batchInfactoryId} and WGM.PORT_ID=#{downSwimPortId}
     </select>
 </mapper>

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

@@ -527,37 +527,36 @@
 
 
     <select id="getCapacity" resultType="java.util.Map">
-        SELECT * FROM(
-        SELECT db.RESULT_FOREIGN_SHIP_NAME as "resultForeignShipName",
-        rm.MATERIAL_NAME as "materialName",
-        rc.CAPACITY_NUMBER as "capacityNumber",
-        oic.INSTRUCTIONS_CAPACITY_ID as "orderId",
-        db.BATCH_ID as "batchId",
-        ada.DOWN_SWIM_PORT_ID as "downSwimPortId",
-        rp1.PORT_NAME as "portName1",
-        ada.PORT_ID as "portId",
-        rp2.PORT_NAME as "portName2",
+        SELECT
+        *
+        FROM
+        (
+        SELECT
+        db.RESULT_FOREIGN_SHIP_NAME AS "resultForeignShipName",
+        rm.MATERIAL_NAME AS "materialName",
+        rc.CAPACITY_NUMBER AS "capacityNumber",
+        oic.INSTRUCTIONS_CAPACITY_ID AS "orderId",
+        DBI.BATCH_INFACOTRY_ID AS "batchInfactoryId",
+        ada.DOWN_SWIM_PORT_ID AS "downSwimPortId",
+        rp1.PORT_NAME AS "portName1",
+        ada.PORT_ID AS "portId",
+        rp2.PORT_NAME AS "portName2",
         oic.INSTRUCTIONS_SHIP_POSITION "instructionsShipPosition"
-        FROM OMSSHIP_INSTRUCTIONS_CAPACITY oic
-        LEFT JOIN OMSSHIP_SHIPMENT_INSTRUCTIONS osi
-        ON oic.INSTRUCTIONS_ID = osi.SHIPMENT_INSTRUCTIONS_ID
-        left join AMSSHIP_CARGO_TRANSFER_RESULT ACTR
-        ON ACTR.BATCH_ID=osi.BATCH_ID
-        LEFT JOIN DIL_BATCH db
-        ON db.BATCH_ID = osi.BATCH_ID
-        LEFT JOIN AMSSHIP_DELIVERY_ATTORNEY ada
-        ON ada.BATCH_ID=db.BATCH_ID
-        LEFT JOIN RMS_PORT rp1
-        ON ada.DOWN_SWIM_PORT_ID=rp1.PORT_ID
-        LEFT JOIN RMS_PORT rp2
-        ON ada.PORT_ID=rp2.PORT_ID
-        LEFT JOIN RMS_MATERIAL rm
-        ON rm.MATERIAL_ID = db.MATERIAL_ID
-        LEFT JOIN RMS_CAPACITY rc
-        ON rc.CAPACITY_ID = oic.CAPACITY_ID
-        where osi.DELETED=0  AND OIC.DELETED=0 AND ADA.DELETED=0
-            AND ACTR.DELETED=0
-            )
+        FROM
+        OMSSHIP_INSTRUCTIONS_CAPACITY oic
+        LEFT JOIN OMSSHIP_SHIPMENT_INSTRUCTIONS osi ON oic.INSTRUCTIONS_ID = osi.SHIPMENT_INSTRUCTIONS_ID
+        LEFT JOIN DIL_BATCH_INFACOTRY DBI ON DBI.BATCH_INFACOTRY_ID = osi.BATCH_ID
+        LEFT JOIN DIL_BATCH db ON db.BATCH_ID = DBI.BATCH_ID
+        LEFT JOIN AMSSHIP_DELIVERY_ATTORNEY ada ON ada.BATCH_ID = DBI.BATCH_INFACOTRY_ID
+        LEFT JOIN RMS_PORT rp1 ON ada.DOWN_SWIM_PORT_ID = rp1.PORT_ID
+        LEFT JOIN RMS_PORT rp2 ON ada.PORT_ID = rp2.PORT_ID
+        LEFT JOIN RMS_MATERIAL rm ON rm.MATERIAL_ID = db.MATERIAL_ID
+        LEFT JOIN RMS_CAPACITY rc ON rc.CAPACITY_ID = oic.CAPACITY_ID
+        WHERE
+        osi.DELETED = 0
+        AND OIC.DELETED = 0
+        AND ADA.DELETED = 0
+        )
         <where>
             <if test="resultForeignShipName != null">
                 and

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

@@ -2,47 +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.TmsshipWaterQualityResultMapper">
     <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.TmsshipWaterQualityResult">
-        <id column="RESULT_ID" jdbcType="DECIMAL" property="resultId"/>
-        <result column="TOTAL_RESULT_ID" jdbcType="DECIMAL" property="totalResultId"/>
-        <result column="RESULT_PLANNED_DATE" jdbcType="TIMESTAMP" property="resultPlannedDate"/>
-        <result column="RESULT_CARGO_RIGHTS_DATE" jdbcType="TIMESTAMP" property="resultCargoRightsDate"/>
-        <result column="RESULT_SHIPMENT_RATIO" jdbcType="DECIMAL" property="resultShipmentRatio"/>
-        <result column="RESULT_EMPTY_HEAVY_WATER_METER" jdbcType="DECIMAL" property="resultEmptyHeavyWaterMeter"/>
-        <result column="RESULT_MOISTURE_CONTENT" jdbcType="DECIMAL" property="resultMoistureContent"/>
-        <result column="RESULT_WATER_TONNAGE" jdbcType="DECIMAL" property="resultWaterTonnage"/>
-        <result column="RESULT_INSPECTION_FEES" jdbcType="DECIMAL" property="resultInspectionFees"/>
-        <result column="DELETE_NAME" jdbcType="VARCHAR" property="deleteName"/>
-        <result column="DELETE_TIME" jdbcType="VARCHAR" property="deleteTime"/>
-        <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="RESULT_ES_DELIVERY_DATE" jdbcType="TIMESTAMP" property="resultEsDeliveryDate"/>
-        <result column="DELETED" jdbcType="DECIMAL" property="deleted"/>
+        <id column="RESULT_ID" jdbcType="DECIMAL" property="resultId" />
+        <result column="TOTAL_RESULT_ID" jdbcType="DECIMAL" property="totalResultId" />
+        <result column="RESULT_PLANNED_DATE" jdbcType="TIMESTAMP" property="resultPlannedDate" />
+        <result column="RESULT_CARGO_RIGHTS_DATE" jdbcType="TIMESTAMP" property="resultCargoRightsDate" />
+        <result column="RESULT_SHIPMENT_RATIO" jdbcType="DECIMAL" property="resultShipmentRatio" />
+        <result column="RESULT_EMPTY_HEAVY_WATER_METER" jdbcType="VARCHAR" property="resultEmptyHeavyWaterMeter" />
+        <result column="RESULT_MOISTURE_CONTENT" jdbcType="DECIMAL" property="resultMoistureContent" />
+        <result column="RESULT_WATER_TONNAGE" jdbcType="DECIMAL" property="resultWaterTonnage" />
+        <result column="RESULT_INSPECTION_FEES" jdbcType="DECIMAL" property="resultInspectionFees" />
+        <result column="DELETE_NAME" jdbcType="VARCHAR" property="deleteName" />
+        <result column="DELETE_TIME" jdbcType="VARCHAR" property="deleteTime" />
+        <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="RESULT_ES_DELIVERY_DATE" jdbcType="TIMESTAMP" property="resultEsDeliveryDate" />
+        <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
+        <result column="WATER_UNIT_PRICE" jdbcType="DECIMAL" property="waterUnitPrice" />
+        <result column="IS_NEED_ASSEMBLE" jdbcType="VARCHAR" property="isNeedAssemble" />
     </resultMap>
     <sql id="columns">
         RESULT_ID, TOTAL_RESULT_ID, RESULT_PLANNED_DATE, RESULT_CARGO_RIGHTS_DATE, RESULT_SHIPMENT_RATIO,
     RESULT_EMPTY_HEAVY_WATER_METER, RESULT_MOISTURE_CONTENT, RESULT_WATER_TONNAGE, RESULT_INSPECTION_FEES,
     DELETE_NAME, DELETE_TIME, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
-    INSERT_UPDATE_REMARK, RESULT_ES_DELIVERY_DATE, DELETED
+    INSERT_UPDATE_REMARK, RESULT_ES_DELIVERY_DATE, DELETED, WATER_UNIT_PRICE, IS_NEED_ASSEMBLE
     </sql>
     <sql id="columns_alias">
         t.RESULT_ID, t.TOTAL_RESULT_ID, t.RESULT_PLANNED_DATE, t.RESULT_CARGO_RIGHTS_DATE,
     t.RESULT_SHIPMENT_RATIO, t.RESULT_EMPTY_HEAVY_WATER_METER, t.RESULT_MOISTURE_CONTENT,
     t.RESULT_WATER_TONNAGE, t.RESULT_INSPECTION_FEES, t.DELETE_NAME, t.DELETE_TIME, t.INSERT_USERNAME,
     t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.RESULT_ES_DELIVERY_DATE,
-    t.DELETED
+    t.DELETED, t.WATER_UNIT_PRICE, t.IS_NEED_ASSEMBLE
     </sql>
     <sql id="select">
-        SELECT
-        <include refid="columns"/>
-        FROM TMSSHIP_WATER_QUALITY_RESULT
+        SELECT <include refid="columns" /> FROM TMSSHIP_WATER_QUALITY_RESULT
     </sql>
     <sql id="select_alias">
-        SELECT
-        <include refid="columns_alias"/>
-        FROM TMSSHIP_WATER_QUALITY_RESULT t
+        SELECT <include refid="columns_alias" /> FROM TMSSHIP_WATER_QUALITY_RESULT t
     </sql>
     <sql id="where">
         <where>
@@ -61,7 +59,7 @@
             <if test="resultShipmentRatio != null">
                 and RESULT_SHIPMENT_RATIO = #{resultShipmentRatio}
             </if>
-            <if test="resultEmptyHeavyWaterMeter != null">
+            <if test="resultEmptyHeavyWaterMeter != null and resultEmptyHeavyWaterMeter != ''">
                 and RESULT_EMPTY_HEAVY_WATER_METER = #{resultEmptyHeavyWaterMeter}
             </if>
             <if test="resultMoistureContent != null">
@@ -100,6 +98,12 @@
             <if test="deleted != null">
                 and DELETED = #{deleted}
             </if>
+            <if test="waterUnitPrice != null">
+                and WATER_UNIT_PRICE = #{waterUnitPrice}
+            </if>
+            <if test="isNeedAssemble != null and isNeedAssemble != ''">
+                and IS_NEED_ASSEMBLE = #{isNeedAssemble}
+            </if>
         </where>
     </sql>
     <sql id="whereLike">
@@ -119,8 +123,8 @@
             <if test="resultShipmentRatio != null">
                 and RESULT_SHIPMENT_RATIO = #{resultShipmentRatio}
             </if>
-            <if test="resultEmptyHeavyWaterMeter != null">
-                and RESULT_EMPTY_HEAVY_WATER_METER = #{resultEmptyHeavyWaterMeter}
+            <if test="resultEmptyHeavyWaterMeter != null and resultEmptyHeavyWaterMeter != ''">
+                and RESULT_EMPTY_HEAVY_WATER_METER LIKE '%${resultEmptyHeavyWaterMeter}%'
             </if>
             <if test="resultMoistureContent != null">
                 and RESULT_MOISTURE_CONTENT = #{resultMoistureContent}
@@ -158,11 +162,16 @@
             <if test="deleted != null">
                 and DELETED = #{deleted}
             </if>
+            <if test="waterUnitPrice != null">
+                and WATER_UNIT_PRICE = #{waterUnitPrice}
+            </if>
+            <if test="isNeedAssemble != null and isNeedAssemble != ''">
+                and IS_NEED_ASSEMBLE LIKE '%${isNeedAssemble}%'
+            </if>
         </where>
     </sql>
-    <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-        delete
-        from TMSSHIP_WATER_QUALITY_RESULT
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+        delete from TMSSHIP_WATER_QUALITY_RESULT
         where RESULT_ID = #{resultId,jdbcType=DECIMAL}
     </delete>
     <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
@@ -180,7 +189,7 @@
         <if test="resultShipmentRatio != null">
             or RESULT_SHIPMENT_RATIO = #{resultShipmentRatio}
         </if>
-        <if test="resultEmptyHeavyWaterMeter != null">
+        <if test="resultEmptyHeavyWaterMeter != null and resultEmptyHeavyWaterMeter != ''">
             or RESULT_EMPTY_HEAVY_WATER_METER = #{resultEmptyHeavyWaterMeter}
         </if>
         <if test="resultMoistureContent != null">
@@ -219,6 +228,12 @@
         <if test="deleted != null">
             or DELETED = #{deleted}
         </if>
+        <if test="waterUnitPrice != null">
+            or WATER_UNIT_PRICE = #{waterUnitPrice}
+        </if>
+        <if test="isNeedAssemble != null and isNeedAssemble != ''">
+            or IS_NEED_ASSEMBLE = #{isNeedAssemble}
+        </if>
     </delete>
     <insert id="insert" parameterType="com.steerinfo.dil.model.TmsshipWaterQualityResult">
         insert into TMSSHIP_WATER_QUALITY_RESULT (RESULT_ID, TOTAL_RESULT_ID, RESULT_PLANNED_DATE,
@@ -228,16 +243,17 @@
                                                   DELETE_NAME, DELETE_TIME, INSERT_USERNAME,
                                                   INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
                                                   INSERT_UPDATE_REMARK, RESULT_ES_DELIVERY_DATE,
-                                                  DELETED)
-        values (#{resultId,jdbcType=DECIMAL}, #{totalResultId,jdbcType=DECIMAL},
-                #{resultPlannedDate,jdbcType=TIMESTAMP},
+                                                  DELETED, WATER_UNIT_PRICE, IS_NEED_ASSEMBLE
+        )
+        values (#{resultId,jdbcType=DECIMAL}, #{totalResultId,jdbcType=DECIMAL}, #{resultPlannedDate,jdbcType=TIMESTAMP},
                 #{resultCargoRightsDate,jdbcType=TIMESTAMP}, #{resultShipmentRatio,jdbcType=DECIMAL},
-                #{resultEmptyHeavyWaterMeter,jdbcType=DECIMAL}, #{resultMoistureContent,jdbcType=DECIMAL},
+                #{resultEmptyHeavyWaterMeter,jdbcType=VARCHAR}, #{resultMoistureContent,jdbcType=DECIMAL},
                 #{resultWaterTonnage,jdbcType=DECIMAL}, #{resultInspectionFees,jdbcType=DECIMAL},
                 #{deleteName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR},
                 #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
                 #{insertUpdateRemark,jdbcType=VARCHAR}, #{resultEsDeliveryDate,jdbcType=TIMESTAMP},
-                #{deleted,jdbcType=DECIMAL})
+                #{deleted,jdbcType=DECIMAL}, #{waterUnitPrice,jdbcType=DECIMAL}, #{isNeedAssemble,jdbcType=VARCHAR}
+               )
     </insert>
     <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmsshipWaterQualityResult">
         insert into TMSSHIP_WATER_QUALITY_RESULT
@@ -296,6 +312,12 @@
             <if test="deleted != null">
                 DELETED,
             </if>
+            <if test="waterUnitPrice != null">
+                WATER_UNIT_PRICE,
+            </if>
+            <if test="isNeedAssemble != null">
+                IS_NEED_ASSEMBLE,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="resultId != null">
@@ -314,7 +336,7 @@
                 #{resultShipmentRatio,jdbcType=DECIMAL},
             </if>
             <if test="resultEmptyHeavyWaterMeter != null">
-                #{resultEmptyHeavyWaterMeter,jdbcType=DECIMAL},
+                #{resultEmptyHeavyWaterMeter,jdbcType=VARCHAR},
             </if>
             <if test="resultMoistureContent != null">
                 #{resultMoistureContent,jdbcType=DECIMAL},
@@ -352,27 +374,35 @@
             <if test="deleted != null">
                 #{deleted,jdbcType=DECIMAL},
             </if>
+            <if test="waterUnitPrice != null">
+                #{waterUnitPrice,jdbcType=DECIMAL},
+            </if>
+            <if test="isNeedAssemble != null">
+                #{isNeedAssemble,jdbcType=VARCHAR},
+            </if>
         </trim>
     </insert>
     <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmsshipWaterQualityResult">
         update TMSSHIP_WATER_QUALITY_RESULT
-        set TOTAL_RESULT_ID                = #{totalResultId,jdbcType=DECIMAL},
-            RESULT_PLANNED_DATE            = #{resultPlannedDate,jdbcType=TIMESTAMP},
-            RESULT_CARGO_RIGHTS_DATE       = #{resultCargoRightsDate,jdbcType=TIMESTAMP},
-            RESULT_SHIPMENT_RATIO          = #{resultShipmentRatio,jdbcType=DECIMAL},
-            RESULT_EMPTY_HEAVY_WATER_METER = #{resultEmptyHeavyWaterMeter,jdbcType=DECIMAL},
-            RESULT_MOISTURE_CONTENT        = #{resultMoistureContent,jdbcType=DECIMAL},
-            RESULT_WATER_TONNAGE           = #{resultWaterTonnage,jdbcType=DECIMAL},
-            RESULT_INSPECTION_FEES         = #{resultInspectionFees,jdbcType=DECIMAL},
-            DELETE_NAME                    = #{deleteName,jdbcType=VARCHAR},
-            DELETE_TIME                    = #{deleteTime,jdbcType=VARCHAR},
-            INSERT_USERNAME                = #{insertUsername,jdbcType=VARCHAR},
-            INSERT_TIME                    = #{insertTime,jdbcType=TIMESTAMP},
-            UPDATE_USERNAME                = #{updateUsername,jdbcType=VARCHAR},
-            UPDATE_TIME                    = #{updateTime,jdbcType=TIMESTAMP},
-            INSERT_UPDATE_REMARK           = #{insertUpdateRemark,jdbcType=VARCHAR},
-            RESULT_ES_DELIVERY_DATE        = #{resultEsDeliveryDate,jdbcType=TIMESTAMP},
-            DELETED                        = #{deleted,jdbcType=DECIMAL}
+        set TOTAL_RESULT_ID = #{totalResultId,jdbcType=DECIMAL},
+            RESULT_PLANNED_DATE = #{resultPlannedDate,jdbcType=TIMESTAMP},
+            RESULT_CARGO_RIGHTS_DATE = #{resultCargoRightsDate,jdbcType=TIMESTAMP},
+            RESULT_SHIPMENT_RATIO = #{resultShipmentRatio,jdbcType=DECIMAL},
+            RESULT_EMPTY_HEAVY_WATER_METER = #{resultEmptyHeavyWaterMeter,jdbcType=VARCHAR},
+            RESULT_MOISTURE_CONTENT = #{resultMoistureContent,jdbcType=DECIMAL},
+            RESULT_WATER_TONNAGE = #{resultWaterTonnage,jdbcType=DECIMAL},
+            RESULT_INSPECTION_FEES = #{resultInspectionFees,jdbcType=DECIMAL},
+            DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
+            DELETE_TIME = #{deleteTime,jdbcType=VARCHAR},
+            INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+            INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+            UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+            UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+            INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+            RESULT_ES_DELIVERY_DATE = #{resultEsDeliveryDate,jdbcType=TIMESTAMP},
+            DELETED = #{deleted,jdbcType=DECIMAL},
+            WATER_UNIT_PRICE = #{waterUnitPrice,jdbcType=DECIMAL},
+            IS_NEED_ASSEMBLE = #{isNeedAssemble,jdbcType=VARCHAR}
         where RESULT_ID = #{resultId,jdbcType=DECIMAL}
     </update>
     <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmsshipWaterQualityResult">
@@ -391,7 +421,7 @@
                 RESULT_SHIPMENT_RATIO = #{resultShipmentRatio,jdbcType=DECIMAL},
             </if>
             <if test="resultEmptyHeavyWaterMeter != null">
-                RESULT_EMPTY_HEAVY_WATER_METER = #{resultEmptyHeavyWaterMeter,jdbcType=DECIMAL},
+                RESULT_EMPTY_HEAVY_WATER_METER = #{resultEmptyHeavyWaterMeter,jdbcType=VARCHAR},
             </if>
             <if test="resultMoistureContent != null">
                 RESULT_MOISTURE_CONTENT = #{resultMoistureContent,jdbcType=DECIMAL},
@@ -429,20 +459,26 @@
             <if test="deleted != null">
                 DELETED = #{deleted,jdbcType=DECIMAL},
             </if>
+            <if test="waterUnitPrice != null">
+                WATER_UNIT_PRICE = #{waterUnitPrice,jdbcType=DECIMAL},
+            </if>
+            <if test="isNeedAssemble != null">
+                IS_NEED_ASSEMBLE = #{isNeedAssemble,jdbcType=VARCHAR},
+            </if>
         </set>
         where RESULT_ID = #{resultId,jdbcType=DECIMAL}
     </update>
-    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-        <include refid="select"/>
+    <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"/>
+        <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 TMSSHIP_WATER_QUALITY_RESULT
@@ -454,20 +490,21 @@
         DELETE_NAME, DELETE_TIME, INSERT_USERNAME,
         INSERT_TIME, UPDATE_USERNAME,
         UPDATE_TIME, INSERT_UPDATE_REMARK,
-        RESULT_ES_DELIVERY_DATE, DELETED
+        RESULT_ES_DELIVERY_DATE, DELETED,
+        WATER_UNIT_PRICE, IS_NEED_ASSEMBLE
         )
         ( <foreach collection="list" item="item" separator="union all">
         select
         #{item.resultId,jdbcType=DECIMAL},
         #{item.totalResultId,jdbcType=DECIMAL}, #{item.resultPlannedDate,jdbcType=TIMESTAMP},
         #{item.resultCargoRightsDate,jdbcType=TIMESTAMP}, #{item.resultShipmentRatio,jdbcType=DECIMAL},
-        #{item.resultEmptyHeavyWaterMeter,jdbcType=DECIMAL}, #{item.resultMoistureContent,jdbcType=DECIMAL},
+        #{item.resultEmptyHeavyWaterMeter,jdbcType=VARCHAR}, #{item.resultMoistureContent,jdbcType=DECIMAL},
         #{item.resultWaterTonnage,jdbcType=DECIMAL}, #{item.resultInspectionFees,jdbcType=DECIMAL},
-        #{item.deleteName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=VARCHAR},
-        #{item.insertUsername,jdbcType=VARCHAR},
+        #{item.deleteName,jdbcType=VARCHAR}, #{item.deleteTime,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR},
         #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
         #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
-        #{item.resultEsDeliveryDate,jdbcType=TIMESTAMP}, #{item.deleted,jdbcType=DECIMAL}
+        #{item.resultEsDeliveryDate,jdbcType=TIMESTAMP}, #{item.deleted,jdbcType=DECIMAL},
+        #{item.waterUnitPrice,jdbcType=DECIMAL}, #{item.isNeedAssemble,jdbcType=VARCHAR}
         from dual
     </foreach> )
     </insert>
@@ -475,86 +512,94 @@
         update TMSSHIP_WATER_QUALITY_RESULT
         set
         RESULT_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <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>
         ,TOTAL_RESULT_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
             when #{item.resultId,jdbcType=DECIMAL} then #{item.totalResultId,jdbcType=DECIMAL}
         </foreach>
         ,RESULT_PLANNED_DATE=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
             when #{item.resultId,jdbcType=DECIMAL} then #{item.resultPlannedDate,jdbcType=TIMESTAMP}
         </foreach>
         ,RESULT_CARGO_RIGHTS_DATE=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
             when #{item.resultId,jdbcType=DECIMAL} then #{item.resultCargoRightsDate,jdbcType=TIMESTAMP}
         </foreach>
         ,RESULT_SHIPMENT_RATIO=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
             when #{item.resultId,jdbcType=DECIMAL} then #{item.resultShipmentRatio,jdbcType=DECIMAL}
         </foreach>
         ,RESULT_EMPTY_HEAVY_WATER_METER=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
-            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultEmptyHeavyWaterMeter,jdbcType=DECIMAL}
+        <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.resultEmptyHeavyWaterMeter,jdbcType=VARCHAR}
         </foreach>
         ,RESULT_MOISTURE_CONTENT=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
             when #{item.resultId,jdbcType=DECIMAL} then #{item.resultMoistureContent,jdbcType=DECIMAL}
         </foreach>
         ,RESULT_WATER_TONNAGE=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
             when #{item.resultId,jdbcType=DECIMAL} then #{item.resultWaterTonnage,jdbcType=DECIMAL}
         </foreach>
         ,RESULT_INSPECTION_FEES=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
             when #{item.resultId,jdbcType=DECIMAL} then #{item.resultInspectionFees,jdbcType=DECIMAL}
         </foreach>
         ,DELETE_NAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <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 collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
             when #{item.resultId,jdbcType=DECIMAL} then #{item.deleteTime,jdbcType=VARCHAR}
         </foreach>
         ,INSERT_USERNAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <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 collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <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 collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <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 collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <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 collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <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>
         ,RESULT_ES_DELIVERY_DATE=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
             when #{item.resultId,jdbcType=DECIMAL} then #{item.resultEsDeliveryDate,jdbcType=TIMESTAMP}
         </foreach>
         ,DELETED=
-        <foreach collection="list" item="item" index="index" separator=" " open="case RESULT_ID" close="end">
+        <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
             when #{item.resultId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
         </foreach>
+        ,WATER_UNIT_PRICE=
+        <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.waterUnitPrice,jdbcType=DECIMAL}
+        </foreach>
+        ,IS_NEED_ASSEMBLE=
+        <foreach close="end" collection="list" index="index" item="item" open="case RESULT_ID" separator=" ">
+            when #{item.resultId,jdbcType=DECIMAL} then #{item.isNeedAssemble,jdbcType=VARCHAR}
+        </foreach>
         where RESULT_ID in
-        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+        <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 TMSSHIP_WATER_QUALITY_RESULT
         where RESULT_ID in
-        <foreach collection="list" item="id" open="(" close=")" separator=",">
+        <foreach close=")" collection="list" item="id" open="(" separator=",">
             #{id}
         </foreach>
     </delete>
@@ -622,8 +667,8 @@
         LEFT JOIN AMSSHIP_CARGO_TRANSFER_RESULT actr
         ON actr.BATCH_ID=db.BATCH_ID
         WHERE twqr.DELETED = 0 and tlsr.DELETED=0 and ada.DELETED=0 and
-              adn.DELETED=0 and actr.DELETED=0 and osi.DELETED=0
-             and oic.DELETED=0)
+        adn.DELETED=0 and actr.DELETED=0 and osi.DELETED=0
+        and oic.DELETED=0)
         <where>
             <if test="materialName != null">
                 and
@@ -762,18 +807,18 @@
     <select id="getPurchaseContractMoisture" parameterType="DECIMAL" resultType="java.lang.String">
         SELECT
             ADN.PURCHASE_CONTRACT_MOISTURE AS "purchaseContractMoisture"
-            FROM DIL_BATCH DB
-        LEFT JOIN AMSSHIP_DELIVERY_NOTICE ADN
-          ON DB.BATCH_ID=ADN.BATCH_ID
-       WHERE DB.BATCH_ID=#{batchId}
+        FROM DIL_BATCH_INFACOTRY DBI
+                 LEFT JOIN AMSSHIP_DELIVERY_NOTICE ADN
+                           ON DBI.BATCH_INFACOTRY_ID=ADN.BATCH_ID
+        WHERE DBI.BATCH_INFACOTRY_ID=#{batchInfactoryId}
     </select>
 
     <select id="getResultActualInstallations" parameterType="DECIMAL" resultType="java.util.Map">
         SELECT
             TLSR.RESULT_ACTUAL_INSTALLATIONS AS "resultActualInstallations"
         FROM DIL_BATCH DB
-        LEFT JOIN TMSSHIP_LOAD_SHIP_RESULT TLSR
-        ON DB.BATCH_ID=TLSR.BATCH_ID
+                 LEFT JOIN TMSSHIP_LOAD_SHIP_RESULT TLSR
+                           ON DB.BATCH_ID=TLSR.BATCH_ID
         WHERE DB.BATCH_ID=#{batchId}
     </select>
 </mapper>