Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU2/DAI_DAZHOU-OMS

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

@@ -0,0 +1,63 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.mapper.OmstruckOrderMapper;
+import com.steerinfo.dil.service.IOmstruckOrderMaterialService;
+import com.steerinfo.dil.service.impl.OmstruckOrderMaterialServiceImpl;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * OmstruckOrder RESTful接口：
+ *
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-10-15 09:37
+ * 类描述
+ * 修订历史：
+ * 日期：2021-10-15
+ * 作者：generator
+ * 参考：
+ * 描述：OmstruckOrder RESTful接口
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ * @see null
+ */
+@RestController
+@RequestMapping("/${api.version}/omstruckmatetialorders")
+public class OmstruckOrderMaterialController extends BaseRESTfulController {
+
+    @Autowired
+    OmstruckOrderMaterialServiceImpl omstruckOrderMaterialService;
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+
+    @Autowired
+    OmstruckOrderMapper omstruckOrderMapper;
+
+    @ApiOperation(value = "查询钢材订单号")
+    @GetMapping("getSteelOrderNum")
+    public RESTfulResult getSteelOrderNum(String capacityId){
+        List<Map<String, Object>> returnMes = omstruckOrderMaterialService.getSteelOrderNum(capacityId);
+        return success(returnMes);
+    }
+
+    @ApiOperation(value = "查询钢材订单信息")
+    @GetMapping("getMesToSteelDepartment")
+    public RESTfulResult getMesToSteelDepartment(Integer orderId){
+        Map<String, Object> map = omstruckOrderMaterialService.getMesToSteelDepartment(orderId);
+        return success(map);
+    }
+
+    @ApiOperation(value = "查询钢材订单信息")
+    @PostMapping("updateMaterialMes")
+    public RESTfulResult updateMaterialMes(@RequestBody(required = false) Map<String, Object> map){
+        int i = omstruckOrderMaterialService.updateMaterialMes(map);
+        return success(i);
+    }
+}

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

@@ -48,7 +48,7 @@ public interface TmsTruckFeign {
 
     //发送计量委托,运输订单id
     @PostMapping("api/v1/truckTms/tmstruckmeasurecommissions/sendMeasureCommission")
-    RESTfulResult sendMeasureCommission(@RequestBody(required = false) Map<String, Object> map);
+    Map<String, Object> sendMeasureCommission(@RequestBody(required = false) Map<String, Object> map);
 
     //新增计时作业实绩
     @PostMapping("api/v1/truckTms/tmstrucktimetaskresults/addTimeTaskResult")

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

@@ -41,4 +41,13 @@ public interface OmstruckOrderMaterialMapper extends IBaseMapper<OmstruckOrderMa
     List<Map<String, Object>> getOrderMaterial(Integer orderId);
 
     List<Map<String,Object>> getUnloadOrderWarehouseName(Map<String, Object> map);
+
+    //通过车牌号获取钢材订单ID
+    List<Map<String, Object>> getSteelOrderNumByCapacityNumber(BigDecimal capacityId);
+
+    //修改订单物资子表
+    int updateMaterialMes(OmstruckOrderMaterial omstruckOrderMaterial);
+
+    //修改出库实绩
+    int updateOutBoundResult(OmstruckOrderMaterial omstruckOrderMaterial);
 }

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.service.impl;
 
+import com.steerinfo.dil.mapper.OmstruckOrderMapper;
 import com.steerinfo.dil.mapper.OmstruckOrderMaterialMapper;
 import com.steerinfo.dil.mapper.RmsCapacityMapper;
 import com.steerinfo.dil.mapper.RmsPwarehouseGridMapper;
@@ -7,10 +8,14 @@ import com.steerinfo.dil.model.OmstruckOrderMaterial;
 import com.steerinfo.dil.model.RmsCapacity;
 import com.steerinfo.dil.model.RmsPwarehouseGrid;
 import com.steerinfo.dil.service.IOmstruckOrderMaterialService;
