adakjf

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

@@ -417,6 +417,42 @@ public class StatisticalReportController extends BaseRESTfulController {
         return success(pageList);
     }
 
+    @ApiOperation(value="查询该组织机构下的厂外进厂内转")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId", value = "s", 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"),
+    })
+    @PostMapping("/getOutFactoryInwardList")
+    public RESTfulResult getOutFactoryInwardList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                       Integer apiId,
+                                       Integer pageNum,
+                                       Integer pageSize,
+                                       String startTime,
+                                       String endTime,
+                                       String orgCode,
+                                       String isPage,
+                                       String index
+    ){
+        if (index!=null&&!"null".equals(index)){
+            mapValue.put("index",index);
+        }
+        if (orgCode!=null&&!"null".equals(orgCode)){
+            mapValue.put("orgCode",orgCode);
+        }
+        DataChange.queryDataByDateTime(startTime, endTime, mapValue,sdfDateTime);//根据时间段查询数据
+        if ("yes".equals(isPage)){
+            return  success(statisticalReportService.getOutFactoryInwardList(mapValue));
+        }
+        PageHelper.startPage(pageNum, pageSize);
+        //分页数据
+        List<Map<String, Object>> report = statisticalReportService.getOutFactoryInwardList(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData4(apiId, null, report);
+        return success(pageList);
+    }
+
     @ApiOperation(value="查询该组织机构下的内转统计报表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),

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

@@ -167,7 +167,7 @@ public class TmstruckLoadResultController extends BaseRESTfulController {
                 return failed("已装过此物资");
             }else if(i == -3) {
                 return failed("该订单没有装货作业");
-            }else if (i==-5){
+            }else if (i ==-5){
                 return failed("请勿重复装车");
             }else if( i == -6){
                 return failed("请通知司机完成前序操作再来装货！");

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

@@ -69,4 +69,7 @@ public interface StatisticalReportMapper {
 
     //查看该组织架构下的厂内内转统计报表
     List<Map<String, Object>> getInwardInFactory(Map<String, Object> mapValue);
+
+    //查询该组织下厂外-厂内内转统计报表（猫儿寨等）
+    List<Map<String, Object>> getOutFactoryInwardList(Map<String, Object> mapValue);
 }

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

@@ -67,5 +67,6 @@ public interface IStatisticalReportService {
     //查看该组织机构下的纯内转统计报表
     List<Map<String,Object>> getInwardInFactory(Map<String,Object> map);
 
+    List<Map<String, Object>> getOutFactoryInwardList(Map<String, Object> mapValue);
 }
 

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

@@ -245,5 +245,8 @@ public class StatisticalReportImpl implements IStatisticalReportService {
         return  statisticalReportMapper.getInwardInFactory(mapValue);
     }
 
-
+    @Override
+    public List<Map<String, Object>> getOutFactoryInwardList(Map<String, Object> mapValue) {
+        return statisticalReportMapper.getOutFactoryInwardList(mapValue);
+    }
 }

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

@@ -115,6 +115,10 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
                 return tmstruckEnfactoryResultMapper.getImportedDomesticNzLoadResult(map); //apiId:99
             case 10:
             case 20:
+            case 23:
+            case 24:
+            case 15:
+            case 16:
                 return tmstruckEnfactoryResultMapper.getCGNZEnFactory(map); //apiId:99
             case 11:
                 return tmstruckEnfactoryResultMapper.getInFactoryMaterialEnFactoryResult(map); //apiId:357
@@ -213,6 +217,8 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
             case 10:
             case 17:
             case 18:
+            case 23:
+            case 24:
                 checkMeasureCommission = tmstruckMeasureCommissionService.addMaoMeasureCommission(map); //添加计毛委托 并发送计毛委托
                 break;
             case 12:

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

@@ -148,6 +148,8 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                 return tmstruckLeaveFactoryResultMapper.getImportedDomesticNzEnFactoryResult(map); //apiId:110
             case 10:
             case 20:
+            case 23:
+            case 24:
                 return tmstruckEnfactoryResultMapper.getCgNzOutFactory(map);
             case 11:
                 return tmstruckLeaveFactoryResultMapper.getInFactoryOutFactoryResult(map); //apiId:361
@@ -290,6 +292,16 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
                     }
                 }
                 break;
