Merge branch 'master' of http://123.57.213.14:3001/zgzt/dosb-java

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/billetActual/billetActual/service/impl/BilletUseInfoServiceImpl.java

@@ -499,7 +499,7 @@ public class BilletUseInfoServiceImpl extends ServiceImpl<BilletUseInfoMapper, B
         int attempt = 0;
         while (attempt < maxRetries) {
             try {
-                String url = "http://192.168.0.111:8850/sr/exchange/receiveShippingOrder";
+                String url = "http://192.168.0.111:15678/exchange/receiveShippingOrder";
                 ResponseEntity<BilletPushResponse> response = restTemplate.postForEntity(url, request, BilletPushResponse.class);
 
                 BilletPushResponse body = response.getBody();

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/sampleCardDeliveryRecord/task/SampleCardSyncTask.java

@@ -176,7 +176,7 @@ public class SampleCardSyncTask {
     }
 
 
-    @Scheduled(cron = "0 30 * * * ?") // 每小时30分执行一次
+//    @Scheduled(cron = "0 30 * * * ?")
     public void syncLastSampleCardRecords() {
         for (String ccmNo : Arrays.asList("5", "6")) {
             final String URL = "http://localhost:7005/billet/billetOriginalProductRecord/queryBilletRecordByCcmNo?queryType=2&ccmNo=%s&changeShiftId=%s";