问题处理

hx-purchase/src/main/java/com/fjhx/purchase/entity/subscribe/po/Subscribe.java

@@ -87,4 +87,9 @@ public class Subscribe extends BasePo {
     /**维多利亚扩展json*/
     private String victoriatouristJson;
 
+    /**
+     * 流程实例
+     */
+    private Long flowId;
+
 }

hx-purchase/src/main/java/com/fjhx/purchase/flow/SubscribeFlow.java

@@ -48,6 +48,7 @@ public class SubscribeFlow extends FlowDelegate {
         Subscribe subscribe = submitData.toJavaObject(Subscribe.class);
         subscribe.setCode(CodeEnum.SUBSCRIBE.getCode());
         subscribe.setSubcribeStatus(SubscribeStatusEnum.UNDER_REVIEW.getKey());
+        subscribe.setFlowId(flowId);
         subscribeService.save(subscribe);
         List<SubscribeDetail> SubscribeDetails = subscribe.getSubscribeDetailList();
         if(CollectionUtils.isNotEmpty(SubscribeDetails)){

hx-purchase/src/main/java/com/fjhx/purchase/flow/SubscribeFlowByWdly.java

@@ -52,6 +52,7 @@ public class SubscribeFlowByWdly extends FlowDelegate {
         Subscribe subscribe = submitData.toJavaObject(Subscribe.class);
         subscribe.setCode(CodeEnum.SUBSCRIBE.getCode());
         subscribe.setProcessInstanceId("wdly_apply_purchase");
+        subscribe.setFlowId(flowId);
         subscribe.setSubcribeStatus(SubscribeStatusEnum.UNDER_REVIEW.getKey());
         subscribeService.save(subscribe);
         List<SubscribeDetail> SubscribeDetails = subscribe.getSubscribeDetailList();

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockWaitServiceImpl.java

@@ -178,7 +178,8 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
     @Override
     public void add(StockWaitDto stockWaitDto) {
         //更新已入库数量 根据明细id
-        StockWaitDetails stockWaitDetails = stockWaitDetailsService.getOne(q->q.eq(StockWaitDetails::getStockWaitId,stockWaitDto.getId()));
+        StockWaitDetails stockWaitDetails = stockWaitDetailsService.getOne(q->q.eq(StockWaitDetails::getStockWaitId,stockWaitDto.getId())
+                .or().eq(StockWaitDetails::getId,stockWaitDto.getId()));
         stockWaitDetails.setReceiptQuantity(stockWaitDetails.getReceiptQuantity().add(stockWaitDto.getQuantity()));
         if (stockWaitDetails.getReceiptQuantity().compareTo(stockWaitDetails.getQuantity()) > 0) {
             throw new ServiceException("入库数量+已入库数量不能大于待采购数量");