consum-base/src/main/java/com/consum/base/service/LWhFormScrappedCoreService.java

@@ -18,7 +18,6 @@

/**
 * @ClassName LWhFormScrappedCoreService

 * @Date 2023/10/30
 * @Description
 * @Version 1.0
@@ -26,7 +25,7 @@
@Service
@Slf4j
public class LWhFormScrappedCoreService {
    private LWhFormScrappedServiceImpl lWhFormScrappedService;
    private GoodsBaseServiceImpl goodsBaseService;
    private LWhFormScrappedGoodsService lWhFormScrappedGoodsService;
    private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
    private LWhGoodsService lWhGoodsService;
@@ -35,20 +34,21 @@
    private LWarehouseFlowService lWarehouseFlowService;

    @Autowired
    public LWhFormScrappedCoreService(LWhFormScrappedServiceImpl lWhFormScrappedService,
    public LWhFormScrappedCoreService(GoodsBaseServiceImpl goodsBaseService,
                                      LWhFormScrappedGoodsService lWhFormScrappedGoodsService,
                                      BaseGoodsTemplateServiceImpl baseGoodsTemplateService,
                                      LWhGoodsService lWhGoodsService,
                                      LWhGoodsRecordDetailsService lWhGoodsRecordDetailsService,
                                      LWhGoodsRecordService lWhGoodsRecordService,
                                      LWarehouseFlowService lWarehouseFlowService) {
        this.lWhFormScrappedService = lWhFormScrappedService;
//        this.lWhFormScrappedService = lWhFormScrappedService;
        this.lWhFormScrappedGoodsService = lWhFormScrappedGoodsService;
        this.baseGoodsTemplateService = baseGoodsTemplateService;
        this.lWhGoodsService = lWhGoodsService;
        this.lWhGoodsRecordDetailsService = lWhGoodsRecordDetailsService;
        this.lWhGoodsRecordService = lWhGoodsRecordService;
        this.lWarehouseFlowService = lWarehouseFlowService;
        this.goodsBaseService = goodsBaseService;
    }


@@ -64,7 +64,7 @@
            return null;
        }
        LWhFormScrapped lWhFormScrapped = new LWhFormScrapped(formScrappedId);
        lWhFormScrapped = lWhFormScrappedService.get(lWhFormScrapped);
        lWhFormScrapped = goodsBaseService.get(lWhFormScrapped);
        if (lWhFormScrapped != null && lWhFormScrapped.getStates() != 0) {
            log.error("报废失败！请检查报废单状态");
            return null;
@@ -174,8 +174,8 @@
            return null;
        }
        // 更新报废单
         lWhFormScrapped = new LWhFormScrapped(formScrappedId);
        lWhFormScrapped = lWhFormScrappedService.get(lWhFormScrapped);
        lWhFormScrapped = new LWhFormScrapped(formScrappedId);
        lWhFormScrapped = goodsBaseService.get(lWhFormScrapped);
        if (lWhFormScrapped != null && lWhFormScrapped.getStates() != 0) {
            log.error("报废失败！请检查报废单状态");
            return null;
@@ -185,7 +185,7 @@
        lWhFormScrapped.setOperatorId(userId);
        lWhFormScrapped.setOperatorName(nickName);
        lWhFormScrapped.setDealTime(dealTime);
        lWhFormScrappedService.update(lWhFormScrapped);
        goodsBaseService.update(lWhFormScrapped);
        return lWarehouseFlowId;
    }


 consum-base/src/main/java/com/consum/base/service/LWhFormTransferCoreService.java

@@ -21,7 +21,6 @@

/**
 * @ClassName LWhFormTransferCoreService

 * @Date 2023/10/26
 * @Description
 * @Version 1.0
@@ -44,8 +43,8 @@
    private LGoodsWhRecordServiceImpl lGoodsWhRecordService;
    @Resource
    private LWarehouseFlowService lWarehouseFlowService;
    @Resource
    private LWarehouseFlowService LWhGoodsRecordDetailsService;
//    @Resource
//    private LWarehouseFlowService LWhGoodsRecordDetailsService;


    /**
@@ -154,12 +153,12 @@
            }
            LWhGoodsRecordDetails lWhGoodsRecordDetails = new LWhGoodsRecordDetails();
            lWhGoodsRecordDetails.setWhGoodsRecordId(oldRecordId);
            List<LWhGoodsRecordDetails> goodsRecordDetailsList = LWhGoodsRecordDetailsService.select(lWhGoodsRecordDetails);
            List<LWhGoodsRecordDetails> goodsRecordDetailsList = null;// LWhGoodsRecordDetailsService.select(lWhGoodsRecordDetails);
            for (LWhGoodsRecordDetails whGoodsRecordDetails : goodsRecordDetailsList) {
                whGoodsRecordDetails.setId(NumberGenerator.getLongSequenceNumber());
                whGoodsRecordDetails.setThisType(1);
            }
            LWhGoodsRecordDetailsService.insertBatch(goodsRecordDetailsList);
//            LWhGoodsRecordDetailsService.insertBatch(goodsRecordDetailsList);
        }
        lWhGoodsRecordService.insertBatch(whGoodsRecordList);

@@ -168,6 +167,17 @@
        //将保管仓库信息更新到 物品仓库保管记录【L_GOODS_WH_RECORD】
        lGoodsWhRecordService.insertNewRecord(outGoodsIds, inWarehouseFlowId, dealTime);

        //单据类型。0仓库调拨；1部门分发；2部门物品回退
        Integer businessType = lWhFormTransfer.getBusinessType();
        if (businessType == 1) {
            // 需要往 物品使用记录【L_GOODS_USER_RECORD】 增加记录

        } else if (businessType == 2) {
            // 需要往 物品使用记录【L_GOODS_USER_RECORD】 增加记录

        }


        // 更新调拨单
        lWhFormTransfer = new LWhFormTransfer(whFormTransferId);
        lWhFormTransfer.setInWarehouseFormId(inWarehouseFlowId);