diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/PackingController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/PackingController.java index 53b0b87c..86061f2e 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/PackingController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/PackingController.java @@ -198,7 +198,7 @@ public class PackingController extends BaseController { // 首先判断当前包是否已经收货了 WmsPackage wmsPackage = packageService.lambdaQuery() .eq(WmsPackage::getPackageCode, request.getPackageCode()) - .eq(WmsPackage::getSupplierId, UserUtil.getUserId()) + //.eq(WmsPackage::getSupplierId, UserUtil.getUserId()) .one(); VUtil.trueThrowBusinessError(ObjectUtil.isNull(wmsPackage)).throwMessage("打包码不存在"); VUtil.trueThrowBusinessError(wmsPackage.getPackageStatus() == 2).throwMessage("此打包码已收货"); @@ -220,11 +220,11 @@ public class PackingController extends BaseController { private PackageDTO BarcodeValidation(WmsQrCodeMaster qrCodeMaster, BarCodeProcessStage processStage) { //判断是否为有效码 VUtil.trueThrowBusinessError(ObjectUtil.isNull(qrCodeMaster)).throwMessage("无效码"); - UserSupplier userSupplier = userSupplierService.lambdaQuery() - .eq(UserSupplier::getUserId, UserUtil.getUserId()) - .one(); - - VUtil.trueThrowBusinessError(ObjectUtil.isNull(userSupplier) || !Objects.equals(qrCodeMaster.getSupplierId(), userSupplier.getId())).throwMessage("此物料码非当前供应商所有"); +// UserSupplier userSupplier = userSupplierService.lambdaQuery() +// .eq(UserSupplier::getUserId, UserUtil.getUserId()) +// .one(); +// +// VUtil.trueThrowBusinessError(ObjectUtil.isNull(userSupplier) || !Objects.equals(qrCodeMaster.getSupplierId(), userSupplier.getId())).throwMessage("此物料码非当前供应商所有"); // VUtil.trueThrowBusinessError(ObjectUtil.isNull(qrCodeMaster) || !qrCodeMaster.getSupplierId().equals(UserUtil.getUserId())).throwMessage("无效码"); // 判断此物料码是否有效以及是否已被使用 BarCodeProcessStage stage = BarCodeProcessStage.findByValue(qrCodeMaster.getProcessStage());