1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PaymentManagementServiceImpl.java

@@ -788,6 +788,7 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public String generateOrder(PaymentManagement paymentManagement) {
             SimpleDateFormat now = new SimpleDateFormat("yyyy-MM-dd 23:55:00");
             Calendar c = Calendar.getInstance();

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehousingOrderServiceImpl.java

@@ -861,7 +861,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
      * 甘南宏旗库入库单
      */
     @Transactional(rollbackFor = Exception.class)
-    @Scheduled(cron = "0 00 17 * * ?")
+//    @Scheduled(cron = "0 00 17 * * ?")
     public String addInfoGN() {
         if ("3".equals(ENV)) {
             //当天零点
@@ -872,7 +872,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
             String beforeDay = now.format(c.getTime());
             Map<String, Object> pageView = new HashMap<>();
             pageView.put("beforeDay", beforeDay);
-            pageView.put("warehouseName", "甘南宏旗库");
+//            pageView.put("warehouseName", "甘南宏旗库");
             //收购
             List<WarehousingOrder> dataList = baseMapper.getAcquisitionListByCondition(pageView);
             if (!CollectionUtils.isEmpty(dataList)) {
@@ -1294,7 +1294,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                     //查剩余重量>0的入库单
                     List<WarehousingOrder> warehousingOrderList = this.selectList(new EntityWrapper<WarehousingOrder>()
                             .eq("comp_id", enabledInfo.getCompId())
-                            .eq("warehouse_name","甘南宏旗库")
+//                            .eq("warehouse_name","甘南宏旗库")
                             .gt("surplus_weight", 0));
                     if (!CollectionUtils.isEmpty(warehousingOrderList)) {
                         for (WarehousingOrder warehousingOrder : warehousingOrderList) {