修改提交

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.controller;
 
+import com.steerinfo.dil.mapper.StatisticalReportMapper;
 import com.steerinfo.dil.service.impl.StatisticalReportImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
@@ -689,6 +690,11 @@ public class StatisticalReportController extends BaseRESTfulController {
             map.put("consigneeNames","%" + consigneeName + "%");
         }
         if (saler != null && !"".equals(saler) && !"null".equals(saler)) {
+            //如果业务员登录进来,就去查询业务员所关联的片区
+            List<String> saleAreaRemark = statisticalReportService.getSaleAreaRemark(saler);
+            if(saleAreaRemark.size() > 0) {
+                map.put("saleAreaRemark",saleAreaRemark);
+            }
             map.put("salers",saler);
         }
         if (easPrimaryId != null && !"".equals(easPrimaryId) && !"null".equals(easPrimaryId)) {

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

@@ -13,6 +13,8 @@ import java.util.Map;
  */
 @Mapper
 public interface StatisticalReportMapper {
+
+
     //查询采购统计报表 (辅料、燃料、内转、化工材料)
     List<Map<String, Object>> getAllPurchaseFLRLReport(Map<String, Object> map);
 
@@ -96,4 +98,6 @@ public interface StatisticalReportMapper {
     //获得进出厂状态
     String getStatus(BigDecimal orderId);
 
+    List<String> getSaleAreaRemark(String saler);
+
 }

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

@@ -140,4 +140,6 @@ public interface TmstruckLeaveFactoryResultMapper extends IBaseMapper<TmstruckLe
 
     Map<String, Object> getUnloadResult(BigDecimal orderId);
 
+    List<Map<String, Object>> getOffSiteWarehouse(String orderNumber);
+
 }

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

@@ -89,5 +89,7 @@ public interface IStatisticalReportService {
 
     //获得是否进出厂的状态
     String getStatus(BigDecimal orderId);
+
+    List<String> getSaleAreaRemark(String saler);
 }
 

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

@@ -329,4 +329,9 @@ public class StatisticalReportImpl implements IStatisticalReportService {
     public String getStatus(BigDecimal orderId) {
         return statisticalReportMapper.getStatus(orderId);
     }
+
+    @Override
+    public List<String> getSaleAreaRemark(String saler) {
+        return statisticalReportMapper.getSaleAreaRemark(saler);
+    }
 }

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

@@ -481,5 +481,9 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
         return tmstruckLeaveFactoryResultMapper.getSporadicLeaveFactory(mapValue);
     }
 
+    public List<Map<String,Object>> getOffSiteWarehouse(String orderNumber) {
+        return tmstruckLeaveFactoryResultMapper.getOffSiteWarehouse(orderNumber);
+    }
+
 
 }

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

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

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

@@ -2080,9 +2080,6 @@
                     <if test="remark != null" >
                         and RSR.SALER_NAME || RCA.CAPACITY_NUMBER || RC.CONSIGNEE_COMPANY_NAME || R_CARRIER.CARRIER_ABBREVIATION || RM.MATERIAL_NAME || RM.MATERIAL_MODEL || RM.MATERIAL_SPECIFICATION LIKE #{remark}
                     </if>
-                    <if test="salers != null">
-                        and RSR.SALER_NAME = #{salers}
-                    </if>
                     <if test="easPrimaryId != null">
                         and ASM.EAS_PRIMARY_ID = #{easPrimaryId}
                     </if>
@@ -2099,6 +2096,11 @@
                         </if>
                     </foreach>
                     </if>
+                    <if test="saleAreaRemark != null">
+                        and <foreach collection="saleAreaRemark" item="item" open="(" separator="or" close=")">
+                        ASO.sale_remark like '%${item}%'
+                    </foreach>
+                    </if>
                     <if test="consigneeNames != null">
                         and RC.CONSIGNEE_COMPANY_NAME like #{consigneeNames}
                     </if>
@@ -2839,5 +2841,9 @@
         ON TLFR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
         WHERE OO.ORDER_ID=#{orderId}
     </select>
+    <select id="getSaleAreaRemark" resultType="java.lang.String" parameterType="string">
+        SELECT RSR.SALE_REMARK FROM RMS_SALER_REMAR RSR
+        WHERE RSR.SALER_NAME = #{saler}
+    </select>
 
 </mapper>

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

@@ -1390,4 +1390,57 @@
         ON TUR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         WHERE TTR.ORDER_ID = #{orderId}
     </select>
+    <select id="getOffSiteWarehouse" resultType="java.util.Map" parameterType="java.lang.String">
+        SELECT DISTINCT
+            OO.ORDER_ID "orderId",
+            ASM.MATERIAL_NUMBER || '件' "materialNum",
+            RC.CONSIGNEE_COMPANY_NAME "companyName",
+            RS.SHIPPER_NAME "shipperName",
+            RCA.CAPACITY_NUMBER "capacityNo",
+            RM.MATERIAL_ID "materialId",
+            RM.MATERIAL_NAME "materialName",
+            RM.MATERIAL_MODEL "materialModel",
+            RM.MATERIAL_SPECIFICATION   "materialSpecification",
+            OO.ORDER_NUMBER "orderNo",
+            RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN || RRP.ADDRESS_DELIVERY_ADDRESS AS "addressPlace",
+            TLFR.RESULT_OUT_GATE_TIME "outGateTime",
+            ASO.sale_remark "saleRemark" ,
+            sysdate "sendTime",
+            '汽运' "transportType",
+            '四川省达州市通川区' "shipperAddress",
+            ASM.IS_POUND_SALE "isPoundSale",
+            (case when
+                      ASM.IS_POUND_SALE = 1
+                      then asm.MATERIAL_WEIGHT
+                  else
+                      TWR.RESULT_NET_WEIGHT
+                end) || '吨' "netWeight"
+
+        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 RMS_SALE_AREA RSA ON RSA.AREA_ID = RC.AREA_ID
+                LEFT JOIN RMS_SALER RSR ON RSR.SALER_ID = ASO.SALER_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 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
+                AND NVL( OO.ORDER_TYPE, 0 ) IN ( 0, 1 )
+                LEFT JOIN RMS_CAPACITY RCA ON RCA.CAPACITY_ID = OO.CAPACITY_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.RESULT_TOTAL_ID
+                AND TWR.MATERIAL_ID = RM.MATERIAL_ID
+                LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        WHERE
+            ASO.SALE_TYPE = 1
+          AND ASO.DELETED = 0
+          AND ASM.SALE_MATERIAL_ID IS NOT NULL
+          AND TWR.RESULT_NET_WEIGHT IS NOT NULL
+          AND oo.order_number = #{orderNumber}
+    </select>
 </mapper>