+            case 23:
+            case 24:
+                i += utilsService.closeOrderNormally(map);
+                omsFeign.addPurInwardOrder(orderId);
+                try {
+                    bmsTruckFeign.addInwardDetailsOrder(map);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                break;
             case 12:
             case 13:
             case 14:

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

@@ -115,6 +115,8 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
             case 15:
             case 16:
             case 20:
+            case 23:
+            case 24:
                 return tmstruckLoadResultMapper.getImportedDomesticNzLoadResult(map); //apiId = 353
             case 11:
                 return tmstruckLoadResultMapper.getInFactoryLoadResult(map); //apiId = 359
@@ -222,7 +224,10 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
             //推送消息到websocket
             utilsService.pushMesToWebsocket(capacityNumber, "装货");
             BigDecimal orderId = DataChange.dataToBigDecimal(mesMap.get("orderId"));
-            //int i1 = addCapacityRemark(map);
+            int i1 = addCapacityRemark(map);
+            if(i1 == -5){
+                return -5;
+            }
             //根据运输订单查找需求备注
             Map<String,Object>  remarkMap=tmstruckTimeTaskResultMapper.selectInwardDueTimeByOrderId(orderId);
             String remark =(String) remarkMap.get("remark");

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

@@ -60,10 +60,10 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
     private static final String daXingUrl = "http://172.16.59.251:8121/daXingWeight/OrderBusiness/addOrder.do";
 
     //给达钢发送委托
-    private static final List<Integer> judgeDaGangNum = Arrays.asList(5, 6, 8, 11, 17,15,16);
+    private static final List<Integer> judgeDaGangNum = Arrays.asList(5, 6, 8, 11, 17,15,16,23);
 
     //给达兴发委托
-    private static final List<Integer> judgeDaXinNum = Arrays.asList(7, 18);
+    private static final List<Integer> judgeDaXinNum = Arrays.asList(7, 18,24);
 
     //销售焦炭、化产品 判断一厂二厂委托
     private static final String judgeCoke = "一厂";
@@ -194,6 +194,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             case 20://采购内转委托总厂区
             case 15:
             case 16:
+            case 23:
                 measureCommission=tmstruckMeasureCommissionMapper.purchaseXqCgNzMeasure(map);
                 if(measureCommission == null){
                     return 0;
@@ -521,6 +522,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
             case 20://采购内转委托总厂区
             case 15:
             case 16:
+            case 23:
                 measureCommission=tmstruckMeasureCommissionMapper.purchaseXqCgNzMeasure(map);
                 if(measureCommission == null){
                     return 0;
@@ -579,6 +581,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
                 break;
             case 10:
             case 20:
+            case 24:
                 //新区采购内转
                 measureCommission = tmstruckMeasureCommissionMapper.purchaseXqCgNzDXMeasure(map);
                 if(measureCommission == null)

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

@@ -53,6 +53,11 @@ public class TmstruckQualityResultServiceImpl implements ITmstruckQualityResultS
                 return tmstruckQualityResultMapper.getQualityResult(map); //apiId:150
             case 9:
             case 10:
+            case 20:
+            case 23:
+            case 24:
+            case 15:
+            case 16:
                 return tmstruckQualityResultMapper.getInwardQualityResult(map); //apiId:150
             case 11:
                 break;

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

@@ -120,6 +120,8 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             case 20:
             case 15:
             case 16:
+            case 23:
+            case 24:
                 return tmstruckUnloadResultMapper.getImportedDomesticNzUnload2Result(map); //apiId:356
             case 11:
                 return tmstruckUnloadResultMapper.getInFactoryUnloadResult(map); //apiId:360

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

@@ -129,6 +129,8 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
             case 20:
             case 15:
             case 16:
+            case 23:
+            case 24:
                 return tmstruckWeightResultMapper.getImportedDomesticNzJiMao2Result(map); // apiID:354
             case 11:
                 return tmstruckWeightResultMapper.getInFactoryJiLiangResult(map);       //apiId: 358

src/main/resources/application-prod.yml

@@ -26,7 +26,7 @@ piction:
 #feign设置
 openfeign:
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
   BmsShipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.166:8078}
   BmsTruckFeign:

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

@@ -1760,8 +1760,8 @@
                    AND TUR.SEGMENT_SQE = 8
                    AND TWR4.TARE_SEGMENT_SQE = 9
                   AND TLFR2.SEGMENT_SQE = 10
-                  and oo.ORDER_TYPE in (10,20)
                   AND   twr4.result_net_weight IS NOT NULL
+                    AND  oo.ORDER_TYPE in (10,20)
         <if test="orgCode!=null">
                 and oo.OPTIONER_CODE =  #{orgCode}
         </if>
@@ -1890,5 +1890,82 @@
             )
         </where>
     </select>
+    <select id="getOutFactoryInwardList" resultType="java.util.Map" parameterType="java.util.Map">
+        select *
+        from (select DISTINCT oo.order_id                   "orderId",
+        rm.material_name              "materialName",
+        rc.capacity_number            "capacityNumber",
+        rs.supplier_name              "sendName",
+        oo.order_number               "orderNumber",
+        rce.consignee_company_name    "reciveName",
+        ttr.result_total_id           "totalResultId",
+        twr.result_gross_weight      "grossWeight",
+        twr.result_gross_weight_time "grossweightTime",
+        twr.result_tare_weight       "tareWeight",
+        twr.result_tare_weight_time  "tareWeightTime",
+        twr.result_net_weight        "resultNetWeight",
+        RC.CARRIER_NAME "carrierName",
+        RL.LINE_NAME "lineName"
+        from omstruck_order oo
+        left join omstruck_order_material oom
+        on oom.order_id = oo.order_id
+        LEFT JOIN RMS_LINE RL
+        ON RL.LINE_ID=OO.LINE_ID
+        left join rms_material rm
+        on rm.material_id = oom.material_id
+        left join rms_capacity rc
+        on rc.capacity_id = oo.capacity_id
+        left join amstruck_inward_plan aip
+        on aip.plan_id = oo.order_plan_id
+        left join amstruck_requirement_plan arp
+        on arp.plan_id = aip.plan_id
+        left join RMS_CARRIER  rc
+        on AIP.CARRIER_ID=rc.CARRIER_ID
+        left join amstruck_inward_requirement air
+        on air.requirement_id = arp.requirement_id
+        left join ams_purchase_order apo
+        on apo.purchase_order_id = air.purchase_order_id
+        left join rms_supplier rs
+        on rs.supplier_id = apo.supplier_unit_id
+        left join rms_consignee rce
+        on rce.consignee_id = apo.receive_unit_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
+        left join rms_truck_calculate rtc1
+        on rtc1.truck_calculate_id = twr.result_tare_place_id
+        left join tmstruck_load_result tlr
+        on tlr.result_total_id = ttr.result_total_id
+        left join rms_warehouse rw
+        on rw.warehouse_id = tlr.loading_id
+        left join rms_truck_calculate rtc2
+        on rtc2.truck_calculate_id = twr.result_gross_place_id
+        left join tmstruck_unload_result tur
+        on tur.result_total_id = ttr.result_total_id
+        left join rms_warehouse rw2
+        on rw2.warehouse_id = tur.result_unload_place_id
+        LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR1
+        ON TLFR1.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        where
+        twr.result_net_weight IS NOT NULL
+        AND  oo.ORDER_TYPE in (23,24)
+        <if test="orgCode!=null">
+            and oo.OPTIONER_CODE =  #{orgCode}
+        </if>
+        <if test="index!=null">
+            and ( (instr(rs.supplier_name, #{index}) > 0) or  (instr(rm.material_name , #{index}) > 0)
+            or  (instr(rc.capacity_number , #{index}) > 0)   or  (instr(rce.consignee_company_name , #{index}) > 0)
+            or  (instr( RC.CARRIER_NAME , #{index}) > 0)  or     (instr(RL.LINE_NAME , #{index}) > 0))
+        </if>
+        <if test="oneDate != null">
+            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = TWR.RESULT_TARE_WEIGHT_TIME
+        </if>
+        <if test="startDate != null">
+            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  TWR.RESULT_TARE_WEIGHT_TIME
+            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >=  TWR.RESULT_TARE_WEIGHT_TIME
+        </if>
+        )
+    </select>
 
 </mapper>

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

@@ -1313,7 +1313,7 @@
         left join RMS_GATEPOST RG
         on RG.GATEPOST_ID = TER.GATEPOST_ID
         where TER.RESULT_ENTRY_GATE_TIME is not null
-        and OO.ORDER_TYPE in (10,20)
+        and OO.ORDER_TYPE in (10,20,23,24)
         <if test="userId">
             and air.INSERT_USERNAME=#{userId}
         </if>
@@ -1416,7 +1416,7 @@
   left join RMS_GATEPOST RG
     on RG.GATEPOST_ID = TLFR.GATEPOST_ID
  where RESULT_OUT_GATE_TIME is not null
-   and OO.ORDER_TYPE in (10,20)
+   and OO.ORDER_TYPE in (10,20,23,24)
    <if test="userId !=null">
       and AIR.INSERT_USERNAME = #{userId}
    </if>

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

@@ -1405,7 +1405,7 @@
     ON RC.CAPACITY_ID = OO.CAPACITY_ID
     LEFT JOIN RMS_WAREHOUSE RW
     ON RW.WAREHOUSE_ID = TLR.LOADING_ID
-    WHERE OO.ORDER_TYPE in (10,20,15,16)
+    WHERE OO.ORDER_TYPE in (10,20,15,16,23,24)
     AND TLR.RESULT_LOAD_START_TIME IS NOT NULL
     <if test="userId !=null">
       and AIR.INSERT_USERNAME = #{userId}

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

@@ -1114,6 +1114,7 @@
                     RS.SUPPLIER_NAME "sendUnit",
                     RCE.CONSIGNEE_COMPANY_NAME "ReceivUnit",
                     RW.WAREHOUSE_NAME "unloadPlace",
+                    RW1.WAREHOUSE_NAME "loadPlace",
                     TWR.INSERT_UPDATE_REMARK "demo",
                     RM.MATERIAL_ID "materialId",
                     RM.MATERIAL_NAME "materiaName",
@@ -1132,6 +1133,7 @@
                         LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
                         LEFT JOIN TMSTRUCK_UNLOAD_RESULT TUR ON TUR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
                         LEFT JOIN RMS_WAREHOUSE RW ON RW.WAREHOUSE_ID = AIR.REQUIREMENT_UNLOAD_UNIT_ID
+                        LEFT JOIN RMS_WAREHOUSE RW1 ON RW1.WAREHOUSE_ID = AIR.REQUIREMENT_PLATFORM_ID
                         LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
                         LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM ON OOM.ORDER_ID = OO.ORDER_ID
                         LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = OOM.MATERIAL_ID