'一体机'

pom.xml

@@ -148,10 +148,6 @@
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
                         <param>TMSTRUCK_ENFACTORY_RESULT</param>
-                        <param>TMSTRUCK_LOAD_RESULT</param>
-                        <param>TMSTRUCK_LEAVE_FACTORY_RESULT</param>
-                        <param>TMSTRUCK_UNLOAD_RESULT</param>
-                        <param>TMSTRUCK_WEIGHT_RESULT</param>
                     </tables>
                 </configuration>
                 <executions>

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

@@ -46,7 +46,7 @@ public class TmstruckEnfactoryResultController extends BaseRESTfulController {
     @ApiOperation(value="查询所有的进厂实绩")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(210)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId(220)", value = "动态表头", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),

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

@@ -0,0 +1,45 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.service.impl.TmstruckSelfMachineService;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * @author luobang
+ * @create 2021-11-17 20:32
+ */
+@RestController
+@RequestMapping("/${api.version}/selfMachine")
+public class TmstruckSelfMachineController extends BaseRESTfulController {
+
+    @Autowired
+    TmstruckSelfMachineService tmstruckSelfMachineService;
+
+    /**
+     * 提货单
+     * @param orderNumber
+     * @return
+     */
+    @PostMapping("/getBillOrder")
+    public Map<String, Object> getBILLOrder(@RequestParam String orderNumber){
+       Map<String,Object>map= tmstruckSelfMachineService.getBillOrder(orderNumber);
+       return map;
+    }
+
+    @PostMapping("/getDeliveryOrder")
+    public Map<String,Object>getDeliveryOrder(String orderNumber){
+        Map<String,Object>map=tmstruckSelfMachineService.getDeliveryOrder(orderNumber);
+        return map;
+    }
+//    public static void main(String[] args) {
+//            TmstruckSelfMachineController tmstruckSelfMachineController = new TmstruckSelfMachineController();
+//        Map<String, Object> wysdd2021091000000002 = tmstruckSelfMachineController.getBILLOrder("WYSDD2021091000000002");
+//        System.out.println(wysdd2021091000000002);
+//    }
+}

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

@@ -28,5 +28,5 @@ public interface OmsFeign {
 
     //远程调用推送websocket
     @PostMapping("api/v1/oms/omstruckorderseparates/pushMesToWebsocket")
-    void pushMesToWebsocket(@RequestBody(required = false) Map<String, Object> map);
+    RESTfulResult pushMesToWebsocket(@RequestBody(required = false) Map<String, Object> map);
 }

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

@@ -53,4 +53,8 @@ public interface TmstruckEnfactoryResultMapper extends IBaseMapper<TmstruckEnfac
 
     // APP通过运输订单id查询进厂实绩
     List<Map<String, Object>> getEnfactoryMessageByOrderId(String orderNumber);
+
+    Map<String, Object> getBillOrder(String orderNumber);
+
+    List<Map<String, Object>> getBillOrderMaterial(String orderNumber);
 }

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

@@ -46,4 +46,9 @@ public interface TmstruckLeaveFactoryResultMapper extends IBaseMapper<TmstruckLe
 
     //
     List<Map<String, Object>> getLeaveFactoryList(String orderNumber);
+
+
+    Map<String, Object> getDeliveryOrder(String orderNumber);
+
+    List<Map<String,Object>> getDeliveryOrderMaterial(String orderNumber);
 }

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

@@ -0,0 +1,16 @@
+package com.steerinfo.dil.service;
+
+import java.util.Map;
+
+/**
+ * @author luobang
+ * @create 2021-11-17 20:58
+ */
+public interface ITmstruckSelfMachineService {
+    /*
+    提货单信息
+     */
+    Map<String, Object> getBillOrder(String orderNumber);
+
+    Map<String, Object> getDeliveryOrder(String orderNumber);
+}

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

@@ -212,7 +212,8 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
         int i = 0;
         //通过运输订单号查询订单类型
         String orderNumber = (String) map.get("orderNumber");
