tgaisjd

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

@@ -749,40 +749,21 @@ public class StatisticalReportController extends BaseRESTfulController {
     public RESTfulResult getInwardSaleSteelOrder(@RequestBody(required=false) Map<String,Object> map,
                                                   String startTime,
                                                   String endTime,
-                                                  String carrierSsoId,
-                                                  String receiveName,
-                                                  String materialName,
-                                                  String specification,
                                                   String remark,
                                                   String capacityNo,
-                                                  String carrierName,
-                                                  String consigneeName,
-                                                  String saler
+                                                  String consigneeName
+
     ){
         DataChange.queryDataByDateTimeYestDay(startTime, endTime, map, sdfDateTime);//根据时间段查询数据
-        if(carrierSsoId != null){
-            if(!"null".equals(carrierSsoId) && carrierSsoId != null){
-                map.put("carrierSsoId", carrierSsoId);
-            }
-        }
-        if (receiveName != null && !"null".equals(receiveName)) {
-            map.put("receivName","%" + receiveName + "%");
-        }
         if (remark != null && !"".equals(remark) && !"null".equals(remark)) {
             map.put("remark","%" + remark + "%");
         }
         if (capacityNo != null && !"".equals(capacityNo) && !"null".equals(capacityNo)) {
             map.put("capacityNum","%" + capacityNo + "%");
         }
-        if (carrierName != null && !"".equals(carrierName) && !"null".equals(carrierName)) {
-            map.put("carrierNames","%" + carrierName + "%");
-        }
         if (consigneeName != null && !"".equals(consigneeName) && !"null".equals(consigneeName)) {
             map.put("consigneeNames","%" + consigneeName + "%");
         }
-        if (saler != null && !"".equals(saler) && !"null".equals(saler)) {
-            map.put("salers",saler);
-        }
         //分页数据
         List<Map<String, Object>> report = statisticalReportService.getInwardSaleSteelOrder(map);
         return success(report);

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

@@ -89,7 +89,7 @@ public class TmstruckWeightResultController extends BaseRESTfulController {
         if (orderType!=null) {
             mapValue.put("orderTypee", orderType);
         }
-        if (con!=null&&!"null".equals(con)){
+        if (con!=null&&!"null".equals(con)&&!"".equals(con)){
             mapValue.put("con",con);
         }
         if (userId!=null){

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

@@ -329,7 +329,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
             String warehouseName = utilsMapper.queryWarehouseName(DataChange.dataToBigDecimal(map.get("warehouseId")));
             map.put("warehouseName",warehouseName);
         }
-//        int i = tmstruckMeasureCommissionService.addMeasureCommissionForLoding(map);
+        i =  tmstruckMeasureCommissionService.addMeasureCommissionForLoding(map);
         return 1;
     }
 

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

@@ -599,7 +599,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         }else{
             System.out.println("委托发送失败：" + jsonData);
         }
-        return 0;
+        return 1;
     }
 
 

src/main/resources/application-dev.yml

@@ -34,18 +34,18 @@ openfeign:
   WmshBoundFeign:
     url: ${WMSHBOUNDFEIGN_URL:172.16.33.166:8013}
   WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.33.166:8012}
+    url: ${WMSFEIGN_URL:localhost:8012}
   OmsFeign:
-    url: ${OMSFEIGN_URL:172.16.33.166:8016}
+    url: ${OMSFEIGN_URL:localhost:8016}
   JoinFeign:
-    url: ${JOINFEIGN_URL:172.16.33.166:8006}
+    url: ${JOINFEIGN_URL:localhost:8006}
   QmsFeign:
-    url: ${QMSFEIGN_URL:172.16.33.166:8017}
+    url: ${QMSFEIGN_URL:localhost:8017}
   ImFeign:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.166:8015}
+    url: ${AMSFEIGN_URL:localhost:8015}
   OTMSFeign:
     url: ${OTMSFEIGN_URL:172.16.33.166:8038}
 server:
-  port: 8088
+  port: 8008

src/main/resources/application-prod.yml

@@ -29,13 +29,13 @@ openfeign:
   BmsShipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
   BmsTruckFeign:
-    url: ${BMSTRUCKFEIGN_URL:172.16.33.166:8076}
+    url: ${BMSTRUCKFEIGN_URL:localhost:8076}
   WmshBoundFeign:
     url: ${WMSHBOUNDFEIGN_URL:172.16.33.166:8070}
   WMSFeign:
-    url: ${WMSFEIGN_URL:172.16.33.166:8093}
+    url: ${WMSFEIGN_URL:localhost:8093}
   OmsFeign:
