add

src/main/java/com/zfire/jiasm/syncdata/service/impl/AddInstallBusinessImpl.java

@@ -1355,7 +1355,12 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
         op.setProductName(mx.getJxmc());
         op.setInsideCode(mx.getNjtm());
         op.setOutCode(mx.getWjtm());
-        op.setNum(mx.getShul());
+
+        if (mx.getShul() == null || mx.getShul() == 0){
+            op.setNum(1);
+        } else {
+            op.setNum(mx.getShul());
+        }
         if (op.getNum()>100){
             op.setNum(1);
         }
@@ -3002,10 +3007,15 @@ public class AddInstallBusinessImpl implements AddInstallBusiness {
         op.setProductName(mx.getJxmc());
         op.setInsideCode(mx.getNjtm());
         op.setOutCode(mx.getWjtm());
-        op.setNum(mx.getShul());
+        if (mx.getShul() == null || mx.getShul() == 0){
+            op.setNum(1);
+        } else {
+            op.setNum(mx.getShul());
+        }
         if (op.getNum()>100){
             op.setNum(1);
         }
+
         op.setPrice(mx.getJiage());
         op.setUnit(mx.getDanw());
         op.setMaterialNumber(mx.getWldm());

src/main/java/com/zfire/jiasm/syncdata/service/impl/AddRepairBusinessServiceImpl.java

@@ -2531,6 +2531,9 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
             mxreq.setSynReqId(Long.valueOf(rec.getSynReqId()));
             mxreq.setBrandId(brand.getBrandId());
             OrderProduct op = repairMxDownloadMapper.getMx(mxreq);
+             if (op.getNum() == null || op.getNum() == 0){
+                op.setNum(1);
+            }
 
             // 改成 product 表中的 product_id
             if (productMap.containsKey(op.getProductId())){
@@ -2704,6 +2707,9 @@ public class AddRepairBusinessServiceImpl implements AddRepairBusinessService {
                                          ItfTblAssignMxDownload rec, OrderPar mxreq, Map<String,String> productMap) {
         WebsitFWS websitFWS = new WebsitFWS();
         OrderProduct op = repairMxDownloadMapper.getMx(mxreq);
+        if (op.getNum() == null || op.getNum() == 0){
+            op.setNum(1);
+        }
 
         // 改成 product 表中的 product_id
         if (productMap.containsKey(op.getProductId())){

src/main/java/com/zfire/jiasm/syncdata/service/impl/GLPPGFWebsitWorkerServiceImpl.java

@@ -979,6 +979,10 @@ public class GLPPGFWebsitWorkerServiceImpl implements GLPPGFWebsitWorkerService
         List<String> workdids = new ArrayList<>();
         List<String> workdidsUp = new ArrayList<>();
 
+        // 提取师傅ID数据
+
+        // select worker_id from worker_id_generator where is_used=0 and worker_id > 2000000 order by sort_num limit 100
+
         // 提取原有的信息
         List<Worker> oldWorkerRec =  workerService.lambdaQuery().list();
         if (CollectionUtils.isNotEmpty(oldWorkerRec)){

src/main/java/com/zfire/jiasm/syncdata/service/impl/PublicServiceImpl.java

@@ -126,7 +126,8 @@ public class PublicServiceImpl implements PublicService {
     OrderExtendService orderExtendService;
     @Resource
     OrderInformationService orderInformationService;
-
+    @Resource
+    WorkerIdGeneratorService workerIdGeneratorService;
 
 
 
@@ -2081,6 +2082,22 @@ public class PublicServiceImpl implements PublicService {
         }
     }
 
+    List<Integer> getWorkerId(){
+        List<Integer> result = new ArrayList<>();
+        List<WorkerIdGenerator> wis = workerIdGeneratorService.lambdaQuery()
+                .eq(WorkerIdGenerator::getIsUsed,0)
+                .gt(WorkerIdGenerator::getWorkerId,500000)
+                .orderByAsc(WorkerIdGenerator::getSortNum)
+                .last("limit 100000 ").list();
+        if (!CollectionUtils.isEmpty(wis)){
+            wis.stream().forEach(event->{
+                result.add(event.getWorkerId());
+            });
+        }
+
+        return result;
+    }
+
     @Override
     public void updateOrderExtend(String orderBaseId){
         Integer childNum;