-        map.putAll(tmstruckEnfactoryResultMapper.selectEnFactoryResultId(orderNumber));
+        String subString = orderNumber.substring(0,orderNumber.length() - 1);
+        map.putAll(tmstruckEnfactoryResultMapper.selectEnFactoryResultId(subString));
         BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderTypee"));
         switch (orderType.intValue()){
             case 1:
@@ -234,6 +235,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
                 break;
             case 11:
         }
+        omsFeign.pushMesToWebsocket(map);
         return i;
     }
 

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

@@ -0,0 +1,51 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.dil.mapper.TmstruckEnfactoryResultMapper;
+import com.steerinfo.dil.mapper.TmstruckLeaveFactoryResultMapper;
+import com.steerinfo.dil.service.ITmstruckSelfMachineService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author luobang
+ * @create 2021-11-17 20:59
+ */
+@Service
+public class TmstruckSelfMachineService implements ITmstruckSelfMachineService {
+
+    @Autowired
+    TmstruckEnfactoryResultMapper tmstruckEnfactoryResultMapper;
+
+    @Autowired
+    TmstruckLeaveFactoryResultMapper tmstruckLeaveFactoryResultMapper;
+
+    /**
+     * 提货单信息
+     * @param orderNumber
+     * @return
+     */
+    @Override
+    public Map<String, Object> getBillOrder(String orderNumber) {
+
+        //1.根据运输订单号查询主干信息
+
+        Map<String,Object>map=tmstruckEnfactoryResultMapper.getBillOrder(orderNumber);
+
+        //2.根据运输订单号查询枝叶信息-物资
+
+        List<Map<String,Object>>list=tmstruckEnfactoryResultMapper.getBillOrderMaterial(orderNumber);
+        map.put("materialList",list);
+        return map;
+    }
+
+    @Override
+    public Map<String, Object> getDeliveryOrder(String orderNumber) {
+        Map<String,Object> map = tmstruckLeaveFactoryResultMapper.getDeliveryOrder(orderNumber);
+        List<Map<String, Object>> deliveryOrderMaterialList = tmstruckLeaveFactoryResultMapper.getDeliveryOrderMaterial(orderNumber);
+        map.put("deliveryOrderMaterialList",deliveryOrderMaterialList);
+        return map;
+    }
+}

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

@@ -1168,6 +1168,59 @@
             </if>
         </where>
         <include refid="orderByEnterTime"></include>
+    </select>
 
+    <select id="getBillOrder" parameterType="java.lang.String" resultType="java.util.Map">
+        select
+            oo.order_number "orderNumber",
+            rc.capacity_number "capacityNumber",
+            rce.consignee_company_name "consigeeName",
+            rcr.carrier_name "carrierName",
+            TO_CHAR(SYSDATE,'YYYY-MM-DD') "billDate"
+        from omstruck_order oo
+                 left join
+             rms_capacity rc
+             on
+                 rc.capacity_id = oo.capacity_id
+                 left join
+             ams_sale_order_material asom
+             on
+                 asom.sale_order_material_id = oo.order_plan_id
+                 left join
+             ams_sale_order aso
+             on
+                 aso.sale_order_id = asom.sale_order_id
+                 left join
+             rms_consignee rce
+             on
+                 rce.consignee_id = aso.receive_id
+                 left join
+             ams_dispatch_sale_order adso
+             on
+                 adso.sale_order_material_id = asom.sale_order_material_id
+                 left join
+             rms_carrier rcr
+             on
+                 rcr.carrier_id = adso.carrier_id
+        where oo.order_number = #{orderNumber}
+    </select>
+
+    <select id="getBillOrderMaterial" parameterType="java.lang.String" resultType="java.util.Map" >
+        select
+            rm.material_name "materialName",
+            rm.material_specification "materialSpe",
+            rm.material_model "materialModel",
+            oom.order_material_number "materialNumber",
+            oom.order_material_weight "materialWeight"
+        from omstruck_order oo
+                 left join
+             omstruck_order_material oom
+             on
+                 oom.order_id = oo.order_id
+                 left join
+             rms_material rm
+             on
+                 rm.material_id = oom.order_material_id
+        where oo.order_number = #{orderNumber}
     </select>
 </mapper>

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