-    url: ${OMSFEIGN_URL:172.16.33.166:8095}
+    url: ${OMSFEIGN_URL:localhost:8095}
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.166:8066}
   QmsFeign:

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

@@ -2255,59 +2255,74 @@
     </select>
 
     <select id="getInwardSaleSteelOrder" resultType="java.util.Map">
-        SELECT DISTINCT
-               ASO.SALE_ORDER_ID "saleOrderId",
-               ASM.SALE_MATERIAL_ID "saleMaterialId",
-               ASO.SALE_NUMBER "saleOrderNo",
-               ASM.MATERIAL_NUMBER "materialNum",
-               ASM.EAS_PRIMARY_ID "closeEntryId",
-               ASM.DELETED "deletedStatus",
-               RM.MATERIAL_ID "materialId",
-               RM.MATERIAL_NAME "materialName",
-               RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "materialSpe",
-               RAS.ARRIVAL_NAME "sendStationName",
-               RAS2.ARRIVAL_NAME "toTheStationName",
-               TPAR.SEND_STATION_ID "sendStationId",
-               ASM.MATERIAL_WEIGHT "materialWeight",
-               rc.CONSIGNEE_COMPANY_NAME "consigneeName",
-               RS.SHIPPER_NAME "shipperName",
-               r_cap.capacity_id "capacityId",
-               r_cap.capacity_number "capacityNo",
-               r_carrier.carrier_id "carrierId",
-               r_carrier.carrier_name "carrierName",
-               oo.ORDER_ID "orderId",
-               NVL(r_carrier.carrier_id,0) "carrierIds",
-               NVL(r_cap.capacity_id,0) "capacityIds"
-        FROM AMS_SALE_ORDER ASO
-                 LEFT JOIN AMS_SALE_MATERIAL ASM
-                           ON ASO.SALE_ORDER_ID = ASM.SALE_ORDER_ID
-                 LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
-                           ON ASTM.MATERIAL_ID = ASM.SALE_MATERIAL_ID
-                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
-                           ON ASOM.SALE_ORDER_MATERIAL_ID = ASTM.SALE_ORDER_MATERIAL_ID
-                 LEFT JOIN RMS_MATERIAL rm
-                           ON rm.MATERIAL_ID = ASM.MATERIAL_ID
-                 left join TMSTRAIN_PLEASE_APPROVE_RESULT TPAR
-                           ON TPAR.RAIL_PLAN_ID = ASO.SALE_ORDER_ID
-                 LEFT JOIN RMSTRAIN_ARRIVAL_SEND RAS
-                           ON RAS.ARRIVAL_ID = TPAR.SEND_STATION_ID
-                 LEFT JOIN RMSTRAIN_ARRIVAL_SEND RAS2
-                           ON RAS.ARRIVAL_ID = TPAR.TO_THE_STATION_ID
-                 left join RMS_CONSIGNEE RC
-                           ON ASO.receive_id = RC.CONSIGNEE_ID
-                 left join RMS_SHIPPER RS
-                           ON RS.SHIPPER_ID = ASO.SHIPPER_ID
-                 left join omstruck_order oo
-                           on oo.order_plan_id = asom.sale_order_material_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 rms_capacity r_cap
-                           on r_cap.capacity_id = oo.capacity_id
-        WHERE ASO.SALE_TYPE = 4
-          AND ASO.DELETED = 0
-        order by oo.ORDER_ID desc
+        SELECT * FROM (SELECT DISTINCT
+                           ASO.SALE_ORDER_ID "saleOrderId",
+                           ASM.SALE_MATERIAL_ID "saleMaterialId",
+                           ASO.SALE_NUMBER "saleOrderNo",
+                           ASM.MATERIAL_NUMBER "materialNum",
+                           ASM.EAS_PRIMARY_ID "closeEntryId",
+                           ASM.DELETED "deletedStatus",
+                           RM.MATERIAL_ID "materialId",
+                           RM.MATERIAL_NAME "materialName",
+                           RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "materialSpe",
+                           RAS.ARRIVAL_NAME "sendStation",
+                           RAS2.ARRIVAL_NAME "toTheStation",
+                           TPAR.SEND_STATION_ID "sendStationId",
+                           ASM.MATERIAL_WEIGHT "materialWeight",
+                           rc.CONSIGNEE_COMPANY_NAME "consigneeName",
+                           RS.SHIPPER_NAME "shipperName",
+                           r_cap.capacity_id "capacityId",
+                           r_cap.capacity_number "capacityNo",
+                           r_carrier.carrier_id "carrierId",
+                           r_carrier.carrier_name "carrierName",
+                           oo.ORDER_ID "orderId",
+                           NVL( r_carrier.carrier_id, 0 ) "carrierIds",
+                           NVL( r_cap.capacity_id, 0 ) "capacityIds",
+                           RISWINDEP.INWARD_WAREHOUSE_NAME "transInDep",
+                           RISWOUTDEP.INWARD_WAREHOUSE_NAME "transOutDep",
+                           RISWINOF.INWARD_WAREHOUSE_NAME "transInWarehouse"
+                       FROM
+                           AMS_SALE_ORDER ASO
+                               LEFT JOIN AMS_SALE_MATERIAL ASM ON ASO.SALE_ORDER_ID = ASM.SALE_ORDER_ID
+                               LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM ON ASTM.MATERIAL_ID = ASM.SALE_MATERIAL_ID
+                               LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_MATERIAL_ID = ASTM.SALE_ORDER_MATERIAL_ID
+                               LEFT JOIN RMS_MATERIAL rm ON rm.MATERIAL_ID = ASM.MATERIAL_ID
+                               LEFT JOIN TMSTRAIN_PLEASE_APPROVE_RESULT TPAR ON TPAR.RAIL_PLAN_ID = ASM.SALE_MATERIAL_ID
+                               LEFT JOIN RMSTRAIN_ARRIVAL_SEND RAS ON RAS.ARRIVAL_ID = TPAR.SEND_STATION_ID
+                               LEFT JOIN RMSTRAIN_ARRIVAL_SEND RAS2 ON RAS.ARRIVAL_ID = TPAR.TO_THE_STATION_ID
+                               LEFT JOIN RMS_CONSIGNEE RC ON ASO.receive_id = RC.CONSIGNEE_ID
+                               LEFT JOIN RMS_SHIPPER RS ON RS.SHIPPER_ID = ASO.SHIPPER_ID
+                               LEFT JOIN omstruck_order oo ON oo.order_plan_id = asom.sale_order_material_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 = 3642
+                               LEFT JOIN rms_capacity r_cap ON r_cap.capacity_id = oo.capacity_id
+                               LEFT JOIN RMS_INWARD_STEEL_WAREHOUSE RISWINDEP ON RISWINDEP.INWARD_WAREHOUSE_CODE = ASO.TRANSFER_IN_DEP
+                               LEFT JOIN RMS_INWARD_STEEL_WAREHOUSE RISWOUTDEP ON RISWOUTDEP.INWARD_WAREHOUSE_CODE = ASO.TRANSFER_OUT_DEP
+                               LEFT JOIN RMS_INWARD_STEEL_WAREHOUSE RISWINOF ON RISWINOF.INWARD_WAREHOUSE_CODE = ASM.TRANSFER_IN_OF_WAREHOUSE
+                       WHERE
+                           ASO.SALE_TYPE = 4
+                         AND ASO.DELETED = 0
+        <if test="oneDate != null">
+            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = ASO.INSERT_TIME
+        </if>
+        <if test="carrierSsoId != null">
+            and R_CARRIER.CARRIER_SSO_ID = #{carrierSsoId}
+        </if>
+        <if test="startDate != null">
+            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  ASO.INSERT_TIME
+            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >=  ASO.INSERT_TIME
+        </if>
+        <if test="remark != null" >
+            and  RM.MATERIAL_NAME || RM.MATERIAL_MODEL || RM.MATERIAL_SPECIFICATION LIKE #{remark}
+        </if>
+        <if test="capacityNum != null">
+            and  r_cap.capacity_number like #{capacityNum}
+        </if>
+        <if test="consigneeNames != null">
+            and RC.CONSIGNEE_COMPANY_NAME like #{consigneeNames}
+        </if>
+        ORDER BY
+        oo.ORDER_ID DESC)
     </select>
 
 </mapper>

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

@@ -1472,7 +1472,8 @@
 
     SELECT *
     FROM (
-    SELECT RM.MATERIAL_NAME           "materialName",
+    SELECT
+    distinct RM.MATERIAL_NAME           "materialName",
     OO.ORDER_NUMBER            "orderNumber",
     RC.CAPACITY_NUMBER         "capacityNumber",
     OOM.ORDER_MATERIAL_NUMBER  "orderMaterialNumber",

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

@@ -878,7 +878,9 @@
     <select id="getInFactoryUnloadResult" parameterType="java.util.Map" resultType="java.util.Map">
         SELECT *
         FROM (
-        SELECT TUR.RESULT_ID             "resultId",
+        SELECT
+               distinct
+               TUR.RESULT_ID             "resultId",
         OO.ORDER_NUMBER || RC.CAPACITY_NUMBER || RW.WAREHOUSE_NAME || RM.MATERIAL_NAME "mohu",
         OO.ORDER_NUMBER           "orderNumber",
         RC.CAPACITY_NUMBER        "capacityNumber",