修改采购船运

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

@@ -93,9 +93,7 @@ public class AmsshipDeliveryAttorneyController extends BaseRESTfulController {
         List<Map<String,Object>> amsshipDeliveryAttorney =amsshipDeliveryAttorneyService.getDeliveryAttorneyId(attorneyId);
         return success(amsshipDeliveryAttorney);
     }
-
-
-
+    
 
     //删除
     @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")

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

@@ -47,16 +47,20 @@ public class OmsshipShipmentInstructionsController extends BaseRESTfulController
     ColumnDataUtil columnDataUtil;
     @Autowired
     ESFeign esFeign;
+
     /**
      * 新增
-     * @param omsshipShipmentInstructions
+     * @param map
      * @return
      */
     @ApiOperation(value="新增", notes="根据OmsshipShipmentInstructions对象创建")
-    @ApiImplicitParam(name = "omsshipShipmentInstructions", value = "详细实体omsshipShipmentInstructions", required = true, dataType = "OmsshipShipmentInstructions", paramType = "java.util.Map")
+    @ApiImplicitParam(name = "omsshipShipmentInstructions", value = "map", required = true, dataType = "map", paramType = "java.util.Map")
     @PostMapping(value = "/addShipmentInstructions")
-    public RESTfulResult addShipmentInstructions(@RequestBody OmsshipShipmentInstructions omsshipShipmentInstructions){
-        int code=omsshipShipmentInstructionsService.insert(omsshipShipmentInstructions);
+    public RESTfulResult addShipmentInstructions(@RequestBody Map<String,Object> map){
+        int code=omsshipShipmentInstructionsService.insert(map);
+        if (code!=1){
+            return failed("添加失败，请仔细核实信息是否正确");
+        }
         return success(code);
     }
 
@@ -65,7 +69,7 @@ public class OmsshipShipmentInstructionsController extends BaseRESTfulController
      * @param instructionsId
      * @return
      */
-    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiOperation(value="渲染信息", notes="根据url的id来获取详细信息")
     @ApiImplicitParam(paramType = "path", name = "instructionsId", value = "ID", required = true, dataType = "BigDecimal")
     @PostMapping(value = "/getShipmentInstructions/{instructionsId}")
     public RESTfulResult getShipmentInstructions(@PathVariable("instructionsId") BigDecimal instructionsId){
@@ -125,6 +129,7 @@ public class OmsshipShipmentInstructionsController extends BaseRESTfulController
         if (status!=null){
             mapVal.put("status",status);
         }
+
         List<Map<String, Object>> detailListTotal =  omsshipShipmentInstructionsService.selectAll(mapVal);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据

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

@@ -19,7 +19,7 @@ public class ShipDynamicsController extends BaseRESTfulController {
     ShipDynamicsServiceImpl iShipDynamicsService;
 
     @ApiOperation(value="查询所有的船舶动态信息")
-    @PostMapping("/selectAll")
+    @PostMapping("/selectAllShipDyna")
     public RESTfulResult selectAll() {
         //返回值mapList
         //获取视图里的所有外轮船名，物资名称

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

@@ -62,7 +62,7 @@ public class TmsshipShipLocationController extends BaseRESTfulController {
     })
     @PostMapping("/addShipLocation")
     public RESTfulResult addShipLocation(@RequestBody Map<String,Object> map) {
-        int code = tmsshipShipLocationService.addShipLocation(map);
+        int code = tmsshipShipLocationService.addShipLocationResult(map);
         return success(code);
     }
 

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

@@ -102,8 +102,6 @@ public class TmsshipTotalResultController extends BaseRESTfulController {
         List<Map<String, Object>> columnList = tmsshipTotalResultService.getCapacity(mapVal);
         PageListAdd data = columnDataUtil.tableColumnData(apiId, detailListTotal, columnList);
         return success(data);
-
-
     }
 
 

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

@@ -59,4 +59,6 @@ public interface TmsshipLoadShipResultMapper extends IBaseMapper<TmsshipLoadShip
 
     //根据港口名称获得港存库主键id
    Map<String,Object> selectGmIdByPortId(Map<String,Object> idMap);
+
+   //通过
 }

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

@@ -25,7 +25,7 @@ public class AmsshipDeliveryAttorney implements IBasePO<BigDecimal> {
      * 物流流向即到站港(PORT_ID,DECIMAL,0)
      */
     @ApiModelProperty(value="物流流向即到站港",required=false)
-    private Short portId;
+    private BigDecimal portId;
 
     /**
      * 提货单位（下游港口ID）(DOWN_SWIM_PORT_ID,DECIMAL,0)
@@ -135,11 +135,11 @@ public class AmsshipDeliveryAttorney implements IBasePO<BigDecimal> {
         this.batchId = batchId;
     }
 
-    public Short getPortId() {
+    public BigDecimal getPortId() {
         return portId;
     }
 
-    public void setPortId(Short portId) {
+    public void setPortId(BigDecimal portId) {
         this.portId = portId;
     }
 

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

@@ -27,12 +27,18 @@ public interface IOmsshipShipmentInstructionsService{
      * @return
      */
     List<Map<String,Object>> selectAll(Map<String,Object> mapVal);
-//    int selectKey(BigDecimal shipmentInstructionsId);
+
     int deleteByPrimaryKey(BigDecimal shipmentInstructionsId);
-    int insert(OmsshipShipmentInstructions omsshipShipmentInstructions);
+
+    //新增装船指令
+    int insert(Map<String,Object> map);
+
     int updateByPrimaryKey(OmsshipShipmentInstructions omsshipShipmentInstructions);
-    //   得到最大id
+
+    //得到最大id
     BigDecimal selectMaxId();
+
+    //渲染信息
     List<Map<String,Object>> selectShipmentInstructions(BigDecimal shipmentInstructionsId);
 
     /**
@@ -51,5 +57,6 @@ public interface IOmsshipShipmentInstructionsService{
     //获得港口名称
     List<Map<String,Object>> getPortList(Map<String,Object> map);
 
+    //执行更新
     int updateByPrimaryKeySelective(OmsshipShipmentInstructions omsshipShipmentInstructions);
 }

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

@@ -28,6 +28,9 @@ public interface ITmsshipShipLocationService{
      */
     BigDecimal selectMaxId();
 
+    //新增位置作业
+    int addShipLocationResult(Map<String,Object> map);
+
 
     /**
      * 根据主键删除

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

@@ -113,8 +113,9 @@ public class AmsshipCargoTransferResultServiceImpl implements IAmsshipCargoTrans
             amsshipCargoTransferResult.setResultTelephoneFax(resultTelephoneFax);
             //获取货代信息
             String resultFreightForwardingInfo = (String) map.get("resultFreightForwardingInfo");
-            amsshipCargoTransferResult.setResultFreightForwardingInfo(resultFreightForwardingInfo);
-
+            if (resultFreightForwardingInfo!=null) {
+                amsshipCargoTransferResult.setResultFreightForwardingInfo(resultFreightForwardingInfo);
+            }
            //获取收货人id
            Integer groupId = (Integer) map.get("groupId");
            if (groupId!=null) {
@@ -124,9 +125,11 @@ public class AmsshipCargoTransferResultServiceImpl implements IAmsshipCargoTrans
            //获取放货数量
            String resultNumberOfLoans1 = (String) map.get("resultNumberOfLoans");
            amsshipCargoTransferResult.setResultNumberOfLoans(new BigDecimal(resultNumberOfLoans1));
-            //获取备注
+            //获取备注.非必填
             String resultMemo = (String) map.get("resultMemo");
-            amsshipCargoTransferResult.setResultMemo(resultMemo);
+            if (resultMemo!=null) {
+                amsshipCargoTransferResult.setResultMemo(resultMemo);
+            }
             amsshipCargoTransferResult.setResultDateOfLoans(new Date());
             //设置常规字段
             amsshipCargoTransferResult.setInsertTime(new Date());

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

@@ -60,6 +60,7 @@ public class AmsshipDeliveryAttorneyServiceImpl implements IAmsshipDeliveryAttor
         long attorneyTime =(long) map.get("attorneyTime");
         amsshipDeliveryAttorney.setAttorneyTime(new Date(attorneyTime));
         amsshipDeliveryAttorney.setAttorneyPdffile((String) map.get("attorneyPdffile"));
+        amsshipDeliveryAttorney.setPortId(DataChange.dataToBigDecimal(map.get("portId")));
         amsshipDeliveryAttorney.setAttorneyPickupContactPerson((String) map.get("attorneyPickupContactPerson"));
         amsshipDeliveryAttorney.setAttorneyDistributionStatus((short) 0);
         amsshipDeliveryAttorney.setDownSwimPortId(DataChange.dataToBigDecimal(map.get("downSwimPortId")));

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

@@ -60,28 +60,28 @@ public class OmsshipInstructionsCapacityServiceImpl implements IOmsshipInstructi
     @Transactional
     @Override
     public int insert(Map<String,Object> omsshipInstructionsCapacity) {
-        //        插入装船指令
+        //插入装船指令
         OmsshipInstructionsCapacity realOmsshipInstructionsCapacity = new OmsshipInstructionsCapacity();
         String omsship= (String) omsshipInstructionsCapacity.get("capacityIds");
-//        判断是否有id值传入，有则代表表中含有这个船名
+       //判断是否有id值传入，有则代表表中含有这个船名
         if (omsship!=""){
             Integer capacityNumber = (Integer) omsshipInstructionsCapacity.get("capacityIds");
             realOmsshipInstructionsCapacity.setCapacityId(new BigDecimal(capacityNumber));
         }else{
-//            判断用户输入的船名在数据库中是否存在
+           //判断用户输入的船名在数据库中是否存在
             String capacityNumber=(String)omsshipInstructionsCapacity.get("capacityName");
             Map<String,Object> map = new HashMap<>();
             map.put("capacityNumber",capacityNumber);
-//            查询运力表中是否含有对应的运力编号
+           //查询运力表中是否含有对应的运力编号
             List<RmsCapacity> rmsCapacities = rmsCapacityMapper.selectByParameters(map);
             if (rmsCapacities.size() != 0 ) {
-//                当运力编号存在的时候，将获取到的运力编号的id插入进去
+             //当运力编号存在的时候，将获取到的运力编号的id插入进去
                 RmsCapacity rmsCapacity = rmsCapacities.get(0);
                 rmsCapacityMapper.updateByPrimaryKeySelective(rmsCapacity);
                 realOmsshipInstructionsCapacity.setCapacityId(rmsCapacity.getCapacityId());
             }
             else {
-//                当运力编号不存在的时候，在运力表中新增一条运力信息，并将运力类型设置为3，也就是船类型
+              //当运力编号不存在的时候，在运力表中新增一条运力信息，并将运力类型设置为3，也就是船类型
                 RmsCapacity rmsCapacity = new RmsCapacity();
                 rmsCapacity.setCapacityId(rmsCapacityMapper.selectCapacityId());
                 rmsCapacity.setCapacityNumber(capacityNumber);

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

@@ -1,6 +1,8 @@
 package com.steerinfo.dil.service.impl;
 
+import com.steerinfo.dil.mapper.AmsshipCargoTransferResultMapper;
 import com.steerinfo.dil.model.TmsshipShipLocation;
+import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import com.steerinfo.dil.model.OmsshipShipmentInstructions;
@@ -34,6 +36,8 @@ public class OmsshipShipmentInstructionsServiceImpl implements IOmsshipShipmentI
 
     @Autowired
     private OmsshipShipmentInstructionsMapper omsshipShipmentInstructionsMapper;
+    @Autowired
+    private AmsshipCargoTransferResultMapper amsshipCargoTransferResultMapper;
 
     /**
      * 通过主键查询
@@ -52,13 +56,15 @@ public class OmsshipShipmentInstructionsServiceImpl implements IOmsshipShipmentI
      */
     @Override
     public List<Map<String, Object>> selectAll(Map<String, Object> mapVal) {
-        return omsshipShipmentInstructionsMapper.selectAll(mapVal);
+        List<Map<String, Object>> mapList = omsshipShipmentInstructionsMapper.selectAll(mapVal);
+        if (mapList.size()!=0){
+           for (Map<String,Object> map:mapList){
+               map.put("shipperName","四川省达州钢铁集团有限公司");
+           }
+        }
+        return mapList;
     }
 
-//    @Override
-//    public int selectKey(BigDecimal shipmentInstructionsId) {
-//        return omsshipShipmentInstructionsMapper.selectKey(shipmentInstructionsId);
-//    }
 
     /**
      * 逻辑删除
@@ -74,27 +80,29 @@ public class OmsshipShipmentInstructionsServiceImpl implements IOmsshipShipmentI
 
     /**
      * 新增装船指令
-     * @param omsshipShipmentInstructions
+     * @param map
      * @return
      */
     @Override
-    public int insert(OmsshipShipmentInstructions omsshipShipmentInstructions) {
+    public int insert(Map<String,Object> map) {
+        OmsshipShipmentInstructions omsshipShipmentInstructions=new OmsshipShipmentInstructions();
+        String userId = (String) map.get("userId");
+        if (userId!=null){
+            String userName = amsshipCargoTransferResultMapper.getUserNameByUserId(userId);
+            //设置新增用户名
+            omsshipShipmentInstructions.setInsertUsername(userName);
+        }
         BigDecimal shipmentInstructionsId = omsshipShipmentInstructionsMapper.selectInstructionId();
         omsshipShipmentInstructions.setShipmentInstructionsId(shipmentInstructionsId);
         BigDecimal batchId = omsshipShipmentInstructions.getBatchId();
-        Map<String,Object> map = omsshipShipmentInstructionsMapper.getPortAndPier(batchId);
-        BigDecimal pierId = (BigDecimal) map.get("pierId");
-        BigDecimal portId = (BigDecimal) map.get("portId");
+        Map<String,Object> map1 = omsshipShipmentInstructionsMapper.getPortAndPier(batchId);
+        BigDecimal pierId = (BigDecimal) map1.get("pierId");
+        BigDecimal portId = (BigDecimal) map1.get("portId");
         omsshipShipmentInstructions.setRecipientCarrierId(pierId);
         omsshipShipmentInstructions.setPortCarrierId(portId);
         //  设置常规字段
         omsshipShipmentInstructions.setInsertTime(new Date());
-        omsshipShipmentInstructions.setDeleteName(null);
-        omsshipShipmentInstructions.setDeleteTime(null);
-        omsshipShipmentInstructions.setInsertUsername("admin");
-        omsshipShipmentInstructions.setUpdateTime(new Date());
         omsshipShipmentInstructions.setInsertUpdateRemark("无");
-        omsshipShipmentInstructions.setUpdateUsername("admin");
         omsshipShipmentInstructions.setDeleted(new BigDecimal(0));
         omsshipShipmentInstructions.setInstructionIssueStatus("未下发");
         return omsshipShipmentInstructionsMapper.insert(omsshipShipmentInstructions);

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

@@ -3,8 +3,10 @@ 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.util.DataChange;
 import com.steerinfo.dil.util.NoUtil;
 import com.steerinfo.framework.mapper.IBaseMapper;
@@ -12,6 +14,7 @@ import com.steerinfo.framework.service.impl.BaseServiceImpl;
 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;
@@ -47,6 +50,10 @@ public class TmsshipLoadShipResultServiceImpl implements ITmsshipLoadShipResultS
     TmsshipEntryWharyResultMapper tmsshipEntryWharyResultMapper;
     @Autowired
     TmsshipOutWharyResultMapper tmsshipOutWharyResultMapper;
+
+    @Autowired
+    TmsshipShipLocationMapper tmsshipShipLocationMapper;
+
     @Autowired
     WmshboundFeign wmshboundFeign;
     @Autowired
@@ -60,21 +67,23 @@ public class TmsshipLoadShipResultServiceImpl implements ITmsshipLoadShipResultS
     @Override
     @Transactional
     public int insertLoadShip(Map<String,Object> map) {
+        int i=0;
         Map<String,Object> mapVal = (Map<String, Object>) map.get("mapVal");
         Map<String,Object> rowMap = (Map<String, Object>) map.get("rowMap");
         TmsshipLoadShipResult tmsshipLoadShipResult = new TmsshipLoadShipResult();
         TmsshipEntryWharyResult tmsshipEntryWharyResult = new TmsshipEntryWharyResult();
         BigDecimal orderId = new BigDecimal((Integer) rowMap.get("orderId"));
-        //BigDecimal batchId = getBatchId(rowMap);
         BigDecimal batchId= DataChange.dataToBigDecimal(rowMap.get("batchId"));
         Map<String,Object> ppMap = tmsshipLoadShipResultMapper.getPortAndPier(batchId);
         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);
         tmsshipEntryWharyResult.setTotalResultId(totalResultId);
         BigDecimal resultEntryId = tmsshipEntryWharyResultMapper.selectEntryId();
@@ -92,11 +101,10 @@ public class TmsshipLoadShipResultServiceImpl implements ITmsshipLoadShipResultS
         tmsshipEntryWharyResult.setInsertUsername("admin");
         tmsshipEntryWharyResult.setUpdateUsername("admin");
         tmsshipEntryWharyResult.setInsertUpdateRemark("无");
-        tmsshipEntryWharyResult.setDeleteName(null);
-        tmsshipEntryWharyResult.setDeleteTime(null);
         //离港
         String resultOutWharyName = (String) mapVal.get("resultOutWharyName");
         Date resultOutWharyTime = new Date((Long) mapVal.get("resultOutWharyTime"));
+        tmsshipLoadShipResult.setResultOutPortTime(resultOutWharyTime);
         TmsshipOutWharyResult tmsshipOutWharyResult = new TmsshipOutWharyResult();
         tmsshipOutWharyResult.setTotalResultId(totalResultId);
         BigDecimal resultOutId = tmsshipOutWharyResultMapper.selectOutId();
@@ -113,37 +121,32 @@ public class TmsshipLoadShipResultServiceImpl implements ITmsshipLoadShipResultS
         tmsshipOutWharyResult.setInsertUsername("admin");
         tmsshipOutWharyResult.setUpdateUsername("admin");
         tmsshipOutWharyResult.setInsertUpdateRemark("无");
-        tmsshipOutWharyResult.setDeleteName(null);
-        tmsshipOutWharyResult.setDeleteTime(null);
         // 装船
         BigDecimal resultId = tmsshipLoadShipResultMapper.selectLoadId();
-        //获得起运港
-        BigDecimal downSwimPortId= DataChange.dataToBigDecimal(rowMap.get("downSwimPortId")) ;
 
+        //通过总实绩id查找船运起运港口
         //根据港口和批次Id查询实时库存id
-//        Map<String,Object> idMap=new HashMap<>();
-//        idMap.put("batchId",batchId);
-//        idMap.put("downSwimPortId",downSwimPortId);
-//        Map<String,Object> gmMap = tmsshipLoadShipResultMapper.selectGmIdByPortId(idMap);
-//        BigDecimal gmId=DataChange.dataToBigDecimal(gmMap.get("gmId"));
+        Map<String,Object> idMap=new HashMap<>();
+        idMap.put("batchId",batchId);
+        idMap.put("downSwimPortId",startPortId);
+        Map<String,Object> gmMap = tmsshipLoadShipResultMapper.selectGmIdByPortId(idMap);
+        BigDecimal gmId=DataChange.dataToBigDecimal(gmMap.get("gmId"));
+        tmsshipLoadShipResult.setRwarehouseMaterialId(gmId);
         //获得实装数量
         BigDecimal resultActualInstallations = new BigDecimal((String) mapVal.get("resultActualInstallations"));
+        //装船时间
         Date resultLoadShipDate = new Date((Long) mapVal.get("resultLoadShipDate"));
+        tmsshipLoadShipResult.setResultLoadShipDate(resultLoadShipDate);
+        //是否清场
         String resultIsClear = (String) mapVal.get("resultIsClear");
+        tmsshipLoadShipResult.setResultIsclear(resultIsClear);
         String resultNumber = noUtil.setResultNo("ZC",resultEntryId);
         tmsshipLoadShipResult.setResultId(resultId);
         tmsshipLoadShipResult.setTotalResultId(totalResultId);
-
         tmsshipLoadShipResult.setBatchId(batchId);
         tmsshipLoadShipResult.setResultDeliveryDate(noticeDeliveryTime);
         tmsshipLoadShipResult.setResultActualInstallations(resultActualInstallations);
         tmsshipLoadShipResult.setResultNumber(resultNumber);
-        //设置港存库实时库存id
-//        tmsshipLoadShipResult.setRwarehouseMaterialId(gmId);
-//        tmsshipLoadShipResult.setResultArrivalPortTime(resultArrivalTime);
-//        tmsshipLoadShipResult.setResultOutPortTime(resultOutWharyTime);
-//        tmsshipLoadShipResult.setResultLoadShipDate(resultLoadShipDate);
-//        tmsshipLoadShipResult.setResultIsclear(resultIsClear);
         // 设置常规字段
         tmsshipLoadShipResult.setInsertTime(new Date());
         tmsshipLoadShipResult.setInsertUsername("admin");
@@ -151,10 +154,18 @@ public class TmsshipLoadShipResultServiceImpl implements ITmsshipLoadShipResultS
         tmsshipLoadShipResult.setUpdateTime(new Date());
         tmsshipLoadShipResult.setUpdateUsername("admin");
         tmsshipLoadShipResult.setDeleted(new BigDecimal(0));
-        tmsshipEntryWharyResultMapper.insertSelective(tmsshipEntryWharyResult);
-        tmsshipOutWharyResultMapper.insertSelective(tmsshipOutWharyResult);
-        int codeLoad = tmsshipLoadShipResultMapper.insertSelective(tmsshipLoadShipResult);
-        return codeLoad;
+        i += tmsshipEntryWharyResultMapper.insertSelective(tmsshipEntryWharyResult);
+        i += tmsshipOutWharyResultMapper.insertSelective(tmsshipOutWharyResult);
+        //新增位置作业,未到闸
+        TmsshipShipLocation tmsshipShipLocation=new TmsshipShipLocation();
+        BigDecimal locationId = tmsshipShipLocationMapper.selectLocationId();
+        tmsshipShipLocation.setLocationId(locationId);
+        tmsshipShipLocation.setTotalResultId(totalResultId);
+        tmsshipShipLocation.setLocationStatus("未到闸船舶");
+        tmsshipShipLocation.setInsertTime(new Date());
+        i += tmsshipShipLocationMapper.insertSelective(tmsshipShipLocation);
+        i += tmsshipLoadShipResultMapper.insertSelective(tmsshipLoadShipResult);
+        return i;
     }
 
     /**

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

@@ -44,6 +44,16 @@ public class TmsshipShipLocationServiceImpl implements ITmsshipShipLocationServi
         return tmsshipShipLocationMapper.selectLocationId();
     }
 
+    //新增位置作业
+    @Override
+    public int addShipLocationResult(Map<String, Object> map) {
+        Map<String,Object> mapVal = (Map<String, Object>) map.get("mapVal");
+        Map<String,Object> shipLocationMap = (Map<String, Object>) map.get("shipLocationMap");
+        BigDecimal orderId = new BigDecimal((Integer) shipLocationMap.get("orderId"));
+        BigDecimal totalResultId = tmsshipTotalResultService.getResultTotalId(orderId);
+        return 0;
+    }
+
     /**
      * 删除位置作业
      * @param locationId

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/shipTms
 spring:
   profiles:
-    include: ${SPRING_PROFILES:dev}
+    include: ${SPRING_PROFILES:prod}
   jackson:
         date-format: yyyy-MM-dd HH:mm:ss
         time-zone: GMT+8
@@ -17,7 +17,7 @@ spring:
 eureka:
   client:
     service-url:
-      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.162}:${EUREKA_PORT:8081}/eureka/
+      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.166}:${EUREKA_PORT:8081}/eureka/
   instance:
     prefer-ip-address: true
     status-page-url: http://${spring.cloud.client.ip-address}:${server.port}/swagger-ui.html#/

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

@@ -551,43 +551,41 @@
     <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
     <!--展示货权转移列表-->
     <select id="selectdeliveryAttorney" resultType="java.util.Map">
-        select *
-        from(select DISTINCT
+       select DISTINCT
         t3.SHIPPER_NAME "shipperName",
-        t4.PORT_NAME "carrierName",
+        RP.PORT_NAME "carrierName",
         t6.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
         t8.MATERIAL_NAME "materialName",
-        t4.PORT_NAME "portName",
+        RP2.PORT_NAME "portName",
         t5.PORT_NAME "portName1",
         t1.ATTORNEY_PICKUP_CONTACT_PERSON "attorneyPickupContactPerson",
         t1.ATTORENY_PICKUP_IDCARD "attorneyPickupIdcard",
         t1.ATTORNEY_CONTACT_TELEPHONE "attorneyContactTelephone",
         t1.ATTORNEY_TIME "attorneyTime",
-        t2.CARRIER_ID "carrierId",
+        ACTR.RESULT_NUMBER_OF_LOANS "purchaseOrderMaterialNum",
+        T2.CARRIER_ID "carrierId",
         t2.REQUESTER_GROUP_ID "groupId",
         t1.ATTORNEY_ID "attorneyId",
         t1.BATCH_ID "batchId",
-        t1.INSERT_TIME "insertTime",
-        ALUMINA_CONTENT "purchaseOrderMaterialNumber"
+        t1.INSERT_TIME "insertTime"
         from AMSSHIP_DELIVERY_ATTORNEY t1
         left join AMSSHIP_DELIVERY_NOTICE t2
         on t1.BATCH_ID=t2.BATCH_ID
         left join RMS_SHIPPER t3
         on t2.REQUESTER_GROUP_ID=t3.SHIPPER_ID
-        left join RMS_PORT t4
-        on t2.CARRIER_ID=t4.PORT_ID
+        LEFT JOIN RMS_PORT RP
+        ON RP.PORT_ID=T2.CARRIER_ID
         left join RMS_PORT t5
         on t1.PORT_ID=t5.PORT_ID
+        LEFT JOIN RMS_PORT RP2
+        ON RP2.PORT_ID=T1.DOWN_SWIM_PORT_ID
         left join DIL_BATCH t6
         on t1.BATCH_ID=t6.BATCH_ID
-        left join AMS_PURCHASE_ORDER t7
-        on t6.BATCH_ID=t7.BATCH_ID
         left join RMS_MATERIAL t8
         on t6.MATERIAL_ID=t8.MATERIAL_ID
         left join AMSSHIP_CARGO_TRANSFER_RESULT ACTR
         on t1.BATCH_ID = ACTR.BATCH_ID
         where t1.deleted = 0 and t1.ATTORNEY_DISTRIBUTION_STATUS=#{status}
-        )
         <where>
             <if test="shipperName!= null">
                 and t3.SHIPPER_NAME in
@@ -596,7 +594,7 @@
                 </foreach>
             </if>
             <if test="carrierName!= null">
-                and t4.CARRIER_NAME in
+                and t4.PORT_NAME in
                 <foreach close=")" collection="carrierName" item="item" open="(" separator=",">
                     #{item}
                 </foreach>

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

@@ -516,8 +516,7 @@
         rpo.PORT_NAME "portname2",
         rm.MATERIAL_NAME "materialName",
         db.RESULT_FOREIGN_SHIP_NAME "foreignShipName",
-        rs.SHIPPER_NAME "shipperName",
-        rs.SHIPPER_CONTACT_NUMBER "shipperContactNumber",
+        ADA.ATTORNEY_CONTACT_TELEPHONE "shipperContactNumber",
         osi.INSTRUCTION_TIME "instructionTime",
         osi.INSTRUCTIONS_TOTAL_TONNAGE "instruct"
         from OMSSHIP_SHIPMENT_INSTRUCTIONS osi
@@ -568,12 +567,6 @@
                     "foreignShipName" in #{item}
                 </foreach>
             </if>
-            <if test="shipperName!= null">
-                and
-                <foreach collection="shipperName" item="item" open="(" separator="," close=")">
-                    "shipperName" in #{item}
-                </foreach>
-            </if>
             <if test="shipperContactNumber!= null">
                 and
                 <foreach collection="shipperContactNumber" item="item" open="(" separator="," close=")">
@@ -623,8 +616,8 @@
 
     <!-- 得到港口和码头 -->
     <select id="getPortAndPier" parameterType="DECIMAL" resultType="java.util.Map">
-        SELECT ACTR.GROUP_ID AS "pierId",
-               ADN.PORT_ID   AS "portId"
+        SELECT DISTINCT ACTR.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

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

@@ -615,7 +615,7 @@
         rrmr.GM_TONNAGE as "portAmount",
         rc.CAPACITY_NUMBER as "capacityName",
         oic.INSTRUCTION_PLANNED_LOADING as "planWeight",
-        tsl.LOCATION_VALUE as "nowLocation",
+        tsl.LOCATION_STATUS as "nowLocation",
         tlsr.RESULT_ACTUAL_INSTALLATIONS as "realWeight",
         tlsr.RESULT_ARRIVAL_PORT_TIME as "arriveTime",
         tlsr.RESULT_OUT_PORT_TIME as "liveTime",
@@ -649,6 +649,8 @@
         ON tlsr.RWAREHOUSE_MATERIAL_ID = rrmr.GM_ID
         LEFT JOIN TMSSHIP_SHIP_LOCATION tsl
         ON ttr.RESULT_ID = tsl.TOTAL_RESULT_ID
+        LEFT JOIN TMSSHIP_ENTRY_WHARY_RESULT TEWR
+        ON ttr.RESULT_ID=TEWR.TOTAL_RESULT_ID
         LEFT JOIN RMS_PORT rps
         ON ada.DOWN_SWIM_PORT_ID = rps.PORT_ID
         LEFT JOIN RMS_PORT rpe