@@ -1058,4 +1058,85 @@
         </where>
         <include refid="orderByOutTime"></include>
     </select>
+
+    <select id="getDeliveryOrder" parameterType="java.lang.String" resultType="java.util.Map">
+        select
+            aso.sale_number "saleNo" ,
+            oo.order_number "orderNumber",
+            rc.capacity_number "capacityNumber",
+            rce.consignee_company_name "consigeeName",
+            rcr.carrier_name "carrierName",
+            rca.address_province "province",
+            rca.address_district "district",
+            rca.address_town "town",
+            rca.address_delivery_address "deliveryAddress",
+            asom.sale_order_consignee "consignee",
+            asom.sale_order_consignee_tel "consigneeTel",
+            asom.sale_date_of_receipt "receiptDate",
+            sysdate "sendDate"
+
+        from omstruck_order oo
+                 left join
+             rms_capacity rc
+             on
+                 rc.capacity_id = oo.capacity_id
+                 left join
+             ams_sale_order_material asom
+             on
+                 asom.sale_order_material_id = oo.order_plan_id
+                 left join
+             ams_sale_order aso
+             on
+                 aso.sale_order_id = asom.sale_order_id
+                 left join
+             rms_consignee rce
+             on
+                 rce.consignee_id = aso.receive_id
+                 left join
+             ams_dispatch_sale_order adso
+             on
+                 adso.sale_order_material_id = asom.sale_order_material_id
+                 left join
+             rms_carrier rcr
+             on
+                 rcr.carrier_id = adso.carrier_id
+                 left join
+             rms_receive_address rca
+             on
+                 rca.address_id = asom.sale_shipping_address_id
+        where oo.order_number =#{orderNumber}
+    </select>
+
+    <select id="getDeliveryOrderMaterial" parameterType="java.lang.String" resultType="java.util.LinkedHashMap">
+        select
+            rm.material_name "materialName",
+            rm.material_specification "materialSpe",
+            rm.material_model "materialModel",
+            oom.order_material_number "materialNumber",
+            oom.order_material_weight "materialWeight",
+            ruom.unit_of_measure_name "measureName",
+            twr.RESULT_NET_WEIGHT "resultWeight"
+        from omstruck_order oo
+                 left join
+             omstruck_order_material oom
+             on
+                 oom.order_id = oo.order_id
+                 left join
+             rms_material rm
+             on
+                 rm.material_id = oom.order_material_id
+                 left join
+             rms_unit_of_measure ruom
+             on
+                 ruom.unit_of_measure_id = rm.unit_of_measure_id
+            left join
+            TMSTRUCK_TOTAL_RESULT ttr
+            on ttr.ORDER_ID = oo.ORDER_ID
+                left  join
+            TMSTRUCK_WEIGHT_RESULT twr
+            on
+                 twr.RESULT_TOTAL_ID =   ttr.ORDER_ID
+            and twr.MATERIAL_ID = oom.MATERIAL_ID
+        where oo.order_number = #{orderNumber}
+    </select>
 </mapper>

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

@@ -537,10 +537,8 @@
         on OOM.ORDER_ID = OO.ORDER_ID
         left join RMS_MATERIAL RM
         on OOM.MATERIAL_ID = RM.MATERIAL_ID
-        left join RMS_DRIVER_CAPACITY RDC
-        on RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
         left join RMS_CAPACITY RC
-        on RC.CAPACITY_ID = RDC.CAPACITY_ID
+        on RC.CAPACITY_ID = OO.CAPACITY_ID
         left join RMS_WAREHOUSE RW
         on RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
         where RESULT_START_TIME is not null and OO.ORDER_TYPE = #{orderTypee}