Merge remote-tracking branch 'origin/master'

luqingyang

2023-11-02 24d64769178c9b31891164c91e5bc446b3b9dd6b

 consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java

@@ -121,7 +121,7 @@
                    return ResponseValue.error("采购的价型号未找到");
                }
                // 查询型号库存
                int goodsModelNum = lWhGoodsService.queryGoodsModelNum(warehouseId, baseGoodsModelsId, (short) 1, null);
                int goodsModelNum = lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, (short) 1, null);
                LWhProcureModel model = new LWhProcureModel();
                model.setId(NumberGenerator.getLongSequenceNumber());
                model.setFromProcureGoodsId(fromProcureGoodsId);