|
@@ -15,6 +15,7 @@ import com.fjhx.wms.entity.stock.po.StockWait;
|
|
|
import com.fjhx.wms.entity.stock.po.StockWaitDetails;
|
|
|
import com.fjhx.wms.entity.stock.vo.StockWaitDetailsVo;
|
|
|
import com.fjhx.wms.mapper.stock.StockWaitDetailsMapper;
|
|
|
+import com.fjhx.wms.service.MyPurchaseService;
|
|
|
import com.fjhx.wms.service.stock.StockWaitDetailsService;
|
|
|
import com.fjhx.wms.service.stock.StockWaitService;
|
|
|
import com.ruoyi.common.exception.ServiceException;
|
|
@@ -43,16 +44,8 @@ public class StockWaitDetailsServiceImpl extends ServiceImpl<StockWaitDetailsMap
|
|
|
private ProductInfoService productInfoService;
|
|
|
@Autowired
|
|
|
private StockWaitService stockWaitService;
|
|
|
-// @Autowired
|
|
|
-// private StockJournalService stockJournalService;
|
|
|
-// @Autowired
|
|
|
-// private StockJournalDetailsService stockJournalDetailsService;
|
|
|
-// @Autowired
|
|
|
-// private StockService stockService;
|
|
|
-// @Autowired
|
|
|
-// private WmsService wmsService;
|
|
|
-// @Autowired
|
|
|
-// private StockFrozenService stockFrozenService;
|
|
|
+ @Autowired
|
|
|
+ private MyPurchaseService myPurchaseService;
|
|
|
|
|
|
@Override
|
|
|
public Page<StockWaitDetailsVo> getPage(StockWaitDetailsSelectDto dto) {
|
|
@@ -150,6 +143,14 @@ public class StockWaitDetailsServiceImpl extends ServiceImpl<StockWaitDetailsMap
|
|
|
stockWaitDto.setId(stockWaitDetails.getStockWaitId());
|
|
|
stockWaitDto.setStockWaitDetailsList(Collections.singletonList(BeanUtil.copyProperties(stockWaitDetailsDto, StockWaitDetails.class)));
|
|
|
stockWaitService.addByWdly(stockWaitDto);
|
|
|
+
|
|
|
+ //如果是采购退货 修改采购退货状态
|
|
|
+ StockWait stockWait = stockWaitService.getById(stockWaitDto.getId());
|
|
|
+ Assert.notEmpty(stockWait, "查询不到待出库信息");
|
|
|
+ if (stockWait.getBusinessType() == 4) {
|
|
|
+ Integer status = stockWait.getStatus();
|
|
|
+ myPurchaseService.updateSalesReturnStatus(stockWaitDetails.getBusinessDetailsId(), status);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
|