commit

ym-packing/src/main/java/com/cnbm/packing/service/DynamicDataSourceService.java

@@ -2,6 +2,7 @@ package com.cnbm.packing.service;
 
 import com.cnbm.dynamic.datasource.annotation.DataSource;
 import com.cnbm.packing.dto.CamlineExtendArgDTO;
+import com.cnbm.packing.dto.CamlineSubIdDTO;
 import com.cnbm.packing.dto.WoPowerLevelDTO;
 import com.cnbm.packing.mapper.CamlineMapper;
 
@@ -41,6 +42,12 @@ public class DynamicDataSourceService {
         return mapper.getOrderNameBySubId(subId);
     }
 
+    @DataSource("camline")
+    @Transactional
+    public CamlineSubIdDTO getSubIdByCamline(String subId){
+        return mapper.getSubIdByCamline(subId);
+    }
+
     @DataSource("camline")
     @Transactional
     public CamlineExtendArgDTO getExtendArgFromCamline(String subId){

ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxSubstrateServiceBiz.java

@@ -35,5 +35,7 @@ public interface WoPackagingBoxSubstrateServiceBiz extends CrudService<WoPackagi
     void insertSubstrateManual(ChangePackingBoxDTO dto);
 
     WoPackagingBoxSubstrate getBySubId(String subId);
-    int updatePackagingBoxIdByWoSubstrateId(String packagingBoxId,String woSubstrateId);
+
+
+    int updatePackagingBoxIdAndSlotByWoSubstrateId(String packagingBoxId,Integer slot,String woSubstrateId);
 }

ym-packing/src/main/java/com/cnbm/packing/service/impl/WoCompensationPowerServiceBizImpl.java

@@ -98,8 +98,11 @@ public class WoCompensationPowerServiceBizImpl extends CrudServiceImpl<WoCompens
 
 
         CompensationPowerXSDTO conffBySubIdAndLineBody = mapper.getConffBySubIdAndLineBody(compensationQueryParam);
-        float res = pmpp*conffBySubIdAndLineBody.getA()+conffBySubIdAndLineBody.getB();
-        return res;
+        if(conffBySubIdAndLineBody!=null){
+            return pmpp*conffBySubIdAndLineBody.getA()+conffBySubIdAndLineBody.getB();
+        }else {
+            return pmpp;
+        }
     }
 
 

ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxSubstrateServiceBizImpl.java

@@ -183,7 +183,7 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl<WoPac
     }
 
     @Override
-    public int updatePackagingBoxIdByWoSubstrateId(String packagingBoxId, String woSubstrateId) {
-        return mapper.updatePackagingBoxIdByWoSubstrateId(packagingBoxId,woSubstrateId);
+    public int updatePackagingBoxIdAndSlotByWoSubstrateId(String packagingBoxId, Integer slot , String woSubstrateId) {
+        return mapper.updatePackagingBoxIdAndSlotByWoSubstrateId(packagingBoxId,slot,woSubstrateId);
     }
 }