楚江ERP：问题修改

@@ -128,7 +128,6 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
         return getBaseMapper().query(vo);
     }
 
-    @Cacheable(value = CustomerCredit.CACHE_NAME, key = "@cacheVariables.tenantId() + #id", unless = "#result == null")
     @Override
     public CustomerCredit findById(String id) {
 
@@ -1561,7 +1560,6 @@ public class CustomerCreditServiceImpl extends BaseMpServiceImpl<CustomerCreditM
                 .orElseThrow(() -> new DefaultClientException("办事处 " + prefix + " 的编号已用尽 (001-999)"));
     }
 
-    @CacheEvict(value = CustomerCredit.CACHE_NAME, key = "@cacheVariables.tenantId() + #key")
     @Override
     public void cleanCacheByKey(Serializable key) {
 

@@ -373,6 +373,11 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
                     .set(PurchaseOrderInfo::getStatus, "ISSUED")//已下发
                     .eq(PurchaseOrderInfo::getId, id);
             getBaseMapper().update(updateWrapper);
+        } else if ("WAIT".equals(status)) {
+            LambdaUpdateWrapper<PurchaseOrderInfo> updateWrapper = Wrappers.lambdaUpdate(PurchaseOrderInfo.class)
+                    .set(PurchaseOrderInfo::getStatus, status)
+                    .eq(PurchaseOrderInfo::getId, id);
+            getBaseMapper().update(updateWrapper);
         } else {
             LambdaUpdateWrapper<PurchaseOrderInfo> updateWrapper = Wrappers.lambdaUpdate(PurchaseOrderInfo.class)
                     .set(PurchaseOrderInfo::getExamineStatus, status)

@@ -22,6 +22,7 @@ import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.xingyun.sc.entity.DraftRequestCarTicket;
 import com.lframework.xingyun.sc.mappers.DraftRequestCarTicketMapper;
+import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.shipments.car.DraftRequestCarTicketService;
 import com.lframework.xingyun.sc.vo.shipments.car.*;
 import org.apache.commons.collections.CollectionUtils;
@@ -41,6 +42,8 @@ public class DraftRequestCarTicketServiceImpl extends BaseMpServiceImpl<DraftReq
     private FlowInstanceWrapperService flowInstanceWrapperService;
     @Resource
     private FlowTaskWrapperMapper flowTaskWrapperMapper;
+    @Resource
+    private PurchaseOrderInfoService purchaseOrderInfoService;
 
     @Override
     public PageResult<DraftRequestCarTicket> query(Integer pageIndex, Integer pageSize, QueryDraftRequestCarTicketVo vo) {
@@ -93,6 +96,9 @@ public class DraftRequestCarTicketServiceImpl extends BaseMpServiceImpl<DraftReq
         if (CollectionUtils.isNotEmpty(query)) {
             return query.get(0).getId();
         }
+        if (StringUtils.isNotEmpty(vo.getPurchaseOrderId())) {
+            purchaseOrderInfoService.updateStatus(vo.getPurchaseOrderId(), "WAIT");
+        }
 
         DraftRequestCarTicket data = new DraftRequestCarTicket();
         data.setId(IdUtil.getId());
@@ -146,6 +152,8 @@ public class DraftRequestCarTicketServiceImpl extends BaseMpServiceImpl<DraftReq
         }
         if (!StringUtil.isBlank(vo.getStatus())) {
             data.setStatus(vo.getStatus());
+        } else {
+            data.setStatus("AUDIT");
         }
 
         getBaseMapper().insert(data);