+import com.steerinfo.dil.util.DataChange;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -32,7 +37,8 @@ import java.util.Map;
 public class OmstruckOrderMaterialServiceImpl implements IOmstruckOrderMaterialService {
 
 
-
+    @Autowired
+    private OmstruckOrderMapper omstruckOrderMapper;
 
     @Autowired
     private OmstruckOrderMaterialMapper omstruckOrderMaterialMapper;
@@ -256,4 +262,44 @@ public class OmstruckOrderMaterialServiceImpl implements IOmstruckOrderMaterialS
         return count;
     }
 
+    /**
+     * 车牌号
+     * @param capacityId
+     * @return
+     */
+    public List<Map<String, Object>> getSteelOrderNum(String capacityId){
+        return omstruckOrderMaterialMapper.getSteelOrderNumByCapacityNumber(new BigDecimal(capacityId));
+    }
+
+    /**
+     * 查询订单信息给钢材科
+     * @param orderId
+     * @return
+     */
+    public Map<String, Object> getMesToSteelDepartment(Integer orderId){
+        Map<String, Object> map = new HashMap<>();
+        map.put("orderId", orderId);
+        map.put("status", 333);
+        Map<String, Object> returnMap = omstruckOrderMapper.getSteelOrderMessageToApp(map);
+        returnMap.put("materialMes", omstruckOrderMaterialMapper.getOrderMaterial(orderId));
+        return returnMap;
+    }
+
+
+    /**
+     * 更新物资信息
+     * @param map
+     * @return
+     */
+    @Transactional
+    public int updateMaterialMes(Map<String, Object> map){
+        OmstruckOrderMaterial omstruckOrderMaterial = new OmstruckOrderMaterial();
+        omstruckOrderMaterial.setOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
+        omstruckOrderMaterial.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
+        omstruckOrderMaterial.setOrderMaterialNumber(DataChange.dataToBigDecimal(map.get("materialNum")));
+        omstruckOrderMaterial.setUpdateTime(new Date());
+        omstruckOrderMaterialMapper.updateMaterialMes(omstruckOrderMaterial);
+        omstruckOrderMaterialMapper.updateOutBoundResult(omstruckOrderMaterial);
+        return 1;
+    }
 }

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

@@ -779,7 +779,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
      */
     @Override
     @Transactional
