tj

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

@@ -58,7 +58,7 @@ public class StatisticalReportController extends BaseRESTfulController {
         return success(pageList);
     }
 
-    @ApiOperation(value="查询辅料燃料统计报表")
+    @ApiOperation(value="查询销售统计报表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId(423)", value = "动态表头", required = false, dataType = "Integer"),

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

@@ -70,7 +70,6 @@ public class StatisticalReportImpl implements IStatisticalReportService {
      */
     @Override
     public List<Map<String, Object>> getAllSaleReport(Map<String, Object> map) {
-        System.out.println(statisticalReportMapper.getAllSaleReport(map));
         List<Map<String, Object>> mapList = statisticalReportMapper.getAllSaleReport(map);
         for (Map<String, Object> mesMap : mapList) {
             calculateDifferenceTime(mesMap);

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

@@ -241,6 +241,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
                 break;
             case 12:
             case 13:
+            case 16:
             case 15:
                 //无法确定汽车衡
                 HashMap<String, Object> calculateMap1213 = new HashMap<>();
@@ -259,7 +260,11 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
                 Integer materialId = utilsMapper.getLxFirstMaterialId(DataChange.dataToBigDecimal(map.get("orderId")));
                 map.put("materialId", materialId);
                 checkMeasureCommission += tmstruckMeasureCommissionService.addLXMeasureCommission(map);
+<<<<<<< HEAD
 
+=======
+            
+>>>>>>> a082ab0bd9cb789ae91ca4beee53c86183d90b93
 
         }
 

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

@@ -127,8 +127,8 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
             case 13:
                 return tmstruckWeightResultMapper.getFactorySkinSporadicJIPi(map); //apiId=401
             case 15:
-                return tmstruckWeightResultMapper.getFactorySkinSporadicWeight(map); //apiId=401
             case 16:
+                return tmstruckWeightResultMapper.getFactorySkinSporadicWeight(map); //apiId=401
         }
         return null;
     }

src/main/resources/bootstrap.yml

@@ -1,7 +1,7 @@
 api.version: api/v1/truckTms
 spring:
   profiles:
-    include: ${SPRING_PROFILES:prod}
+    include: ${SPRING_PROFILES:dev
   jackson:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8

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

@@ -313,7 +313,7 @@
             join RMS_CARRIER RCA
             on RCA.CARRIER_ID = RC.CARRIER_ID
         </if>
-        where OO.ORDER_TYPE = 12
+        where OO.ORDER_TYPE in (12,15)
         <if test="carrierSsoId != null">
             and RCA.CARRIER_SSO_ID = #{carrierSsoId}
         </if>
@@ -442,7 +442,7 @@
             join RMS_CARRIER RCA
             on RCA.CARRIER_ID = RC.CARRIER_ID
         </if>
-        where OO.ORDER_TYPE = 13
+        where OO.ORDER_TYPE in (13,16)
         <if test="carrierSsoId != null">
             and RCA.CARRIER_SSO_ID = #{carrierSsoId}
         </if>

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

@@ -1502,7 +1502,7 @@
         left join OMSTRUCK_ORDER OO
         on TTR.ORDER_ID = OO.ORDER_ID
         left join OMSTRUCK_ORDER_MATERIAL OOM
-        on OOM.ORDER_ID=OOM.ORDER_ID
+        on OOM.ORDER_ID=OO.ORDER_ID
         left join RMS_MATERIAL RM
         on RM.MATERIAL_ID = OOM.MATERIAL_ID
         left join AMSTRUCK_SPORADIC_ORDER ASO

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

@@ -944,7 +944,7 @@
         LEFT JOIN RMS_WAREHOUSE RW
         ON RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
         WHERE TUR.RESULT_END_TIME IS NOT NULL
-        AND OO.ORDER_TYPE in (12,15,16,13)
+        AND OO.ORDER_TYPE = #{orderTypee}
         )
         <where>
             <if test="orderNumber != null">

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

@@ -2214,7 +2214,11 @@
         left join RMS_TRUCK_CALCULATE RTC
         on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_ID
         where RESULT_GROSS_WEIGHT_TIME is not null and
+<<<<<<< HEAD
         OO.ORDER_TYPE = #{orderType}
+=======
+        OO.ORDER_TYPE = #{orderTypee}
+>>>>>>> a082ab0bd9cb789ae91ca4beee53c86183d90b93
         )
         <where>
             <if test="purchaseOrderNo != null">
@@ -2403,7 +2407,7 @@
         on OOM.ORDER_ID = OO.ORDER_ID
         left join RMS_MATERIAL RM
         on RM.MATERIAL_ID = OOM.MATERIAL_ID
-        where RESULT_TARE_WEIGHT_TIME is not null and OO.ORDER_TYPE in (15,16)
+        where RESULT_TARE_WEIGHT_TIME is not null and OO.ORDER_TYPE = #{orderTypee}
         )
         <where>
             <if test="purchaseOrderNo != null">