Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API

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

@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -32,6 +33,16 @@ public class TmstruckSelfMachineController extends BaseRESTfulController {
        return map;
     }
 
+    /**
+     * 打印提货单
+     * @param orderNumber
+     * @return
+     */
+    @PostMapping("/getBillOrderForPrinter")
+    public List<Map<String, Object>> getBillOrderForPrinter(@RequestParam String orderNumber){
+        return tmstruckSelfMachineService.getBillOrderForPrinter(orderNumber);
+    }
+
     /**
      * 送货单
      * @param orderNumber

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

@@ -56,6 +56,8 @@ public interface TmstruckEnfactoryResultMapper extends IBaseMapper<TmstruckEnfac
 
     Map<String, Object> getBillOrder(String orderNumber);
 
+    List<Map<String, Object>> getBillOrderForPrinter(String orderNumber);
+
     List<Map<String, Object>>getBillOrderMaterial(String orderNumber);
 
      //通过运输订单获取零星物资进厂实绩

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.service;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -13,4 +14,6 @@ public interface ITmstruckSelfMachineService {
     Map<String, Object> getBillOrder(String orderNumber);
 
     Map<String, Object> getDeliveryOrder(String orderNumber);
+
+    List<Map<String, Object>> getBillOrderForPrinter(String orderNumber);
 }

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

@@ -39,6 +39,10 @@ public class TmstruckSelfMachineService implements ITmstruckSelfMachineService {
         }
         return map;
     }
+    @Override
+    public List<Map<String, Object>> getBillOrderForPrinter(String orderNumber) {
+        return tmstruckEnfactoryResultMapper.getBillOrderForPrinter(orderNumber);
+    }
 
     @Override
     public Map<String, Object> getDeliveryOrder(String orderNumber) {

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

@@ -1500,5 +1500,56 @@
                            ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
         WHERE OO.ORDER_ID = #{orderId}
     </select>
+    <select id="getBillOrderForPrinter" resultType="java.util.Map">
+        SELECT distinct
+            OO.ORDER_NUMBER "orderNumber",
+            R_CARRIER.CARRIER_NAME "carrierName",
+            RCA.CAPACITY_NUMBER "capacityNumber",
+            RM.MATERIAL_NAME || ' ' || RW.WAREHOUSE_NAME || ' ' || ASM.STEEL_METER || '米'  "materialName",
+            RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "materialSpe",
+            ASM.STEEL_METER "steelMeter",
+            ASM.MATERIAL_NUMBER "materialNum",
+            RS.SHIPPER_NAME "shipperName",
+            RC.CONSIGNEE_COMPANY_NAME "consigneeName",
+            ASOM.SALE_ORDER_CONSIGNEE_TEL "consigneeTel",
+            RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT ||
+            RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS AS "addressPlace",
+            ASOM.SALE_DATE_OF_RECEIPT "deadLine",
+            TO_CHAR( SYSDATE, 'YYYY-MM-DD' ) "billDate",
+            OO.DRIVER_TEL "capacityTel"
+        FROM AMS_SALE_ORDER ASO
+                 LEFT JOIN RMS_CONSIGNEE RC
+                           ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
+                 LEFT JOIN RMS_SHIPPER RS
+                           ON RS.SHIPPER_ID = ASO.SHIPPER_ID
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
+                 LEFT JOIN RMS_RECEIVE_PLACE RRP
+                           ON RRP.PLACE_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
+                 LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+                           ON RRA.ADDRESS_ID = RRP.ADDRESS_ID
+                 LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO
+                           ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                 LEFT JOIN RMS_CARRIER R_CARRIER
+                           ON R_CARRIER.CARRIER_ID = ADSO.CARRIER_ID
+                 LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+                           ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                 LEFT JOIN AMS_SALE_MATERIAL ASM
+                           ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
+                 LEFT JOIN RMS_MATERIAL RM
+                           ON RM.MATERIAL_ID = ASM.MATERIAL_ID
+                 LEFT JOIN OMSTRUCK_ORDER OO
+                           ON OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                 LEFT JOIN RMS_CAPACITY RCA
+                           ON RCA.CAPACITY_ID = OO.CAPACITY_ID
+                 LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
+                           ON OOM.ORDER_ID=OO.ORDER_ID
+                 LEFT JOIN RMS_WAREHOUSE RW
+                           ON OOM.MATERIAL_PRIORITY = RW.WAREHOUSE_ID
+        WHERE
+            oo.order_number = #{orderNumber}
+          --and oo.ORDER_STATUS = 5
+          --and oo.ORDER_PRINT_STATUS is null
+    </select>
 
 </mapper>