-    public synchronized int driverReceiveOrRefuse(Map<String, Object> map) throws RuntimeException {
+    public  int driverReceiveOrRefuse(Map<String, Object> map) throws RuntimeException {
         BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
         OmstruckOrder omstruckOrder = new OmstruckOrder();
         if((Integer) map.get("orderReceiveStatus") == 1) {
@@ -799,7 +799,10 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 //发送计量委托
                 orderMessage.put("asd", 1);
                 orderMessage.put("orderId", orderId);
-                tmsTruckFeign.sendMeasureCommission(orderMessage);
+                Map<String, Object> mcMap = tmsTruckFeign.sendMeasureCommission(orderMessage);
+                if(!"200".equals(mcMap.get("code"))){
+                    throw new RuntimeException("委托发送失败!");
+                }
             }else if(orderType!=21){
                 //添加各个实绩
                 omstruckOrderSeparateService.addAllSonResult(orderMessage);
@@ -1985,7 +1988,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
             if(orderType == 2){
                 Integer judgeDate = omstruckOrderSeparateMapper.getDeliveryDate(orderMesMap.get("orderId"));
                 if(judgeDate == null){ // 数据为空则是已过截止日期 关闭订单
-//                    omstruckOrderMapper.closeTruckOrder(DataChange.dataToBigDecimal(orderMesMap.get("orderId")));
+                    omstruckOrderMapper.closeTruckOrder(DataChange.dataToBigDecimal(orderMesMap.get("orderId")));
                     continue;
                 }
             }

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

@@ -3500,6 +3500,9 @@
         <if test="status == 22">
             AND OO.ORDER_STATUS in (2, 4, 5, 6)
         </if>
+        <if test="status == 333">
+            AND OO.ORDER_STATUS in (4, 5)
+        </if>
     </select>
     <select id="getLoadForLoadCarResult" resultType="java.util.Map" parameterType="java.util.Map">
         select *

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

@@ -409,6 +409,7 @@
       #{item.orderMaterialId,jdbcType=DECIMAL}
     </foreach>
   </update>
+
   <delete id="batchDelete" parameterType="java.util.List">
     delete from OMSTRUCK_ORDER_MATERIAL
     where ORDER_MATERIAL_ID in
@@ -478,14 +479,24 @@
     OOM.MATERIAL_MEASSION "materialMeassion",
     RM.MATERIAL_MODEL "materialModel",
     RM.MATERIAL_NAME ||RM.MATERIAL_SPECIFICATION ||'('|| RM.MATERIAL_MODEL ||')'"materialName",
-    OOM.MATERIAL_ID  "materialId"
+    OOM.MATERIAL_ID  "materialId",
+    OOM.ORDER_MATERIAL_NUMBER   "materialNum"
     from OMSTRUCK_ORDER_MATERIAL OOM
     LEFT JOIN RMS_MATERIAL RM
     ON RM.MATERIAL_ID = OOM.MATERIAL_ID
     WHERE OOM.ORDER_ID = #{orderId}
   </select>
 
-  <!-- 批量删除物资子表 -->
+    <select id="getSteelOrderNumByCapacityNumber" parameterType="java.math.BigDecimal" resultType="java.util.Map">
+      select OO.ORDER_NUMBER    "orderNumber",
+             OO.ORDER_ID        "orderId"
+      from OMSTRUCK_ORDER OO
+      where OO.CAPACITY_ID = (select CAPACITY_ID from RMS_CAPACITY where CAPACITY_ID = #{capacityId})
+        and OO.ORDER_STATUS in (4, 5)
+        and OO.ORDER_TYPE = 1
+    </select>
+
+    <!-- 批量删除物资子表 -->
   <delete id="batchByOrderIdDelete" parameterType="java.util.List">
     delete from OMSTRUCK_ORDER_MATERIAL OOM
     where OOM.ORDER_ID in
@@ -502,4 +513,28 @@
       #{id}
     </foreach>
   </delete>
+
+  <update id="updateMaterialMes" parameterType="com.steerinfo.dil.model.OmstruckOrderMaterial">
+    update OMSTRUCK_ORDER_MATERIAL OOM
+    set
+        OOM.ORDER_MATERIAL_NUMBER = #{orderMaterialNumber},
+        OOM.UPDATE_TIME = #{updateTime}
+    where
+          OOM.ORDER_ID = #{orderId}
+      and OOM.MATERIAL_ID = #{materialId}
+  </update>
+
+  <update id="updateOutBoundResult" parameterType="com.steerinfo.dil.model.OmstruckOrderMaterial">
+    UPDATE WMSP_OUTBOUND_RESULT_MATERIAL WORM
+    SET WORM.MATERIAL_NUMBER = #{orderMaterialNumber}
+    WHERE WORM.RESULT_MATERIAL_ID = (
+      SELECT WORM.RESULT_MATERIAL_ID
+      FROM WMSP_OUTBOUND_RESULT WOR
+             LEFT JOIN WMSP_OUTBOUND_RESULT_MATERIAL WORM
+                       ON WORM.OUTBOUND_RESULT_ID = WOR.RESULT_ID
+             JOIN OMSTRUCK_ORDER OO
+                  ON OO.ORDER_ID = WOR.BILL_LADING_ID
+      WHERE OO.ORDER_ID = #{orderId}
+        AND WORM.MATERIAL_ID = #{materialId})
+  </update>
 </mapper>