zx 3 years ago
parent
commit
7c66c4ad11

+ 2 - 2
src/main/java/com/steerinfo/dil/service/impl/TmstruckEnfactoryResultServiceImpl.java

@@ -214,8 +214,8 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
                 List<Integer> materialIdByOrderId = utilsMapper.getMaterialIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
                 map.put("materialId", materialIdByOrderId.get(0));
                 //默认收货单位为新厂区
-                map.put("receiveId",2);
-                i += tmstruckMeasureCommissionService.addMaoMeasureCommission(map);
+
+                i += tmstruckMeasureCommissionService.addLXMeasureCommission(map);
         }
         utilsService.pushMesToWebsocket((String) map.get("capacityNumber"), "车辆进厂");
         return i;

+ 1 - 7
src/main/java/com/steerinfo/dil/service/impl/TmstruckMeasureCommissionServiceImpl.java

@@ -82,13 +82,7 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
         int i = addMeasureCommission(map); // 添加计毛委托
         //发送数据给计量系统 必要数据 orderTypee:订单类型  resultTotalId: 总实绩Id   orderId
         //获取当前订单是属于哪个厂区订单
-        Integer receiveId=0;
-        if (map.get("receiveId")==null) {
-             receiveId = tmstruckMeasureCommissionMapper.getReceiveIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
-        }else {
-            //零星物资默认为新厂区(暂时)
-            receiveId=(Integer) map.get("receiveId");
-        }
+        Integer receiveId = tmstruckMeasureCommissionMapper.getReceiveIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
             if (receiveId == 1) {
                 //发送委托给达州钢铁
                 i += sendMeasureCommissionMes(map);

+ 1 - 2
src/main/java/com/steerinfo/dil/service/impl/TmstruckUnloadResultServiceImpl.java

@@ -257,12 +257,11 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
             Map<String,Object> map2=new HashMap<>();
             map2.put("materialId",materialId);
             map2.put("orderId",orderId);
-            map2.put("receiveId",2);
             //判断物资是否被计量
             Integer integer = tmstruckUnloadResultMapper.selectUnloadMaterialId(map2);
             if (integer==0){
                 //调用计量实绩接口,发送计量委托
-                tmstruckMeasureCommissionService.addMaoMeasureCommission(map2);
+                tmstruckMeasureCommissionService.addLXMeasureCommission(map2);
             }
         }
         return 2;