Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/steerinfo/dil/controller/UniversalController.java
#	src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

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

@@ -1754,6 +1754,14 @@ public class AMScontroller{
         return amsFeign.updateNoticeStatus(map);
     }
 
+    @PostMapping(value = "/getNoticeUser", produces  = "application/json;charset=UTF-8")
+    public Map<String, Object> getNoticeUser(@RequestBody(required = false) Map<String, Object> map,
+                                             @RequestParam("pageNum") Integer pageNum,
+                                             @RequestParam("pageSize") Integer pageSize,
+                                             @RequestParam("apiId") Integer apiId) {
+        return amsFeign.getNoticeUser(map,pageNum,pageSize,apiId);
+    }
+
     @PostMapping(value = "/getNoticeAll", produces  = "application/json;charset=UTF-8")
     public Map<String, Object> getNoticeAll(@RequestBody(required = false) Map<String, Object> map) {
         return amsFeign.getNoticeAll(map);
@@ -2247,4 +2255,17 @@ public class AMScontroller{
     public Map<String,Object> getMakeOrderDate(@RequestBody Map<String,Object> map) {
         return amsFeign.getMakeOrderDate(map);
     }
+
+    @ApiOperation("合并运单")
+    @PostMapping("/mergeOrder")
+    public Map<String,Object> mergeOrder(@RequestBody Map<String,Object> map) {
+        return amsFeign.mergeOrder(map);
+    }
+
+    @ApiOperation("拆分运单")
+    @PostMapping("/splitOrder")
+    public Map<String,Object> splitOrder(@RequestBody Map<String,Object> map) {
+        return amsFeign.splitOrder(map);
+    }
+
 }

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

@@ -4,6 +4,7 @@ package com.steerinfo.dil.controller;
 import com.steerinfo.dil.mapper.BackgroundProcessingMapper;
 import com.steerinfo.dil.service.impl.BackgroundProcessingServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -93,8 +94,10 @@ public class BackgroundProcessingController extends BaseRESTfulController {
     @PostMapping("updateOrderStatus")
     public RESTfulResult updateOrderStatus(@RequestBody(required = false) Map<String,Object> map){
         if(map.get("orderNumber") != null){
-            int i = backgroundProcessingMapper.updateOrderStatus(map);
-            return success(i);
+            if(DataChange.dataToBigDecimal(map.get("orderStatus")).intValue() != 2) {
+                int i = backgroundProcessingMapper.updateOrderStatus(map);
+                return success(i);
+            }
         }
         return failed(0);
     }

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

@@ -11,6 +11,7 @@ import com.steerinfo.framework.service.pagehelper.PageHelper;
 import io.swagger.annotations.*;
 import io.swagger.models.auth.In;
 import oracle.jdbc.proxy.annotation.Post;
+import org.apache.commons.lang.time.FastDateFormat;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -346,7 +347,7 @@ public class UniversalController extends BaseRESTfulController {
         if(type != null){
             mapValue.put("type", type);
         }
-        if(index != null){
+        if(index != null && !"".equals(index) && !"null".equals(index)){
             mapValue.put("index", index);
         }
         PageHelper.startPage(pageNum, pageSize);
@@ -536,7 +537,7 @@ public class UniversalController extends BaseRESTfulController {
         if(mapValue == null) {
             mapValue = new HashMap<>();
         }
-        if(index != null){
+        if(index != null && !"".equals(index) && !"null".equals(index)){
             mapValue.put("index", index);
         }
         PageHelper.startPage(pageNum, pageSize);
@@ -711,16 +712,13 @@ public class UniversalController extends BaseRESTfulController {
     @PostMapping("/getOilFormula")
     public RESTfulResult getOilFormula(@RequestBody(required = false) Map<String,Object> mapValue,
                                        Integer apiId,
-                                       String con,
                                        Integer pageNum,
-                                       Integer pageSize
-                                       ) {
+                                       Integer pageSize,
+                                       String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        if (con!=null){
-            mapValue.put("con", "%"+con+"%");
-        }
+        mapValue.put("con", con);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = universalMapper.getOilFormula(mapValue);
@@ -928,6 +926,18 @@ public class UniversalController extends BaseRESTfulController {
         return 1;
     }
 
+    @ApiOperation("删除计量实绩")
+    @PostMapping("/linkageDeleteTransportOrder")
+    public int linkageDeleteTransportOrder(@RequestBody(required = false)List<Map<String,Object>>mapList ){
+        try {
+            return universalService.linkageDeleteTransportOrder(mapList);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return 1;
+    }
+
+
     @ApiModelProperty(value = "获取仓库月台")
     @GetMapping("/getSteelWarehouse")
     public List<Map<String, Object>> getSteelWarehouse(){
@@ -1113,4 +1123,17 @@ public class UniversalController extends BaseRESTfulController {
     public String getReleaseFlag() {
         return universalMapper.getReleaseFlag();
     }
+
+
+    @ApiOperation("根据名称查询收货客户")
+    @PostMapping("/getConsigneeInfo")
+    public Map<String,Object> getConsigneeInfo(String consigneeName){
+        return universalMapper.getConsigneeInfo(consigneeName);
+    }
+
+    @ApiOperation("收货客户查询")
+    @PostMapping("/getColumnNoRoutList")
+    public List<String> getColumnNoRoutList(@RequestBody(required = false) Map<String,Object> map) {
+        return universalMapper.getColumnNoRoutList(map);
+    }
 }

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

@@ -1116,5 +1116,10 @@ public class WMSController extends BaseRESTfulController {
                                              @RequestParam(value = "quantity") Integer quantity) {
         return wmsFeign.deleteInboundMaterial(warehouseId,materialCode,materialSpecification,materialModel,quantity);
     }
+
+    @PostMapping("/recordScanResult")
+    public Map<String,Object> recordScanResult(@RequestBody Map<String,Object> map) {
+        return wmsFeign.recordScanResult(map);
+    }
 }
 

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

@@ -1533,6 +1533,12 @@ public interface AmsFeign {
     @PostMapping(value = "api/v1/ams/dilnotices/updateNoticeStatus")
     Map<String, Object> updateNoticeStatus(@RequestBody(required = false) Map<String, Object> map);
 
+    @PostMapping(value = "api/v1/ams/dilnotices/getNoticeUser")
+    Map<String, Object> getNoticeUser(@RequestBody(required = false) Map<String, Object> map,
+                                      @RequestParam("pageNum") Integer pageNum,
+                                      @RequestParam("pageSize") Integer pageSize,
+                                      @RequestParam("apiId") Integer apiId);
+
     @PostMapping(value = "api/v1/ams/dilnotices/getNoticeAll")
     Map<String, Object> getNoticeAll(@RequestBody(required = false) Map<String, Object> map);
 
@@ -1888,4 +1894,9 @@ public interface AmsFeign {
     @PostMapping("/api/v1/ams/amssaleorders/getMakeOrderDate")
     Map<String, Object> getMakeOrderDate(@RequestBody Map<String, Object> map);
 
+    @PostMapping("/api/v1/ams/amssaleorders/mergeOrder")
+    Map<String, Object> mergeOrder(@RequestBody Map<String, Object> map);
+
+    @PostMapping("/api/v1/ams/amssaleorders/splitOrder")
+    Map<String, Object> splitOrder(@RequestBody Map<String, Object> map);
 }

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

@@ -943,4 +943,8 @@ public interface WMSFeign {
                                               @RequestParam("materialSpecification") String materialSpecification,
                                               @RequestParam("materialModel") String materialModel,
                                               @RequestParam("quantity") Integer quantity);
+
+    @PostMapping("/api/v1/wms/inboundScanResult/recordScanResult")
+    Map<String, Object> recordScanResult(@RequestBody Map<String, Object> map);
+
 }

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

@@ -276,4 +276,8 @@ public interface UniversalMapper {
 
     String getReleaseFlag();
 
+    Map<String, Object> getConsigneeInfo(String consigneeName);
+
+    List<String> getColumnNoRoutList(Map<String, Object> map);
+
 }

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

@@ -242,50 +242,70 @@ public class UniversalServiceImpl implements UniversalService {
      */
     //@Scheduled(cron = "0 0,5 8 * * ?")
     public void closePassedOrder() {
-        List<Map<String,Object>> passedOrderList = universalMapper.findPassedOrder();
-        System.out.println("关闭的未出厂过期订单如下：<" + passedOrderList + ">");
-        int result=0;
-        //int result = universalMapper.closePassedOrder();
-        try {
-            if (passedOrderList.isEmpty()){
-
-            }else {
-                for (Map<String, Object> map : passedOrderList) {
-                    BigDecimal orderId = (BigDecimal) map.get("orderId");
-                    //分两种情况关单
-                    //净重为0状态设为2，不为零设为7
-                    BigDecimal bigDecimal = universalMapper.sumNetWeight(orderId);
-                    if (bigDecimal.compareTo(BigDecimal.ZERO)!=0){
-                        result+=universalMapper.updateStatusTwo(orderId);
-                    }else {
-                        result+=universalMapper.updateStatusSeven(orderId);
-                    }
-                   /* BigDecimal capacityIdS=universalMapper.queueSingle(orderId);*/
-                    /*if (capacityIdS !=null){
-                        //删除单拼
-                        universalMapper.delectQueueS(capacityIdS);
-                    }*/
-                    /*//查询多拼的数据
-                    BigDecimal capacityIdM =universalMapper.queueMore(orderId);
-                    if (capacityIdM !=null){
-                        //删除多拼
-                        universalMapper.delectQueueM(capacityIdM);
-                    }
-                    //查询单拼的数据
-                    BigDecimal capacityIdS=universalMapper.queueSingle(orderId);
-                    if (capacityIdS !=null){
-                        //删除单拼
-                        universalMapper.delectQueueS(capacityIdS);
-                    }*/
-                }
-            }
-
-        }catch (Exception e){
-
-        }
-        System.out.println("订单关闭数为：" + result);
+        //List<Map<String,Object>> passedOrderList = universalMapper.findPassedOrder();
+        //System.out.println("关闭的未出厂过期订单如下：<" + passedOrderList + ">");
+        //int result=0;
+        ////int result = universalMapper.closePassedOrder();
+        //try {
+        //    if (passedOrderList.isEmpty()){
+        //
+        //    }else {
+        //        for (Map<String, Object> map : passedOrderList) {
+        //            BigDecimal orderId = (BigDecimal) map.get("orderId");
+        //            //分两种情况关单
+        //            //净重为0状态设为2，不为零设为7
+        //            BigDecimal bigDecimal = universalMapper.sumNetWeight(orderId);
+        //            if (bigDecimal.compareTo(BigDecimal.ZERO)!=0){
+        //                result+=universalMapper.updateStatusTwo(orderId);
+        //            }else {
+        //                result+=universalMapper.updateStatusSeven(orderId);
+        //            }
+        //           /* BigDecimal capacityIdS=universalMapper.queueSingle(orderId);*/
+        //            /*if (capacityIdS !=null){
+        //                //删除单拼
+        //                universalMapper.delectQueueS(capacityIdS);
+        //            }*/
+        //            /*//查询多拼的数据
+        //            BigDecimal capacityIdM =universalMapper.queueMore(orderId);
+        //            if (capacityIdM !=null){
+        //                //删除多拼
+        //                universalMapper.delectQueueM(capacityIdM);
+        //            }
+        //            //查询单拼的数据
+        //            BigDecimal capacityIdS=universalMapper.queueSingle(orderId);
+        //            if (capacityIdS !=null){
+        //                //删除单拼
+        //                universalMapper.delectQueueS(capacityIdS);
+        //            }*/
+        //        }
+        //    }
+        //
+        //}catch (Exception e){
+        //
+        //}
+        //System.out.println("订单关闭数为：" + result);
         //return 1;
     }
 
 
+    public int linkageDeleteTransportOrder(List<Map<String, Object>> mapList) throws IOException{
+        String URL = "http://172.16.33.166:8066/api/v1/join/tmstruckweightresult/linkageDeleteTransportOrder";
+        String jsonData = null;
+        String jsonString= JSON.toJSONString(mapList);
+        jsonData = HTTPRequestUtils.send(URL, jsonString,"utf-8");
+        if(!"null".equals(jsonData)){
+            System.out.println(jsonData);
+            HashMap hashMap = JSON.parseObject(jsonData, HashMap.class);
+            String code = (String) hashMap.get("code");
+            System.out.println(hashMap.get("code"));
+            if("SUCCESS".equals(code)){
+                return 1;
+            }else{
+                return 0;
+            }
+        }else{
+            System.out.println("补录委托失败：" + jsonData);
+            return 0;
+        }
+    }
 }

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

@@ -209,7 +209,8 @@
     </update>
     <update id="updateOrderStatus" parameterType="java.util.Map">
         update OMSTRUCK_ORDER OO
-        SET OO.ORDER_STATUS = #{orderStatus}
+        SET OO.ORDER_STATUS = #{orderStatus},
+            OO.INSERT_UPDATE_REMARK = '管理员操作修改状态'
         WHERE OO.ORDER_NUMBER = #{orderNumber}
     </update>
 </mapper>

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

@@ -705,9 +705,8 @@
                BF.FORMULA_STRING AS "formulaString"
         FROM BMSTRUCK_FORMULA BF
         <where>
-            FORMULA_NAME like '%执行运价公式%'
-            <if test="con!=null">
-                and FORMULA_NAME LIKE #{con}
+            <if test="con !=null and con!=''.toString()">
+                FORMULA_NAME LIKE  concat('%',concat(#{con},'%'))
             </if>
         </where>
     </select>
@@ -1437,7 +1436,8 @@
 
     <update id="updateStatusTwo">
         update OMSTRUCK_ORDER OO
-        set OO.ORDER_STATUS=2
+        set OO.ORDER_STATUS=2,
+            OO.INSERT_UPDATE_REMARK = '八点完成订单'
         WHERE OO.ORDER_ID=#{orderId}
     </update>
 
@@ -1461,9 +1461,20 @@
     <select id="getReleaseFlag" resultType="string">
         SELECT VERSION_VALUE FROM DIL_VERSION WHERE VERSION_ID = 6
     </select>
-
     <update id="updateDispachSwitch">
         UPDATE AMS_DISPATCH_SWITCH SET IS_OK=#{isOk}
     </update>
-
+    <select id="getConsigneeInfo" resultType="java.util.Map">
+        SELECT RC.CONSIGNEE_ID "consigneeId",
+               RC.CONSIGNEE_COMPANY_NAME "consigneeCompanyName"
+               FROM RMS_CONSIGNEE RC
+        WHERE RC.CONSIGNEE_COMPANY_NAME = #{consigneeName}
+    </select>
+    <select id="getColumnNoRoutList" resultType="java.lang.String" parameterType="map">
+        select DTCR.COLUMN_NAME from DIL_ROLE_ORGCODE_TABLE DROT
+        left join DIL_TABLE_COLUMN_ROLE DTCR
+        ON DTCR.PRIMARY_ID = DROT.COLUMN_ID
+        WHERE DROT.ORG_CODE = #{orgCode}
+        AND DTCR.TABLE_NAME = #{tableName}
+    </select>
 </mapper>