From fb4def1604936d6bfa7a395df30426d555ce19bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 1 Apr 2026 10:43:29 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=92=8C=E5=BA=93?= =?UTF-8?q?=E4=BD=8D=E9=83=BD=E6=94=B9=E4=B8=BA=E5=BA=93=E5=AD=98=E5=9C=B0?= =?UTF-8?q?=E7=82=B9=EF=BC=8C=E4=BB=93=E4=BD=8D=E9=83=BD=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=82=A8=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/admin/controller/BinController.java | 2 +- .../controller/InProduceOrderController.java | 6 ++-- .../admin/controller/InventoryController.java | 4 +-- .../LocationTransferController.java | 6 ++-- .../admin/controller/NormalPGIController.java | 6 ++-- .../controller/OutProduceController.java | 2 +- .../controller/QrCodeMasterController.java | 6 ++-- .../StructuralPackageOrderController.java | 4 +-- .../admin/controller/WarehouseController.java | 26 ++++++++-------- .../wms/admin/pojo/dto/QCReceiveItemDTO.java | 2 +- .../pojo/dto/SAPMaterialInfoInOrderDTO.java | 2 +- .../admin/service/BinControllerService.java | 10 +++---- .../wms/admin/service/SAPCommonService.java | 8 ++--- .../nflg/wms/admin/service/SapService.java | 14 ++++----- .../service/StorageControllerService.java | 10 +++---- .../StructuralPackageControllerService.java | 6 ++-- .../service/WarehouseControllerService.java | 30 +++++++++---------- .../common/constant/BarCodeProcessStage.java | 2 +- .../pojo/document/InMaterialScanRecord.java | 2 +- .../pojo/document/OutMaterialScanRecord.java | 2 +- .../common/pojo/dto/AllocationOrderDTO.java | 4 +-- .../common/pojo/dto/BinExcelExportDTO.java | 12 ++++---- .../dto/DepartmentMaterialRequisitionDTO.java | 2 +- .../dto/DepartmentMaterialReturnSlipDTO.java | 2 +- .../wms/common/pojo/dto/InventoryInDTO.java | 2 +- .../wms/common/pojo/dto/InventoryOutDTO.java | 2 +- .../wms/common/pojo/dto/PackageChildDTO.java | 2 +- .../common/pojo/dto/PurchaseReturnDTO.java | 2 +- .../nflg/wms/common/pojo/dto/SAPOrderDTO.java | 2 +- .../wms/common/pojo/dto/SAPSyncParamsDTO.java | 2 +- .../dto/SRMQualityInspectionResultDTO.java | 2 +- .../nflg/wms/common/pojo/dto/StorageDTO.java | 2 +- .../pojo/dto/StorageExcelImportDTO.java | 8 ++--- .../pojo/dto/SubcontractedOrderDTO.java | 6 ++-- .../wms/common/pojo/dto/TransferOrderDTO.java | 2 +- .../pojo/dto/WarehouseExcelExportDTO.java | 8 ++--- .../pojo/dto/WarehouseExcelImportDTO.java | 8 ++--- .../wms/common/pojo/dto/ZWM00MB007DTO.java | 2 +- .../nflg/wms/common/pojo/dto/ZWM3A02QO.java | 2 +- .../wms/common/pojo/dto/ZWM3A19ITEMDTO.java | 4 +-- .../wms/common/pojo/dto/ZWM3A21ResultDTO.java | 2 +- .../pojo/dto/Zim001QueryResultItem1DTO.java | 2 +- .../common/pojo/qo/BarcodePrintingAddQO.java | 2 +- .../common/pojo/qo/BarcodePrintingEditQO.java | 4 +-- .../com/nflg/wms/common/pojo/qo/BinAddQO.java | 2 +- .../nflg/wms/common/pojo/qo/BinSearchQO.java | 2 +- .../common/pojo/qo/CommendationItemQO.java | 2 +- .../pojo/qo/DeliverNormalOrderSaveItemQO.java | 2 +- .../wms/common/pojo/qo/GoodsReceiptAddQO.java | 2 +- .../pojo/qo/InCostCenterBackSubmitQO.java | 2 +- .../common/pojo/qo/InProduceBackSubmitQO.java | 2 +- .../qo/InProduceOrderReceiveMaterialQO.java | 2 +- .../nflg/wms/common/pojo/qo/InSubmitQO.java | 2 +- .../pojo/qo/InventoryCheckTaskSaveItemQO.java | 2 +- .../wms/common/pojo/qo/InventoryForOutQO.java | 2 +- .../common/pojo/qo/InventoryIn1ItemQO.java | 2 +- .../wms/common/pojo/qo/InventoryInQO.java | 2 +- .../wms/common/pojo/qo/InventorySearchQO.java | 2 +- .../common/pojo/qo/MaterialStorageItemQO.java | 2 +- .../common/pojo/qo/OutProduceSubmitQO.java | 2 +- .../wms/common/pojo/qo/PendingScanningQO.java | 2 +- .../pojo/qo/PoReceiveTaskItemConfirmQO.java | 2 +- .../pojo/qo/QCReceiveTaskConfirmQO.java | 2 +- .../common/pojo/qo/QrCodeItemSearchQO.java | 2 +- .../pojo/qo/ShipmentSiteStockSearchQO.java | 2 +- .../common/pojo/qo/SrmMaterialReceiptQO.java | 2 +- .../nflg/wms/common/pojo/qo/StorageAddQO.java | 2 +- .../wms/common/pojo/qo/StorageSearchQO.java | 2 +- .../wms/common/pojo/qo/StrappingAddQO.java | 2 +- .../qo/StructuralPackageOrderReceiveQO.java | 2 +- .../common/pojo/qo/TransferOrderSearchQO.java | 2 +- .../wms/common/pojo/qo/WarehouseAddQO.java | 4 +-- .../wms/common/pojo/qo/WarehouseSearchQO.java | 4 +-- .../nflg/wms/common/pojo/qo/ZWM3A23QO.java | 2 +- .../nflg/wms/common/pojo/qo/Zwm00Mb107QO.java | 2 +- .../pojo/vo/ApplyReturnRequestItemVO.java | 2 +- .../wms/common/pojo/vo/BarcodePrintingVO.java | 2 +- .../com/nflg/wms/common/pojo/vo/BinVO.java | 6 ++-- .../pojo/vo/C_MaterialOutboundItemVO.java | 2 +- .../pojo/vo/C_MaterialOutboundSAPItemVO.java | 2 +- .../pojo/vo/C_MaterialReturnItemVO.java | 2 +- .../pojo/vo/C_SAPMaterialReturnItemVO.java | 2 +- ...tructuralPackageOrderForPackageItemVO.java | 2 +- .../wms/common/pojo/vo/GoodsReceiptVO.java | 2 +- .../pojo/vo/InCostcenterBackInfoItemVO.java | 2 +- .../pojo/vo/InCostcenterBackItemVO.java | 2 +- .../common/pojo/vo/InProduceBackItemVO.java | 2 +- .../pojo/vo/InProduceBackTicketItemVO.java | 2 +- .../common/pojo/vo/InProduceOrderItemVO.java | 2 +- .../pojo/vo/InProduceOrderMaterialVO.java | 2 +- .../wms/common/pojo/vo/InPurchaseItemVO.java | 2 +- .../nflg/wms/common/pojo/vo/InTaskInfoVO.java | 2 +- .../vo/InventoryCheckTaskItemMaterialVO.java | 2 +- .../pojo/vo/InventoryCheckTaskItemVO.java | 6 ++-- .../common/pojo/vo/InventoryCheckTaskVO.java | 2 +- .../wms/common/pojo/vo/InventoryLockVO.java | 2 +- .../nflg/wms/common/pojo/vo/InventoryVO.java | 2 +- .../common/pojo/vo/OutAssistanceInfoVO.java | 4 +-- .../common/pojo/vo/OutAssistanceItemVO.java | 4 +-- .../pojo/vo/OutCostcenterInfoItemVO.java | 2 +- .../common/pojo/vo/OutCostcenterInfoVO.java | 2 +- .../common/pojo/vo/OutProduceInfoItemVO.java | 2 +- .../wms/common/pojo/vo/OutProduceItemVO.java | 2 +- .../wms/common/pojo/vo/PDAOrderItemVO.java | 2 +- .../wms/common/pojo/vo/PackingContentVO.java | 2 +- .../common/pojo/vo/PoReceiveTaskItemVO.java | 2 +- .../common/pojo/vo/QCReceiveTaskItemVO.java | 2 +- .../nflg/wms/common/pojo/vo/QCTaskItemVO.java | 2 +- .../nflg/wms/common/pojo/vo/QrCodeItemVO.java | 2 +- .../com/nflg/wms/common/pojo/vo/QrCodeVO.java | 2 +- .../common/pojo/vo/QualityInspectionVO.java | 4 +-- .../nflg/wms/common/pojo/vo/StorageVO.java | 4 +-- .../common/pojo/vo/TransferCompanyItemVO.java | 4 +-- .../common/pojo/vo/TransferCompanyPdaVO.java | 4 +-- .../common/pojo/vo/TransferFactoryItemVO.java | 2 +- .../pojo/vo/TransferFactoryPdaItemVO.java | 4 +-- .../common/pojo/vo/TransferFactoryPdaVO.java | 4 +-- .../wms/common/pojo/vo/TransferOrderVO.java | 2 +- .../wms/common/pojo/vo/WarehouseSimpleVO.java | 4 +-- .../nflg/wms/common/pojo/vo/ZWM3A23VO.java | 2 +- .../nflg/wms/common/pojo/vo/Zwm3a07VO.java | 6 ++-- .../wms/common/pojo/vo/Zwm3a08ItemVO.java | 4 +-- .../nflg/wms/common/pojo/vo/Zwm3a08VO.java | 4 +-- .../wms/common/pojo/vo/Zwm3a09ItemVO.java | 2 +- .../nflg/wms/common/pojo/vo/Zwm3a09VO.java | 2 +- .../nflg/wms/repository/entity/WmsBin.java | 2 +- .../entity/WmsInCostcenterBackItem.java | 2 +- .../entity/WmsInCostcenterBackTicket.java | 2 +- .../entity/WmsInProduceBackItem.java | 2 +- .../entity/WmsInProduceOrderItem.java | 2 +- .../entity/WmsInProduceOrderSurplusItem.java | 2 +- .../WmsInProduceOrderSurplusTicket.java | 2 +- .../wms/repository/entity/WmsInTaskItem.java | 2 +- .../wms/repository/entity/WmsInventory.java | 2 +- .../entity/WmsInventoryBarcodePrinting.java | 4 +-- .../entity/WmsInventoryCheckTaskItem.java | 2 +- .../entity/WmsNormalPrintOrder.java | 2 +- .../repository/entity/WmsOutAssistance.java | 4 +-- .../entity/WmsOutAssistanceItem.java | 2 +- .../entity/WmsOutAssistanceTicket.java | 2 +- .../entity/WmsOutCostcenterItem.java | 2 +- .../entity/WmsOutCostcenterTicket.java | 2 +- .../repository/entity/WmsOutProduceItem.java | 2 +- .../entity/WmsOutProduceTicket.java | 2 +- .../repository/entity/WmsPoReceiptItem.java | 2 +- .../repository/entity/WmsQcReceiveItem.java | 2 +- .../repository/entity/WmsQrCodeMaster.java | 2 +- .../entity/WmsReturnRequestItem.java | 2 +- .../entity/WmsSrmMaterialQmsReceiptItem.java | 2 +- .../entity/WmsSrmMaterialReceiptItem.java | 2 +- .../entity/WmsSrmQualityInspection.java | 2 +- .../wms/repository/entity/WmsStorage.java | 2 +- .../entity/WmsTransferCompanyItem.java | 4 +-- .../entity/WmsTransferCompanyTicket.java | 4 +-- .../entity/WmsTransferFactoryItem.java | 2 +- .../entity/WmsTransferFactoryTicket.java | 4 +-- .../repository/entity/WmsTransferOrders.java | 2 +- .../wms/repository/entity/WmsWarehouse.java | 6 ++-- .../repository/mapper/WmsWarehouseMapper.java | 2 +- .../service/IWmsInventoryService.java | 4 +-- .../service/IWmsWarehouseService.java | 4 +-- .../WmsInventoryCheckTaskServiceImpl.java | 2 +- .../service/impl/WmsWarehouseServiceImpl.java | 14 ++++----- .../SyncStorageFromSAPProcessor.java | 10 +++---- .../wms/scheduled/service/SapService.java | 4 +-- .../controller/SiteStockController.java | 4 +-- .../pojo/dto/SAPMaterialInfoInOrderDTO.java | 2 +- .../wms/srm/receive/service/SapService.java | 14 ++++----- 168 files changed, 287 insertions(+), 289 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/BinController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/BinController.java index ea431c5a..2a25e3f8 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/BinController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/BinController.java @@ -127,7 +127,7 @@ public class BinController extends BaseController { /** * 获取库存信息 - * @param warehouseId 仓库id + * @param warehouseId 库存地点id */ @GetMapping("getInventory") public ApiResult> getInventory(@RequestParam Long warehouseId) { diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java index b7e29291..fa0ca52c 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceOrderController.java @@ -632,16 +632,16 @@ public class InProduceOrderController extends BaseController { // .update(); // Set dbMapBins = storageService.getBinNos(it.getMaterialNo(), it.getFactoryNo(), it.getWarehouseNo()); // if (!binNos.equals(dbMapBins)) { -// //调用SAP接口保存库位信息 +// //调用SAP接口保存库存地点信息 //// sapService.zwm3A02(it.getFactoryNo(), it.getMaterialNo(), it.getWarehouseNo(), binNos); -// //保存库位信息到数据库 +// //保存库存地点信息到数据库 // DictionaryItem factory = dictionaryService.getItemByCode(Constant.DICTIONARY_FACTORY, it.getFactoryNo()); // VUtil.trueThrowBusinessError(Objects.isNull(factory)).throwMessage("工厂(" + it.getFactoryNo() + ")不存在"); // WmsWarehouse warehouse = warehouseService.lambdaQuery() // .eq(WmsWarehouse::getFactoryId, factory.getId()) // .eq(WmsWarehouse::getNo, it.getWarehouseNo()) // .one(); -// VUtil.trueThrowBusinessError(Objects.isNull(warehouse)).throwMessage("仓库(" + it.getWarehouseNo() + ")不存在"); +// VUtil.trueThrowBusinessError(Objects.isNull(warehouse)).throwMessage("库存地点(" + it.getWarehouseNo() + ")不存在"); // WmsStorage storage = storageService.lambdaQuery() // .eq(WmsStorage::getMaterialNo, it.getMaterialNo()) // .eq(WmsStorage::getWarehouseId, warehouse.getId()) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InventoryController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InventoryController.java index daf5b31e..11ad743a 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InventoryController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InventoryController.java @@ -91,10 +91,10 @@ public class InventoryController extends BaseController { } /** - * 获取库存盘点任务仓库列表 + * 获取库存盘点任务库存地点列表 * * @param id 任务ID - * @return 仓库列表 + * @return 库存地点列表 */ @GetMapping("check/getTaskItems") public ApiResult> getTaskItems(@Valid @RequestParam(required = false) Long id) { diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/LocationTransferController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/LocationTransferController.java index 49f3a610..07ac2f4a 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/LocationTransferController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/LocationTransferController.java @@ -171,14 +171,14 @@ public class LocationTransferController extends BaseController { VUtil.trueThrowBusinessError( allQcMasters.stream().map(WmsQrCodeMaster::getStorageLocation).toList().size() != allQcMasters.stream().map(WmsQrCodeMaster::getStorageLocation).collect(Collectors.toSet()).size() - ).throwMessage("二维码所在仓库不一致"); + ).throwMessage("二维码所在库存地点不一致"); // WmsBin wmsBin = wmsBinService.lambdaQuery().eq(WmsBin::getNo, request.getBinLocation()) // .one(); // VUtil.trueThrowBusinessError(ObjectUtil.isNull(wmsBin)).throwMessage("无效的储位"); // WmsWarehouse wmsWarehouse = warehouseService.lambdaQuery().eq(WmsWarehouse::getId, wmsBin.getWarehouseId()) // .one(); -// VUtil.trueThrowBusinessError(ObjectUtil.isNull(wmsWarehouse)).throwMessage("无效的储位【仓库无效】"); +// VUtil.trueThrowBusinessError(ObjectUtil.isNull(wmsWarehouse)).throwMessage("无效的储位【库存地点无效】"); // // DictionaryItem dictionaryItem = dictionaryItemService.lambdaQuery() // .eq(DictionaryItem::getId, wmsWarehouse.getFactoryId()) @@ -191,7 +191,7 @@ public class LocationTransferController extends BaseController { // item -> !item.getFactoryCode().equals(dictionaryItem.getCode()) // && !item.getStorageLocation().equals(wmsWarehouse.getNo())) // .collect(Collectors.toList()).size(); -// VUtil.trueThrowBusinessError(count2 > 0).throwMessage("存在不同仓库的二维码"); +// VUtil.trueThrowBusinessError(count2 > 0).throwMessage("存在不同库存地点的二维码"); // boolean hasDuplicates1 = allQcMasters.stream() // .map(WmsQrCodeMaster::getBarcodeCode) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java index 2ad7a41e..3c0d753e 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java @@ -596,7 +596,7 @@ public class NormalPGIController extends BaseController { .map(item -> Triple.of(item.getPoNum(), order.getSupplierNum(), item.getItemCode())) .distinct() .collect(Collectors.toList()); - //重新读取SAP的接口，更新物料信息(已收货数、仓库信息、储位信息 等) + //重新读取SAP的接口，更新物料信息(已收货数、库存地点信息、储位信息 等) List sapSyncParamsDTOS = new ArrayList<>(); uniqueCombinations.forEach(triple -> { List items = sapCommonService.getMaterialInfoInOrder(triple.getLeft(), triple.getMiddle(), triple.getRight()); @@ -1554,7 +1554,7 @@ public class NormalPGIController extends BaseController { VUtil.trueThrowBusinessError(pacageScanVO.getPackageStatus() == 0).throwMessage("此打包码尚未打包"); VUtil.trueThrowBusinessError(pacageScanVO.getPackageStatus() == 2).throwMessage("此打包码已完成收货"); List pdaOrderVO = normalPGIControllerService.getPackageContents(request.getPackageCode()); - // 无码的时候要判断仓库，只有所有仓库都是支持大码一键收货的情况 + // 无码的时候要判断库存地点，只有所有库存地点都是支持大码一键收货的情况 List warehouseCodes = pdaOrderVO.stream().map(PDAOrderItemVO::getReceivedWarehouse).distinct().collect(Collectors.toList()); List warehouseList = wmsWarehouseService.lambdaQuery() .in(WmsWarehouse::getNo, warehouseCodes) @@ -1562,7 +1562,7 @@ public class NormalPGIController extends BaseController { .list(); if (CollectionUtil.isNotEmpty(warehouseList)) { List warehouseNoList = warehouseList.stream().map(WmsWarehouse::getName).collect(Collectors.toList()); - VUtil.trueThrowBusinessError(true).throwMessage("仓库[" + warehouseNoList.stream().collect(Collectors.joining(";")) + "]不允许免扫码收货"); + VUtil.trueThrowBusinessError(true).throwMessage("库存地点[" + warehouseNoList.stream().collect(Collectors.joining(";")) + "]不允许免扫码收货"); } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java index 26aae8dc..717d2ee4 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java @@ -819,7 +819,7 @@ public class OutProduceController extends BaseController { map.put("需求日期", it.getBdter()); map.put("申请数量", it.getNum()); map.put("工厂", order.getDwerk()); - map.put("仓库", it.getLgort2()); + map.put("库存地点", it.getLgort2()); datas.add(map); }); EecExcelUtil.eecExcel((order.getDataType() == 0 ? "生产订单发料单" : "成品发货出库单") + order.getTicketNo() diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/QrCodeMasterController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/QrCodeMasterController.java index 70b73b17..af53c03d 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/QrCodeMasterController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/QrCodeMasterController.java @@ -243,7 +243,7 @@ public class QrCodeMasterController extends BaseController { /** * 换箱 - * 针对仓库内的物料箱合并，修改物料的箱属性和库存 + * 针对库存地点内的物料箱合并，修改物料的箱属性和库存 * @param request * @return */ @@ -281,12 +281,12 @@ public class QrCodeMasterController extends BaseController { VUtil.trueThrowBusinessError(CollectionUtil.isNotEmpty(differentBatchNos)) .throwMessage("批次号不一致，不一致的物料条码号为：" + differentBatchNos); - // 只有同一个工厂的同一个仓库的可以进行换箱 + // 只有同一个工厂的同一个库存地点的可以进行换箱 Integer count1 = qrCodeMasterService.lambdaQuery() .eq(WmsQrCodeMaster::getFactoryCode, request.getFactoryCode()) .eq(WmsQrCodeMaster::getStorageLocation, request.getStorageLocation()) .count().intValue(); - VUtil.trueThrowBusinessError(count1 > 0).throwMessage("换箱只可以在相同的仓库下进行"); + VUtil.trueThrowBusinessError(count1 > 0).throwMessage("换箱只可以在相同的库存地点下进行"); // 区分状态 // 1、新箱的状态，没有入过库;直接将明细物料退库，重新绑定 if (processStage.equals(BarCodeProcessStage.Unpackaged)) { diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java index 2d1ba468..c56f98e1 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java @@ -923,7 +923,7 @@ public class StructuralPackageOrderController extends BaseController { if (Objects.isNull(dto)) { log.error("{},{},{}未从SAP的ZIM_004接口查询到数据", it.getExternalOrderNo(), it.getSupplierCode(), it.getPackageNo()); } else if (StrUtil.isBlank(dto.getWarehouseNo())) { - log.error("{},{},{}未从SAP的ZIM_004接口查询仓库为空", it.getExternalOrderNo(), it.getSupplierCode(), it.getPackageNo()); + log.error("{},{},{}未从SAP的ZIM_004接口查询库存地点为空", it.getExternalOrderNo(), it.getSupplierCode(), it.getPackageNo()); } else { it.setWarehouseNo(dto.getWarehouseNo()); it.setBinNos(binService.getBinNo(it.getPackageNo(), dto.getWerks(), dto.getWarehouseNo())); @@ -1029,7 +1029,7 @@ public class StructuralPackageOrderController extends BaseController { ); SAPMaterialInfoInOrderDTO dto = CollectionUtil.get(sapService.zim004(order.getExternalOrderNo(), order.getSupplierCode(), order.getPackageNo()), 0); VUtil.trueThrowBusinessError(Objects.isNull(dto)).throwMessage("ZIM_004未查询到数据"); - VUtil.trueThrowBusinessError(StrUtil.isBlank(dto.getWarehouseNo())).throwMessage("ZIM_004接口查询到仓库为空"); + VUtil.trueThrowBusinessError(StrUtil.isBlank(dto.getWarehouseNo())).throwMessage("ZIM_004接口查询到库存地点为空"); BigDecimal num = BigDecimal.valueOf(order.getNum()); OptRecordDTO optRecordDTO = new OptRecordDTO(); optRecordDTO.setOperationType((short) 1) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/WarehouseController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/WarehouseController.java index 406d7c12..586b6b66 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/WarehouseController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/WarehouseController.java @@ -9,14 +9,12 @@ import com.nflg.wms.common.pojo.qo.WarehouseSearchQO; import com.nflg.wms.common.pojo.qo.WarehouseUpdateQO; import com.nflg.wms.common.pojo.vo.WarehouseSimpleVO; import com.nflg.wms.common.pojo.vo.WarehouseVO; -import com.nflg.wms.common.util.VUtil; import com.nflg.wms.repository.entity.DictionaryItem; import com.nflg.wms.starter.BaseController; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; import jakarta.validation.constraints.NotNull; -import org.apache.http.annotation.Obsolete; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -25,7 +23,7 @@ import java.io.IOException; import java.util.List; /** - * 仓库管理 + * 库存地点管理 */ @RestController @RequestMapping("/warehouse") @@ -43,7 +41,7 @@ public class WarehouseController extends BaseController { } /** - * 新增仓库 + * 新增库存地点 */ @PostMapping("add") public ApiResult add(@Valid @RequestBody WarehouseAddQO request){ @@ -52,7 +50,7 @@ public class WarehouseController extends BaseController { } /** - * 更新仓库 + * 更新库存地点 */ @PostMapping("update") public ApiResult update(@Valid @RequestBody WarehouseUpdateQO request){ @@ -61,7 +59,7 @@ public class WarehouseController extends BaseController { } /** - * 删除仓库 + * 删除库存地点 */ @PostMapping("delete") public ApiResult delete(@Valid @NotNull Long id){ @@ -70,7 +68,7 @@ public class WarehouseController extends BaseController { } /** - * 启用/禁用仓库 + * 启用/禁用库存地点 * @param request 请求参数 */ @PostMapping("/enable") @@ -80,7 +78,7 @@ public class WarehouseController extends BaseController { } /** - * 搜索仓库 + * 搜索库存地点 * @param request 搜索参数 */ @PostMapping("search") @@ -89,8 +87,8 @@ public class WarehouseController extends BaseController { } /** - * 获取仓库详情 - * @param id 仓库id + * 获取库存地点详情 + * @param id 库存地点id */ @GetMapping("getInfo") public ApiResult getInfo(@Valid @RequestParam @NotNull Long id) { @@ -98,7 +96,7 @@ public class WarehouseController extends BaseController { } /** - * 导入仓库 + * 导入库存地点 * @param file 文件 */ @Transactional @@ -108,7 +106,7 @@ public class WarehouseController extends BaseController { } /** - * 导出选中的仓库，为空时导出模版 + * 导出选中的库存地点，为空时导出模版 * @param ids 选中的id集合 */ @PostMapping("export") @@ -126,7 +124,7 @@ public class WarehouseController extends BaseController { } /** - * 获取启用的仓库列表 + * 获取启用的库存地点列表 * @param factoryNo 工厂编号 */ @GetMapping("getEnableList") @@ -136,7 +134,7 @@ public class WarehouseController extends BaseController { // /** // * 手动拉取 -// * @param id 仓库id +// * @param id 库存地点id // */ // @Obsolete // @GetMapping("syncFromSAP") diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/dto/QCReceiveItemDTO.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/dto/QCReceiveItemDTO.java index 9ee6c132..fd223c1f 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/dto/QCReceiveItemDTO.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/dto/QCReceiveItemDTO.java @@ -11,7 +11,7 @@ import java.time.LocalDateTime; public class QCReceiveItemDTO { private Long id; /** - * 仓库编号 + * 库存地点编号 */ private String receivedWarehouse; diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/dto/SAPMaterialInfoInOrderDTO.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/dto/SAPMaterialInfoInOrderDTO.java index b33474cb..129b3c59 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/dto/SAPMaterialInfoInOrderDTO.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/dto/SAPMaterialInfoInOrderDTO.java @@ -19,7 +19,7 @@ public class SAPMaterialInfoInOrderDTO { private BigDecimal transportNum; /** - * 仓库编号 + * 库存地点编号 */ @JsonProperty("LGORT") private String warehouseNo; diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/BinControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/BinControllerService.java index 2e40ed71..66bdb982 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/BinControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/BinControllerService.java @@ -141,7 +141,7 @@ public class BinControllerService { String warehouseNo = StrUtil.trim(dto.getWarehouseNo()); WmsWarehouse warehouse = null; if (StrUtil.isBlank(warehouseNo)) { - sb.append("仓库编号不能为空;"); + sb.append("库存地点编号不能为空;"); } else if (Objects.nonNull(factory)) { warehouse = wmsWarehouseService.lambdaQuery().eq(WmsWarehouse::getFactoryId, factory.getId()).eq(WmsWarehouse::getNo, warehouseNo).one(); } @@ -163,7 +163,7 @@ public class BinControllerService { } } if (StrUtil.isBlank(dto.getName())) { - sb.append("仓库名称不能为空;"); + sb.append("库存地点名称不能为空;"); } else { bin.setName(dto.getName()); } @@ -186,9 +186,9 @@ public class BinControllerService { if (CollectionUtil.isEmpty(datas)) { datas.add(new BinExcelExportDTO() .setFactoryNo("(必填)工厂编号") - .setWarehouseNo("(必填)库位编号") - .setNo("(必填)仓位编号") - .setName("(必填)仓位名称") + .setWarehouseNo("(必填)库存地点编号") + .setNo("(必填)储位编号") + .setName("(必填)储位名称") .setRemark("备注信息，此行为提示信息，导入时请删除")); } new Workbook() diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SAPCommonService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SAPCommonService.java index bcd9f4e0..506ed969 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SAPCommonService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SAPCommonService.java @@ -45,14 +45,14 @@ public class SAPCommonService { syncParams.setKzkri(materialInfoInOrder.getKzkri()); syncParams.setWarehouseNo(materialInfoInOrder.getWarehouseNo()); - //获取仓库信息 + //获取库存地点信息 // List warehouseNos = new ArrayList<>(); // warehouseNos.add(materialInfoInOrder.getWarehouseNo()); // List materialNos = new ArrayList<>(); // materialNos.add(materialInfoInOrder.getMatnr()); // List list = sapService.zwm3A01(materialInfoInOrder.getWerks(), warehouseNos, materialNos, null, null); // if (!CollectionUtil.isEmpty(list)) { -// //同步仓库信息 +// //同步库存地点信息 // SAPSyncFromDTO dbWarehouse = list.get(0); // syncParams.setWarehouseNo(dbWarehouse.getWarehouseNo()); // syncParams.setBinNos(dbWarehouse.getBinNos()); @@ -95,14 +95,14 @@ public class SAPCommonService { syncParams.setLbprt(materialInfoInOrder.getLbprt()); syncParams.setKzkri(materialInfoInOrder.getKzkri()); - //获取仓库信息 + //获取库存地点信息 // List warehouseNos = new ArrayList<>(); // warehouseNos.add(materialInfoInOrder.getWarehouseNo()); // List materialNos = new ArrayList<>(); // materialNos.add(materialInfoInOrder.getMatnr()); // List list = sapService.zwm3A01(materialInfoInOrder.getWerks(), warehouseNos, materialNos, null, null); // if (!CollectionUtil.isEmpty(list)) { -// //同步仓库信息 +// //同步库存地点信息 // SAPSyncFromDTO dbWarehouse = list.get(0); // syncParams.setWarehouseNo(dbWarehouse.getWarehouseNo()); // syncParams.setBinNos(dbWarehouse.getBinNos()); diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SapService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SapService.java index 0453baf5..35a451eb 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SapService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/SapService.java @@ -313,10 +313,10 @@ public class SapService { } // /** -// * 保存库位 +// * 保存库存地点 // * @param factory 工厂编号 // * @param materialNo 物料编号 -// * @param warehouseNo 仓库编号 +// * @param warehouseNo 库存地点编号 // * @param binNos 储位编号列表 // */ // public void zwm3A02(String factory, String materialNo, String warehouseNo, Collection binNos) { @@ -340,7 +340,7 @@ public class SapService { // /** // * 获取库存信息 // * @param factory 工厂编号 -// * @param warehouseNo 仓库编号 +// * @param warehouseNo 库存地点编号 // * @param materialNo 物料编号 // */ // public SAPSyncFromDTO zwm3A01(String factory, String warehouseNo, String materialNo) { @@ -351,7 +351,7 @@ public class SapService { // /** // * 获取库存信息 // * @param factory 工厂编号 -// * @param warehouseNos 仓库编号列表 +// * @param warehouseNos 库存地点编号列表 // * @param beginTime 开始时间，格式yyyyMMdd // * @param endTime 结束时间，格式yyyyMMdd // */ @@ -1214,8 +1214,8 @@ public class SapService { } /** - * 获取物料的属性信息（仓库、库位、批次管理、序号管理，是否质检） - * @param query 查询条件封装对象，包含工厂、仓库、物料等信息 + * 获取物料的属性信息（库存地点、批次管理、序号管理，是否质检） + * @param query 查询条件封装对象，包含工厂、库存地点、物料等信息 * @return 物料属性信息列表，每个元素为 {@link ZWM3A21ResultDTO} 类型 */ public List zwm3a21(ZWM3A21QueryDTO query) { @@ -1415,7 +1415,7 @@ public class SapService { // /** // * 获取库存信息 // * @param factory 工厂编号 -// * @param warehouseNos 仓库编号列表 +// * @param warehouseNos 库存地点编号列表 // * @param beginTime 开始时间，格式yyyyMMdd // * @param endTime 结束时间，格式yyyyMMdd // */ diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/StorageControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/StorageControllerService.java index fd3e3ed4..d0f24434 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/StorageControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/StorageControllerService.java @@ -178,24 +178,24 @@ public class StorageControllerService { String warehouseNo = StrUtil.trim(dto.getWarehouseNo()); WmsWarehouse warehouse = null; if (StrUtil.isBlank(warehouseNo)) { - sb.append("库位编号不能为空;"); + sb.append("库存地点编号不能为空;"); } else if (Objects.nonNull(item)) { warehouse = warehouseService.lambdaQuery().eq(WmsWarehouse::getFactoryId, item.getId()).eq(WmsWarehouse::getNo, warehouseNo).one(); if (Objects.isNull(warehouse)) { - sb.append("库位编号无效;"); + sb.append("库存地点编号无效;"); } else { storage.setWarehouseId(warehouse.getId()); } } if (StrUtil.isBlank(dto.getBinNo())) { - sb.append("仓位编号不能为空;"); + sb.append("储位编号不能为空;"); } else if (Objects.nonNull(warehouse)) { WmsBin bin = wmsBinService.lambdaQuery() .eq(WmsBin::getWarehouseId, warehouse.getId()) .eq(WmsBin::getNo, dto.getBinNo()) .one(); if (Objects.isNull(bin)) { - sb.append("仓位编号无效;"); + sb.append("储位编号无效;"); }else { storage.setBinId(bin.getId()); } @@ -223,7 +223,7 @@ public class StorageControllerService { datas.add(new StorageExcelImportDTO() .setMaterialNo("(必填)物料编号") .setFactoryNo("(必填)工厂编号") - .setWarehouseNo("(必填)库位编号") + .setWarehouseNo("(必填)库存地点编号") .setBinNo("(必填)储位编号") .setRemark("备注信息，此行为提示信息，导入时请删除")); } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/StructuralPackageControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/StructuralPackageControllerService.java index dc96aeac..0abfcb88 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/StructuralPackageControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/StructuralPackageControllerService.java @@ -513,14 +513,14 @@ public class StructuralPackageControllerService { // private void syncStorage(MaterialStorageItemQO qo) { // Set dbMapBins = storageService.getBinNos(qo.getMaterialNo(), qo.getFactory(), qo.getReceivedWarehouse()); // if (!qo.getBinNos().equals(dbMapBins)) { -// //保存库位信息到数据库 +// //保存库存地点信息到数据库 // DictionaryItem factory = dictionaryService.getItemByCode(Constant.DICTIONARY_FACTORY, qo.getFactory()); // VUtil.trueThrowBusinessError(Objects.isNull(factory)).throwMessage("工厂(" + qo.getFactory() + ")不存在"); // WmsWarehouse warehouse = warehouseService.lambdaQuery() // .eq(WmsWarehouse::getFactoryId, factory.getId()) // .eq(WmsWarehouse::getNo, qo.getReceivedWarehouse()) // .one(); -// VUtil.trueThrowBusinessError(Objects.isNull(warehouse)).throwMessage("仓库(" + qo.getReceivedWarehouse() + ")不存在"); +// VUtil.trueThrowBusinessError(Objects.isNull(warehouse)).throwMessage("库存地点(" + qo.getReceivedWarehouse() + ")不存在"); // WmsStorage storage = storageService.lambdaQuery() // .eq(WmsStorage::getMaterialNo, qo.getMaterialNo()) // .eq(WmsStorage::getWarehouseId, warehouse.getId()) @@ -555,7 +555,7 @@ public class StructuralPackageControllerService { // .setBinId(bin.getId())) // .toList() // ); -// //调用SAP接口保存库位信息 +// //调用SAP接口保存库存地点信息 //// sapService.zwm3A02(qo.getFactory(), qo.getMaterialNo(), qo.getReceivedWarehouse(), qo.getBinNos()); // } // } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/WarehouseControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/WarehouseControllerService.java index 187b9263..d9fabb80 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/WarehouseControllerService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/WarehouseControllerService.java @@ -4,12 +4,10 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.nflg.wms.common.constant.Constant; import com.nflg.wms.common.constant.STATE; import com.nflg.wms.common.pojo.ApiResult; -import com.nflg.wms.common.pojo.dto.SAPSyncFromDTO; import com.nflg.wms.common.pojo.dto.WarehouseExcelExportDTO; import com.nflg.wms.common.pojo.dto.WarehouseExcelImportDTO; import com.nflg.wms.common.pojo.qo.EnableQO; @@ -22,8 +20,10 @@ import com.nflg.wms.common.util.DateTimeUtil; import com.nflg.wms.common.util.EecExcelUtil; import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.common.util.VUtil; -import com.nflg.wms.repository.entity.*; -import com.nflg.wms.repository.service.*; +import com.nflg.wms.repository.entity.DictionaryItem; +import com.nflg.wms.repository.entity.WmsWarehouse; +import com.nflg.wms.repository.service.IDictionaryItemService; +import com.nflg.wms.repository.service.IWmsWarehouseService; import com.nflg.wms.starter.service.FileUploadService; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletResponse; @@ -112,11 +112,11 @@ public class WarehouseControllerService { List warehouseVOS = CollectionUtil.isNotEmpty(ids) ? warehouseService.getList(ids) : new ArrayList<>(); List datas = warehouseVOS.stream().map(warehouse -> Convert.convert(WarehouseExcelExportDTO.class, warehouse)).collect(Collectors.toList()); response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); - response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + URLEncoder.encode("仓库导出.xlsx", StandardCharsets.UTF_8)); + response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + URLEncoder.encode("库存地点导出.xlsx", StandardCharsets.UTF_8)); if (CollectionUtil.isEmpty(datas)) { datas.add(new WarehouseExcelExportDTO() - .setNo("(必填)仓库编号") - .setName("(必填)仓库名称") + .setNo("(必填)库存地点编号") + .setName("(必填)库存地点名称") .setPhone("联系电话") .setAddress("所在地点") .setUserName("责任人姓名") @@ -157,7 +157,7 @@ public class WarehouseControllerService { WmsWarehouse wmsWarehouse = new WmsWarehouse(); StringBuilder sb = new StringBuilder(); if (StrUtil.isBlank(dto.getNo())) { - sb.append("仓库编号不能为空;"); + sb.append("库存地点编号不能为空;"); } else { wmsWarehouse = warehouseService.lambdaQuery().eq(WmsWarehouse::getNo, dto.getNo()).one(); if (Objects.isNull(wmsWarehouse)) { @@ -172,7 +172,7 @@ public class WarehouseControllerService { } } if (StrUtil.isBlank(dto.getName())) { - sb.append("仓库名称不能为空;"); + sb.append("库存地点名称不能为空;"); } else { wmsWarehouse.setName(dto.getName()); } @@ -209,7 +209,7 @@ public class WarehouseControllerService { List list = warehouseService.searchNonPage(request); List datas = list.stream().map(warehouse -> Convert.convert(WarehouseExcelExportDTO.class, warehouse)).collect(Collectors.toList()); response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); - response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + URLEncoder.encode("仓库导出.xlsx", StandardCharsets.UTF_8)); + response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + URLEncoder.encode("库存地点导出.xlsx", StandardCharsets.UTF_8)); if (CollectionUtil.isEmpty(datas)) { datas.add(new WarehouseExcelExportDTO()); } @@ -224,8 +224,8 @@ public class WarehouseControllerService { // public String syncFromSAP(@Valid @NotNull Long id) { // WmsWarehouse warehouse = warehouseService.getById(id); -// VUtil.trueThrowBusinessError(Objects.isNull(warehouse)).throwMessage("仓库不存在"); -// VUtil.trueThrowBusinessError(!warehouse.getEnable()).throwMessage("仓库未启用"); +// VUtil.trueThrowBusinessError(Objects.isNull(warehouse)).throwMessage("库存地点不存在"); +// VUtil.trueThrowBusinessError(!warehouse.getEnable()).throwMessage("库存地点未启用"); // DictionaryItem factory = dictionaryItemService.getById(warehouse.getFactoryId()); // VUtil.trueThrowBusinessError(Objects.isNull(factory)).throwMessage("工厂不存在"); // String start = DateTimeUtil.format(LocalDate.now(), "yyyyMMdd"); @@ -241,7 +241,7 @@ public class WarehouseControllerService { // VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(list)).throwMessage("没有获取到数据"); // } else { // log.info("获取到{}条数据", list.size()); -// //同步仓库信息 +// //同步库存地点信息 // warehouseNos = list.stream().map(SAPSyncFromDTO::getWarehouseNo).distinct().toList(); // List dbWarehouses = warehouseService.lambdaQuery().eq(WmsWarehouse::getFactoryId, fy.getId()).in(WmsWarehouse::getNo, warehouseNos).list(); // warehouseNos.forEach(wn -> { @@ -299,7 +299,7 @@ public class WarehouseControllerService { // dbBins.add(dbBin); // } // if (Objects.isNull(dbStorage)) { -// log.info("添加，仓库:{},储位:{}", dto.getWarehouseNo(), sapBinNo); +// log.info("添加，库存地点:{},储位:{}", dto.getWarehouseNo(), sapBinNo); // WmsStorage storage = new WmsStorage() // .setId(IdUtil.getSnowflakeNextId()) // .setMaterialNo(dto.getMaterialNo()) @@ -315,7 +315,7 @@ public class WarehouseControllerService { // .setBinId(dbBin.getId())); // } // } else { -// log.info("更新，仓库:{},储位:{}", dto.getWarehouseNo(), sapBinNo); +// log.info("更新，库存地点:{},储位:{}", dto.getWarehouseNo(), sapBinNo); // if (!StrUtil.equals(dbStorage.getWarehouseNo(), dto.getWarehouseNo())) { // storagesForUpdate.add(new WmsStorage() // .setId(dbStorage.getId()) diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/constant/BarCodeProcessStage.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/constant/BarCodeProcessStage.java index 929cf09e..70627467 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/constant/BarCodeProcessStage.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/constant/BarCodeProcessStage.java @@ -45,7 +45,7 @@ public enum BarCodeProcessStage { */ Hold((short) 8, "已挂起"), /** - * 质检完成,用于仓库转储，出库之后此二维码还需要继续使用，用一个特殊的状态标记 + * 质检完成,用于库存地点转储，出库之后此二维码还需要继续使用，用一个特殊的状态标记 */ Checked((short) 9, "质检已完成"), /** diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/document/InMaterialScanRecord.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/document/InMaterialScanRecord.java index 1ad1305c..b4133691 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/document/InMaterialScanRecord.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/document/InMaterialScanRecord.java @@ -40,7 +40,7 @@ public class InMaterialScanRecord { private String factoryNo; /** - * 仓库编号 + * 库存地点编号 */ private String warehouseNo; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/document/OutMaterialScanRecord.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/document/OutMaterialScanRecord.java index bb63c1b5..da44681c 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/document/OutMaterialScanRecord.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/document/OutMaterialScanRecord.java @@ -63,7 +63,7 @@ public class OutMaterialScanRecord { private String factoryNo; /** - * 仓库编号 + * 库存地点编号 */ private String warehouseNo; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/AllocationOrderDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/AllocationOrderDTO.java index 6546a569..58ee0595 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/AllocationOrderDTO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/AllocationOrderDTO.java @@ -109,7 +109,7 @@ public class AllocationOrderDTO{ private BigDecimal labst; /** - * 转入库位 + * 转入库存地点 */ private String lgpbe1; @@ -152,7 +152,7 @@ public class AllocationOrderDTO{ } /** - * 转出库位 + * 转出库存地点 */ private String lgpbe; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/BinExcelExportDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/BinExcelExportDTO.java index 5d1bcaef..90d9b301 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/BinExcelExportDTO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/BinExcelExportDTO.java @@ -16,21 +16,21 @@ public class BinExcelExportDTO { /** - * *库位编号 + * *库存地点编号 */ - @ExcelColumn("*库位编号") + @ExcelColumn("*库存地点编号") private String warehouseNo; /** - * *仓位编号 + * *储位编号 */ - @ExcelColumn("*仓位编号") + @ExcelColumn("*储位编号") private String no; /** - * 仓位名称 + * 储位名称 */ - @ExcelColumn("*仓位名称") + @ExcelColumn("*储位名称") private String name; /** diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/DepartmentMaterialRequisitionDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/DepartmentMaterialRequisitionDTO.java index ff8db931..5d34b573 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/DepartmentMaterialRequisitionDTO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/DepartmentMaterialRequisitionDTO.java @@ -107,7 +107,7 @@ public class DepartmentMaterialRequisitionDTO { private String sgtxt; /** - * 库存仓位 + * 库存储位 */ private String lgpbe; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/DepartmentMaterialReturnSlipDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/DepartmentMaterialReturnSlipDTO.java index eededc7d..359f144f 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/DepartmentMaterialReturnSlipDTO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/DepartmentMaterialReturnSlipDTO.java @@ -89,7 +89,7 @@ public class DepartmentMaterialReturnSlipDTO { private String sgtxt; /** - * 库存仓位 + * 库存储位 */ private String lgpbe; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/InventoryInDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/InventoryInDTO.java index 58b26fcd..aa90ec76 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/InventoryInDTO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/InventoryInDTO.java @@ -21,7 +21,7 @@ public class InventoryInDTO { private String factoryNo; /** - * 库位 + * 库存地点 */ private String warehouseNo; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/InventoryOutDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/InventoryOutDTO.java index df112668..4297a0c9 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/InventoryOutDTO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/InventoryOutDTO.java @@ -21,7 +21,7 @@ public class InventoryOutDTO { private String factoryNo; /** - * 库位 + * 库存地点 */ private String warehouseNo; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/PackageChildDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/PackageChildDTO.java index 7a618500..45ec9af9 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/PackageChildDTO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/PackageChildDTO.java @@ -83,7 +83,7 @@ public class PackageChildDTO { private String factoryCode; /** - * 仓库 + * 库存地点 */ private String storageLocation; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/PurchaseReturnDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/PurchaseReturnDTO.java index f51ad106..b4cf7730 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/PurchaseReturnDTO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/PurchaseReturnDTO.java @@ -46,7 +46,7 @@ public class PurchaseReturnDTO { private String factoryCode; /** - * 库位 + * 库存地点 */ private String storageLocation; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SAPOrderDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SAPOrderDTO.java index e90804ec..a387776a 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SAPOrderDTO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SAPOrderDTO.java @@ -104,7 +104,7 @@ public class SAPOrderDTO { private String lineNumber; /** - * 仓库号 + * 库存地点号 */ private String warehouseNo; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SAPSyncParamsDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SAPSyncParamsDTO.java index 657d0205..5f8a4a7e 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SAPSyncParamsDTO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SAPSyncParamsDTO.java @@ -14,7 +14,7 @@ public class SAPSyncParamsDTO { private BigDecimal transportNum; /** - * 仓库编号 + * 库存地点编号 */ private String warehouseNo; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SRMQualityInspectionResultDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SRMQualityInspectionResultDTO.java index a748b176..ab59cc91 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SRMQualityInspectionResultDTO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SRMQualityInspectionResultDTO.java @@ -63,7 +63,7 @@ public class SRMQualityInspectionResultDTO { public String unit; /** - * 收货仓库 + * 收货库存地点 */ public String receivedWarehouse; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/StorageDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/StorageDTO.java index 6b044e78..894ccbce 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/StorageDTO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/StorageDTO.java @@ -10,7 +10,7 @@ import java.util.Set; public class StorageDTO { /** - * 仓库编号 + * 库存地点编号 */ private String warehouseNo; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/StorageExcelImportDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/StorageExcelImportDTO.java index f057cb42..df36bc55 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/StorageExcelImportDTO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/StorageExcelImportDTO.java @@ -21,15 +21,15 @@ public class StorageExcelImportDTO { private String factoryNo; /** - * 库位编号 + * 库存地点编号 */ - @ExcelColumn("*库位编号") + @ExcelColumn("*库存地点编号") private String warehouseNo; /** - * 仓位编号 + * 储位编号 */ - @ExcelColumn("*仓位编号") + @ExcelColumn("*储位编号") private String binNo; /** diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SubcontractedOrderDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SubcontractedOrderDTO.java index 4ce61eb5..b0ce4244 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SubcontractedOrderDTO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/SubcontractedOrderDTO.java @@ -59,7 +59,7 @@ public class SubcontractedOrderDTO { private String werks; /** - * 发货仓库 + * 发货库存地点 */ private String lgort1; @@ -69,7 +69,7 @@ public class SubcontractedOrderDTO { private String ebelp; /** - * 收货仓库 + * 收货库存地点 */ private String lgort; @@ -117,7 +117,7 @@ public class SubcontractedOrderDTO { } /** - * 库存仓位 + * 库存储位 */ private String lgpbe; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/TransferOrderDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/TransferOrderDTO.java index c472352a..dd886838 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/TransferOrderDTO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/TransferOrderDTO.java @@ -116,7 +116,7 @@ public class TransferOrderDTO { private String sgtxt; /** - * 库存仓位 + * 库存储位 */ private String lgpbe; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/WarehouseExcelExportDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/WarehouseExcelExportDTO.java index c88acad4..040f7101 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/WarehouseExcelExportDTO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/WarehouseExcelExportDTO.java @@ -9,15 +9,15 @@ import org.ttzero.excel.annotation.ExcelColumn; public class WarehouseExcelExportDTO { /** - * 仓库编码 + * 库存地点编码 */ - @ExcelColumn("*仓库编码") + @ExcelColumn("*库存地点编码") private String no; /** - * 仓库名称 + * 库存地点名称 */ - @ExcelColumn("*仓库名称") + @ExcelColumn("*库存地点名称") private String name; /** diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/WarehouseExcelImportDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/WarehouseExcelImportDTO.java index d4c5bfb9..8b317fbc 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/WarehouseExcelImportDTO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/WarehouseExcelImportDTO.java @@ -9,15 +9,15 @@ import org.ttzero.excel.annotation.ExcelColumn; public class WarehouseExcelImportDTO { /** - * 仓库编码 + * 库存地点编码 */ - @ExcelColumn("*仓库编码") + @ExcelColumn("*库存地点编码") private String no; /** - * 仓库名称 + * 库存地点名称 */ - @ExcelColumn("*仓库名称") + @ExcelColumn("*库存地点名称") private String name; /** diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM00MB007DTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM00MB007DTO.java index 06a4ea43..b728d8e8 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM00MB007DTO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM00MB007DTO.java @@ -40,7 +40,7 @@ public class ZWM00MB007DTO { private String pwerk; /** - * 仓库 + * 库存地点 */ private String lgort; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A02QO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A02QO.java index 501933d6..0c71885a 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A02QO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A02QO.java @@ -23,7 +23,7 @@ public class ZWM3A02QO { private String lgort; /** - * 库存仓位 + * 库存储位 */ private String lgpbe; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A19ITEMDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A19ITEMDTO.java index 56f00cbd..04d27d1d 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A19ITEMDTO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A19ITEMDTO.java @@ -66,12 +66,12 @@ public class ZWM3A19ITEMDTO { private String zxiah; /** - * 仓库 + * 库存地点 */ private String lgort; /** - * 仓库名称 + * 库存地点名称 */ private String lgobe; } \ No newline at end of file diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A21ResultDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A21ResultDTO.java index 0f27f62c..91fed019 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A21ResultDTO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/ZWM3A21ResultDTO.java @@ -14,7 +14,7 @@ public class ZWM3A21ResultDTO { private String sernp; //物料编号 private String matnr; - //库存仓位 + //库存储位 private String lgpbe; //批次管理需求的标识 private String xchpf; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/Zim001QueryResultItem1DTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/Zim001QueryResultItem1DTO.java index be8fe738..caebe863 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/Zim001QueryResultItem1DTO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/Zim001QueryResultItem1DTO.java @@ -61,7 +61,7 @@ public class Zim001QueryResultItem1DTO { private String WERKS; /** - * 仓库 + * 库存地点 */ private String LGORT; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/BarcodePrintingAddQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/BarcodePrintingAddQO.java index 498be256..45fa6830 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/BarcodePrintingAddQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/BarcodePrintingAddQO.java @@ -33,7 +33,7 @@ public class BarcodePrintingAddQO { private String factoryCode; /** - * 仓库编号 + * 库存地点编号 */ @NotBlank @ExcelColumn("库存地点(*)") diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/BarcodePrintingEditQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/BarcodePrintingEditQO.java index 3f092aa6..9e28e7ff 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/BarcodePrintingEditQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/BarcodePrintingEditQO.java @@ -75,13 +75,13 @@ public class BarcodePrintingEditQO { private String factoryCode; // /** -// * 仓库id +// * 库存地点id // */ // @NotNull // private Long warehouseId; /** - * 仓库编号 + * 库存地点编号 */ @NotBlank private String warehouseNo; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/BinAddQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/BinAddQO.java index 356a9a37..f372603f 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/BinAddQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/BinAddQO.java @@ -8,7 +8,7 @@ import lombok.Data; public class BinAddQO { /** - * 仓库ID + * 库存地点ID */ private Long warehouseId; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/BinSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/BinSearchQO.java index 98bd1e36..1a667f40 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/BinSearchQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/BinSearchQO.java @@ -7,7 +7,7 @@ public class BinSearchQO extends PageQO{ /** - * 仓库ID + * 库存地点ID */ private Long warehouseId; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/CommendationItemQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/CommendationItemQO.java index d76cc9c1..05576d71 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/CommendationItemQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/CommendationItemQO.java @@ -12,7 +12,7 @@ public class CommendationItemQO { private String factory; //物料编号 private String materialNo; - // 仓库编号 + // 库存地点编号 private String warehouseNumber; //出库数量 private BigDecimal qty; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/DeliverNormalOrderSaveItemQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/DeliverNormalOrderSaveItemQO.java index 148789e6..a7e91d9f 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/DeliverNormalOrderSaveItemQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/DeliverNormalOrderSaveItemQO.java @@ -88,7 +88,7 @@ public class DeliverNormalOrderSaveItemQO { private String unit; /** - * 仓库 + * 库存地点 */ private String warehouseNo; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/GoodsReceiptAddQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/GoodsReceiptAddQO.java index d4ddaa0f..a39fd198 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/GoodsReceiptAddQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/GoodsReceiptAddQO.java @@ -46,7 +46,7 @@ public class GoodsReceiptAddQO { private String factoryCode; /** - * 库位 + * 库存地点 */ private String storageLocation; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InCostCenterBackSubmitQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InCostCenterBackSubmitQO.java index f18d5513..68c9e4a6 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InCostCenterBackSubmitQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InCostCenterBackSubmitQO.java @@ -14,7 +14,7 @@ public class InCostCenterBackSubmitQO { private String no; /** - * 实际入库仓库编号 + * 实际入库库存地点编号 */ @NotBlank private String lgort; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InProduceBackSubmitQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InProduceBackSubmitQO.java index e5d63648..6f3ea75c 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InProduceBackSubmitQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InProduceBackSubmitQO.java @@ -14,7 +14,7 @@ public class InProduceBackSubmitQO { private String no; /** - * 仓库编号 + * 库存地点编号 */ @NotBlank private String lgort; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InProduceOrderReceiveMaterialQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InProduceOrderReceiveMaterialQO.java index d2cc7c35..7ed3d063 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InProduceOrderReceiveMaterialQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InProduceOrderReceiveMaterialQO.java @@ -16,7 +16,7 @@ public class InProduceOrderReceiveMaterialQO { private String materialNo; /** - * 仓库编号 + * 库存地点编号 */ @NotBlank private String warehouseNo; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InSubmitQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InSubmitQO.java index d081130a..71cee5a5 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InSubmitQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InSubmitQO.java @@ -17,7 +17,7 @@ public class InSubmitQO { private String no; /** - * 入库仓库编号 + * 入库库存地点编号 */ @NotBlank private String lgort1; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InventoryCheckTaskSaveItemQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InventoryCheckTaskSaveItemQO.java index 66b43054..5a7c47da 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InventoryCheckTaskSaveItemQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InventoryCheckTaskSaveItemQO.java @@ -10,7 +10,7 @@ public class InventoryCheckTaskSaveItemQO { private Long id; /** - * 仓库id + * 库存地点id */ @NotNull private Long warehouseId; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InventoryForOutQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InventoryForOutQO.java index d233c910..e26f9090 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InventoryForOutQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InventoryForOutQO.java @@ -17,7 +17,7 @@ public class InventoryForOutQO { private String factoryNo; /** - * 仓库编号 + * 库存地点编号 */ @NotBlank private String warehouseNo; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InventoryIn1ItemQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InventoryIn1ItemQO.java index b1044ccd..10f6449f 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InventoryIn1ItemQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InventoryIn1ItemQO.java @@ -17,7 +17,7 @@ public class InventoryIn1ItemQO { private Long itemId; /** - * 仓库编号 + * 库存地点编号 */ @NotBlank private String warehouseNo; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InventoryInQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InventoryInQO.java index ccfb42a3..1f07a756 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InventoryInQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InventoryInQO.java @@ -18,7 +18,7 @@ public class InventoryInQO { private Long id; /** - * 仓库编号 + * 库存地点编号 */ @NotBlank private String warehouseNo; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InventorySearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InventorySearchQO.java index 41c880fb..8982548e 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InventorySearchQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InventorySearchQO.java @@ -21,7 +21,7 @@ public class InventorySearchQO extends PageQO { private String factoryNo; /** - * 仓库编号 + * 库存地点编号 */ private String warehouseNo; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/MaterialStorageItemQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/MaterialStorageItemQO.java index 581ce95b..05d915ff 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/MaterialStorageItemQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/MaterialStorageItemQO.java @@ -29,7 +29,7 @@ public class MaterialStorageItemQO { private String factory = "1010"; /** - * 上架仓库 + * 上架库存地点 */ @NotBlank private String receivedWarehouse; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/OutProduceSubmitQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/OutProduceSubmitQO.java index ee67bec5..786f314d 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/OutProduceSubmitQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/OutProduceSubmitQO.java @@ -22,7 +22,7 @@ public class OutProduceSubmitQO { private Boolean needAudit; /** - * 仓库编号 + * 库存地点编号 */ // @NotBlank private String lgort; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PendingScanningQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PendingScanningQO.java index d522f540..d70e9000 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PendingScanningQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PendingScanningQO.java @@ -29,7 +29,7 @@ public class PendingScanningQO { private BigDecimal pendingScanQuantity; /** - * 仓库编号 + * 库存地点编号 */ private String warehouseCode; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PoReceiveTaskItemConfirmQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PoReceiveTaskItemConfirmQO.java index 0c8a571b..cf6f122d 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PoReceiveTaskItemConfirmQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PoReceiveTaskItemConfirmQO.java @@ -20,7 +20,7 @@ public class PoReceiveTaskItemConfirmQO { // private String storageLocation; /** - * 收货仓库 + * 收货库存地点 */ private String receivedWarehouse; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QCReceiveTaskConfirmQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QCReceiveTaskConfirmQO.java index 16cc7317..96784daf 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QCReceiveTaskConfirmQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QCReceiveTaskConfirmQO.java @@ -31,7 +31,7 @@ public class QCReceiveTaskConfirmQO { // private String storageLocation; /** - * 收货仓库 + * 收货库存地点 */ private String receivedWarehouse; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QrCodeItemSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QrCodeItemSearchQO.java index e7aa0a32..c7bb15e8 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QrCodeItemSearchQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QrCodeItemSearchQO.java @@ -18,7 +18,7 @@ public class QrCodeItemSearchQO extends SearchBaseQO { private String materialCode; /** - * 仓库 + * 库存地点 */ private String storageLocation; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ShipmentSiteStockSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ShipmentSiteStockSearchQO.java index 15d1f0e3..c79e5028 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ShipmentSiteStockSearchQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ShipmentSiteStockSearchQO.java @@ -6,7 +6,7 @@ import lombok.Data; public class ShipmentSiteStockSearchQO extends PageQO{ /** - * 仓库编号 + * 库存地点编号 */ private String deliveryNo; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SrmMaterialReceiptQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SrmMaterialReceiptQO.java index 55863e11..f284b99b 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SrmMaterialReceiptQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/SrmMaterialReceiptQO.java @@ -53,7 +53,7 @@ public class SrmMaterialReceiptQO { private BigDecimal receiptNum; /** - * 收货仓库 + * 收货库存地点 */ private String receivedWarehouse; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StorageAddQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StorageAddQO.java index c5c637d8..3bb7525d 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StorageAddQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StorageAddQO.java @@ -30,7 +30,7 @@ public class StorageAddQO { private String materialDesc; /** - * 仓库ID + * 库存地点ID */ @NotNull private Long warehouseId; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StorageSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StorageSearchQO.java index eb335dc0..239c1c6c 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StorageSearchQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StorageSearchQO.java @@ -6,7 +6,7 @@ import lombok.Data; public class StorageSearchQO extends PageQO{ /** - * 仓库编码 + * 库存地点编码 */ private String warehouseNo; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StrappingAddQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StrappingAddQO.java index 008bda08..bfab1878 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StrappingAddQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StrappingAddQO.java @@ -24,7 +24,7 @@ public class StrappingAddQO { private String factoryCode; /** - * 仓库 + * 库存地点 */ private String storageLocation; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageOrderReceiveQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageOrderReceiveQO.java index 9d0b1840..c7b3de44 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageOrderReceiveQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/StructuralPackageOrderReceiveQO.java @@ -17,7 +17,7 @@ public class StructuralPackageOrderReceiveQO { private Long id; /** - * 上架仓库 + * 上架库存地点 */ @NotBlank private String warehouse; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/TransferOrderSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/TransferOrderSearchQO.java index 052b7298..b4880c1f 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/TransferOrderSearchQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/TransferOrderSearchQO.java @@ -33,7 +33,7 @@ public class TransferOrderSearchQO extends SearchBaseQO { private String materialDescription; /** - * 仓库 + * 库存地点 */ private String storageLocation; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/WarehouseAddQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/WarehouseAddQO.java index 467d7e61..2c3acd72 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/WarehouseAddQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/WarehouseAddQO.java @@ -8,13 +8,13 @@ import lombok.Data; public class WarehouseAddQO { /** - * 仓库编码 + * 库存地点编码 */ @NotBlank private String no; /** - * 仓库名称 + * 库存地点名称 */ @NotBlank private String name; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/WarehouseSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/WarehouseSearchQO.java index 86fc91a8..3b65fa0c 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/WarehouseSearchQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/WarehouseSearchQO.java @@ -6,12 +6,12 @@ import lombok.Data; public class WarehouseSearchQO extends PageQO{ /** - * 仓库编号 + * 库存地点编号 */ private String no; /** - * 仓库名称 + * 库存地点名称 */ private String name; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ZWM3A23QO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ZWM3A23QO.java index 74f13734..eaf14512 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ZWM3A23QO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ZWM3A23QO.java @@ -15,7 +15,7 @@ public class ZWM3A23QO { private String werks; /** - * 仓库列表 + * 库存地点列表 */ private List warehouseNos; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/Zwm00Mb107QO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/Zwm00Mb107QO.java index b54245b9..cbf082b4 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/Zwm00Mb107QO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/Zwm00Mb107QO.java @@ -15,7 +15,7 @@ public class Zwm00Mb107QO { private String PWERK; /** - * 仓库 + * 库存地点 */ private String LGORT; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ApplyReturnRequestItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ApplyReturnRequestItemVO.java index 03d93443..cf12f0ef 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ApplyReturnRequestItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ApplyReturnRequestItemVO.java @@ -37,7 +37,7 @@ public class ApplyReturnRequestItemVO { private String factoryCode; /** - * 库位 + * 库存地点 */ private String storageLocation; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/BarcodePrintingVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/BarcodePrintingVO.java index 1b7040b9..cc9535eb 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/BarcodePrintingVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/BarcodePrintingVO.java @@ -28,7 +28,7 @@ public class BarcodePrintingVO { private String factoryCode; /** - * 仓库编号 + * 库存地点编号 */ private String warehouseNo; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/BinVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/BinVO.java index 6a67e0cf..4191a08b 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/BinVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/BinVO.java @@ -10,17 +10,17 @@ public class BinVO { private Long id; /** - * 仓库ID + * 库存地点ID */ private Long warehouseId; /** - * 仓库名称 + * 库存地点名称 */ private String warehouseName; /** - * 仓库编码 + * 库存地点编码 */ private String warehouseNo; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/C_MaterialOutboundItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/C_MaterialOutboundItemVO.java index 4072b723..3e084355 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/C_MaterialOutboundItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/C_MaterialOutboundItemVO.java @@ -46,7 +46,7 @@ public class C_MaterialOutboundItemVO { private BigDecimal qty; /** - * 默认仓库 + * 默认库存地点 */ private String warehouseNumber; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/C_MaterialOutboundSAPItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/C_MaterialOutboundSAPItemVO.java index e1ae8874..33e4c00d 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/C_MaterialOutboundSAPItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/C_MaterialOutboundSAPItemVO.java @@ -41,7 +41,7 @@ public class C_MaterialOutboundSAPItemVO { private BigDecimal qty; /** - * 默认仓库 + * 默认库存地点 */ private String warehouseNumber; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/C_MaterialReturnItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/C_MaterialReturnItemVO.java index cf244549..be90237c 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/C_MaterialReturnItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/C_MaterialReturnItemVO.java @@ -48,7 +48,7 @@ public class C_MaterialReturnItemVO { private BigDecimal returnQty; /** - * 默认仓库 + * 默认库存地点 */ private String warehouseNumber; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/C_SAPMaterialReturnItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/C_SAPMaterialReturnItemVO.java index cc5e4cf4..5dd2cc48 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/C_SAPMaterialReturnItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/C_SAPMaterialReturnItemVO.java @@ -40,7 +40,7 @@ public class C_SAPMaterialReturnItemVO { private BigDecimal returnQty; /** - * 默认仓库 + * 默认库存地点 */ private String warehouseNumber; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderForPackageItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderForPackageItemVO.java index 13eac953..8b7cbe11 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderForPackageItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/DeliverStructuralPackageOrderForPackageItemVO.java @@ -59,7 +59,7 @@ public class DeliverStructuralPackageOrderForPackageItemVO { private String factoryNo; /** - * 仓库编号 + * 库存地点编号 */ private String warehouseNo; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/GoodsReceiptVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/GoodsReceiptVO.java index c6660b68..05ad6cb6 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/GoodsReceiptVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/GoodsReceiptVO.java @@ -77,7 +77,7 @@ public class GoodsReceiptVO { private String groupCode; /** - * 库位 + * 库存地点 */ private String storageLocation; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InCostcenterBackInfoItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InCostcenterBackInfoItemVO.java index a0b251c3..da26aaa2 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InCostcenterBackInfoItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InCostcenterBackInfoItemVO.java @@ -50,7 +50,7 @@ public class InCostcenterBackInfoItemVO { private String lgort; /** - * 库存仓位 + * 库存储位 */ private String lgpbe; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InCostcenterBackItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InCostcenterBackItemVO.java index 0864e171..2c675aff 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InCostcenterBackItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InCostcenterBackItemVO.java @@ -45,7 +45,7 @@ public class InCostcenterBackItemVO { private String lgort; /** - * 库存仓位 + * 库存储位 */ private String lgpbe; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InProduceBackItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InProduceBackItemVO.java index 96ba4a13..534f8f0b 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InProduceBackItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InProduceBackItemVO.java @@ -91,7 +91,7 @@ public class InProduceBackItemVO { } /** - * 库存仓位 + * 库存储位 */ private String lgpbe; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InProduceBackTicketItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InProduceBackTicketItemVO.java index dce2edde..cba38967 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InProduceBackTicketItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InProduceBackTicketItemVO.java @@ -93,7 +93,7 @@ public class InProduceBackTicketItemVO { private String lgort2; /** - * 库存仓位 + * 库存储位 */ private String lgpbe; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InProduceOrderItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InProduceOrderItemVO.java index f26948e3..7d3510ab 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InProduceOrderItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InProduceOrderItemVO.java @@ -49,7 +49,7 @@ public class InProduceOrderItemVO { private String factoryNo; /** - * 仓库 + * 库存地点 */ private String warehouseNo; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InProduceOrderMaterialVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InProduceOrderMaterialVO.java index 8d381a33..96915239 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InProduceOrderMaterialVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InProduceOrderMaterialVO.java @@ -53,7 +53,7 @@ public class InProduceOrderMaterialVO { private String factoryNo; /** - * 仓库 + * 库存地点 */ private String warehouseNo; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InPurchaseItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InPurchaseItemVO.java index 5e6555ad..2a6f2c72 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InPurchaseItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InPurchaseItemVO.java @@ -49,7 +49,7 @@ public class InPurchaseItemVO { private String factoryNo; /** - * 库位 + * 库存地点 */ private String warehouseNo; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InTaskInfoVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InTaskInfoVO.java index 825feb81..ee3b707f 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InTaskInfoVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InTaskInfoVO.java @@ -50,7 +50,7 @@ public class InTaskInfoVO { private String unit; /** - * 仓库编号 + * 库存地点编号 */ private String receivedWarehouse; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryCheckTaskItemMaterialVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryCheckTaskItemMaterialVO.java index 3caa9e95..5f0ba63b 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryCheckTaskItemMaterialVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryCheckTaskItemMaterialVO.java @@ -47,7 +47,7 @@ public class InventoryCheckTaskItemMaterialVO { private String factoryNo; /** - * 仓库编号 + * 库存地点编号 */ private String warehouseNo; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryCheckTaskItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryCheckTaskItemVO.java index a9542ef4..625c895a 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryCheckTaskItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryCheckTaskItemVO.java @@ -45,17 +45,17 @@ public class InventoryCheckTaskItemVO { private String factoryNo; /** - * 仓库id + * 库存地点id */ private Long warehouseId; /** - * 仓库编号 + * 库存地点编号 */ private String warehouseNo; /** - * 仓库名称 + * 库存地点名称 */ private String warehouseName; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryCheckTaskVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryCheckTaskVO.java index f28e6db6..e0d5da9c 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryCheckTaskVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryCheckTaskVO.java @@ -16,7 +16,7 @@ public class InventoryCheckTaskVO { private String taskNo; /** - * 仓库编号 + * 库存地点编号 */ private String warehouseNos; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryLockVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryLockVO.java index c022d59e..ad75507d 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryLockVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryLockVO.java @@ -24,7 +24,7 @@ public class InventoryLockVO { private String factoryNo; /** - * 仓库编号 + * 库存地点编号 */ private String warehouseNo; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryVO.java index 6abc3b96..af6e7f11 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryVO.java @@ -20,7 +20,7 @@ public class InventoryVO { private String factoryNo; /** - * 仓库编号 + * 库存地点编号 */ private String warehouseNo; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/OutAssistanceInfoVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/OutAssistanceInfoVO.java index b9d1da22..2ac0959e 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/OutAssistanceInfoVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/OutAssistanceInfoVO.java @@ -53,12 +53,12 @@ public class OutAssistanceInfoVO { private String ekgrp; /** - * 收货仓库 + * 收货库存地点 */ private String lgort; /** - * 发货仓库 + * 发货库存地点 */ private String lgort1; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/OutAssistanceItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/OutAssistanceItemVO.java index 8da3c672..e99aa214 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/OutAssistanceItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/OutAssistanceItemVO.java @@ -97,7 +97,7 @@ public class OutAssistanceItemVO { private String atwrt2; /** - * 库存仓位 + * 库存储位 */ private String lgpbe; @@ -121,7 +121,7 @@ public class OutAssistanceItemVO { } /** - * 发货仓库 + * 发货库存地点 */ private String lgort1; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/OutCostcenterInfoItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/OutCostcenterInfoItemVO.java index a31122cd..4c08d994 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/OutCostcenterInfoItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/OutCostcenterInfoItemVO.java @@ -87,7 +87,7 @@ public class OutCostcenterInfoItemVO { private String lgort; /** - * 库存仓位 + * 库存储位 */ private String lgpbe; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/OutCostcenterInfoVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/OutCostcenterInfoVO.java index 4a9a26c0..33bfd6d2 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/OutCostcenterInfoVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/OutCostcenterInfoVO.java @@ -108,7 +108,7 @@ public class OutCostcenterInfoVO { private String docYear; /** - * 实际入库仓库编号 + * 实际入库库存地点编号 */ private String lgort; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/OutProduceInfoItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/OutProduceInfoItemVO.java index a9041eb1..65058ac0 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/OutProduceInfoItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/OutProduceInfoItemVO.java @@ -97,7 +97,7 @@ public class OutProduceInfoItemVO { } /** - * 库存仓位 + * 库存储位 */ private String lgpbe; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/OutProduceItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/OutProduceItemVO.java index 1a0a8f68..887ed96d 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/OutProduceItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/OutProduceItemVO.java @@ -33,7 +33,7 @@ public class OutProduceItemVO { private String lgort2; /** - * 库存仓位 + * 库存储位 */ private String lgpbe; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PDAOrderItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PDAOrderItemVO.java index de22b70e..47116609 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PDAOrderItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PDAOrderItemVO.java @@ -53,7 +53,7 @@ public class PDAOrderItemVO { /** - * 收货仓库 + * 收货库存地点 */ private String receivedWarehouse; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PackingContentVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PackingContentVO.java index 0f575e84..ee6b1363 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PackingContentVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PackingContentVO.java @@ -107,7 +107,7 @@ public class PackingContentVO { private String factoryCode; /** - * 仓库 + * 库存地点 */ private String storageLocation; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PoReceiveTaskItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PoReceiveTaskItemVO.java index 59295b3d..3fa05a1d 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PoReceiveTaskItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/PoReceiveTaskItemVO.java @@ -44,7 +44,7 @@ public class PoReceiveTaskItemVO { private LocalDateTime createTime; /** - * 仓库编号 + * 库存地点编号 */ private String receivedWarehouse; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QCReceiveTaskItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QCReceiveTaskItemVO.java index 5f6f75ca..b2a3916d 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QCReceiveTaskItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QCReceiveTaskItemVO.java @@ -42,7 +42,7 @@ public class QCReceiveTaskItemVO { private LocalDateTime createTime; /** - * 仓库编号 + * 库存地点编号 */ private String receivedWarehouse; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QCTaskItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QCTaskItemVO.java index 002838f4..813da1d3 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QCTaskItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QCTaskItemVO.java @@ -34,7 +34,7 @@ public class QCTaskItemVO { /** - * 仓库编号 + * 库存地点编号 */ private String receivedWarehouse; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QrCodeItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QrCodeItemVO.java index 62c61ae4..fe4410fb 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QrCodeItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QrCodeItemVO.java @@ -89,7 +89,7 @@ public class QrCodeItemVO { private String factoryCode; /** - * 仓库 + * 库存地点 */ private String storageLocation; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QrCodeVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QrCodeVO.java index d7593b04..9620e7b5 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QrCodeVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QrCodeVO.java @@ -85,7 +85,7 @@ public class QrCodeVO { private String factoryCode; /** - * 仓库 + * 库存地点 */ private String storageLocation; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QualityInspectionVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QualityInspectionVO.java index 5dc237b1..28e94f50 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QualityInspectionVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QualityInspectionVO.java @@ -66,9 +66,9 @@ public class QualityInspectionVO { private String factory; /** - * 仓库编号 + * 库存地点编号 */ - @ExcelColumn("仓库编号") + @ExcelColumn("库存地点编号") private String receivedWarehouse; /** diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/StorageVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/StorageVO.java index f1fb55ab..086dbdd2 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/StorageVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/StorageVO.java @@ -26,12 +26,12 @@ public class StorageVO { private String factoryNo; /** - * 仓库id + * 库存地点id */ private String warehouseId; /** - * 仓库编码 + * 库存地点编码 */ private String warehouseNo; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferCompanyItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferCompanyItemVO.java index b665271a..f96d7977 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferCompanyItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferCompanyItemVO.java @@ -107,12 +107,12 @@ public class TransferCompanyItemVO { // private BigDecimal wamng; /** - * 转出库位 + * 转出库存地点 */ private String lgpbe; /** - * 转入库位 + * 转入库存地点 */ private String lgpbe1; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferCompanyPdaVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferCompanyPdaVO.java index 3a79f2c8..b92414d9 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferCompanyPdaVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferCompanyPdaVO.java @@ -22,7 +22,7 @@ public class TransferCompanyPdaVO { private String reswk; /** - * 转出仓库 + * 转出库存地点 */ private String lgort; @@ -38,7 +38,7 @@ public class TransferCompanyPdaVO { private String werks; /** - * 转入仓库 + * 转入库存地点 */ private String lgort1; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferFactoryItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferFactoryItemVO.java index b2321bb1..60aa7053 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferFactoryItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferFactoryItemVO.java @@ -82,7 +82,7 @@ public class TransferFactoryItemVO { private String sgtxt; /** - * 库存仓位 + * 库存储位 */ private String lgpbe; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferFactoryPdaItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferFactoryPdaItemVO.java index c9545c62..5281f738 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferFactoryPdaItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferFactoryPdaItemVO.java @@ -25,12 +25,12 @@ public class TransferFactoryPdaItemVO { private String maktx; /** - * 调出库位 + * 调出库存地点 */ private String lgort; /** - * 调入库位 + * 调入库存地点 */ private String lgort1; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferFactoryPdaVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferFactoryPdaVO.java index 40b5836a..1eefa86c 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferFactoryPdaVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferFactoryPdaVO.java @@ -27,12 +27,12 @@ public class TransferFactoryPdaVO { private String bwart; /** - * 调出库位 + * 调出库存地点 */ private String lgort; /** - * 调入库位 + * 调入库存地点 */ private String lgort1; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferOrderVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferOrderVO.java index 9f6a96f1..158091a5 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferOrderVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferOrderVO.java @@ -72,7 +72,7 @@ public class TransferOrderVO { private String factoryCode; /** - * 仓库 + * 库存地点 */ private String storageLocation; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/WarehouseSimpleVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/WarehouseSimpleVO.java index a14b02c7..9c0f595b 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/WarehouseSimpleVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/WarehouseSimpleVO.java @@ -8,12 +8,12 @@ public class WarehouseSimpleVO { private Long id; /** - * 仓库编码 + * 库存地点编码 */ private String no; /** - * 仓库名称 + * 库存地点名称 */ private String name; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ZWM3A23VO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ZWM3A23VO.java index ffff2885..ec3b37a0 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ZWM3A23VO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ZWM3A23VO.java @@ -137,7 +137,7 @@ public class ZWM3A23VO { private String lgort2; /** - * 库存仓位 + * 库存储位 */ private String lgpbe; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/Zwm3a07VO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/Zwm3a07VO.java index cc4160eb..2828f37e 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/Zwm3a07VO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/Zwm3a07VO.java @@ -17,7 +17,7 @@ public class Zwm3a07VO { private Long id; - //仓库名 + //库存地点名 private String wname; //订单号 @@ -106,7 +106,7 @@ public class Zwm3a07VO { return BomUtil.changeMeins(meins); } - //库存仓位 + //库存储位 private String lgpbe; //质量检验中的库存 @@ -129,7 +129,7 @@ public class Zwm3a07VO { private String dispo; /** - * 仓库可领用数量 + * 库存地点可领用数量 */ private BigDecimal leftNum; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/Zwm3a08ItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/Zwm3a08ItemVO.java index a012a610..6ca31efa 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/Zwm3a08ItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/Zwm3a08ItemVO.java @@ -41,7 +41,7 @@ public class Zwm3a08ItemVO { public String getMeins() { return BomUtil.changeMeins(meins); } - //库存仓位 + //库存储位 private String lgpbe; //质量检验中的库存 private String insme; @@ -55,7 +55,7 @@ public class Zwm3a08ItemVO { private String dispo; /** - * 仓库可领用数量 + * 库存地点可领用数量 */ private BigDecimal leftNum; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/Zwm3a08VO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/Zwm3a08VO.java index e7e044e9..247ae865 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/Zwm3a08VO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/Zwm3a08VO.java @@ -89,7 +89,7 @@ public class Zwm3a08VO { return BomUtil.changeMeins(meins); } - //库存仓位 + //库存储位 private String lgpbe; //质量检验中的库存 @@ -108,7 +108,7 @@ public class Zwm3a08VO { private String dispo; /** - * 仓库可领用数量 + * 库存地点可领用数量 */ private BigDecimal leftNum; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/Zwm3a09ItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/Zwm3a09ItemVO.java index 51bd3125..029b2558 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/Zwm3a09ItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/Zwm3a09ItemVO.java @@ -37,7 +37,7 @@ public class Zwm3a09ItemVO { public String getMeins() { return BomUtil.changeMeins(meins); } - //库存仓位 + //库存储位 private String lgpbe; //质量检验中的库存 private String insme; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/Zwm3a09VO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/Zwm3a09VO.java index 72be1cba..31377acd 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/Zwm3a09VO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/Zwm3a09VO.java @@ -103,7 +103,7 @@ public class Zwm3a09VO { return BomUtil.changeMeins(meins); } - //库存仓位 + //库存储位 private String lgpbe; //质量检验中的库存 diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsBin.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsBin.java index 75b5fdc9..15f81dc0 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsBin.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsBin.java @@ -32,7 +32,7 @@ public class WmsBin implements Serializable { private Long id; /** - * 仓库ID + * 库存地点ID */ private Long warehouseId; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInCostcenterBackItem.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInCostcenterBackItem.java index 9fdfbfd5..b2813853 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInCostcenterBackItem.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInCostcenterBackItem.java @@ -66,7 +66,7 @@ public class WmsInCostcenterBackItem implements Serializable { // private String lgort; /** - * 库存仓位 + * 库存储位 */ private String lgpbe; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInCostcenterBackTicket.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInCostcenterBackTicket.java index 1cfa5d44..ed4df5c0 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInCostcenterBackTicket.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInCostcenterBackTicket.java @@ -61,7 +61,7 @@ public class WmsInCostcenterBackTicket implements Serializable { private String docYear; /** - * 实际入库仓库编号 + * 实际入库库存地点编号 */ private String lgort; } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInProduceBackItem.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInProduceBackItem.java index a39aedcc..0efbfa28 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInProduceBackItem.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInProduceBackItem.java @@ -101,7 +101,7 @@ public class WmsInProduceBackItem implements Serializable { private String meins; /** - * 库存仓位 + * 库存储位 */ private String lgpbe; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInProduceOrderItem.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInProduceOrderItem.java index 8c646ae6..df791088 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInProduceOrderItem.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInProduceOrderItem.java @@ -72,7 +72,7 @@ public class WmsInProduceOrderItem implements Serializable { private String factoryNo; /** - * 仓库 + * 库存地点 */ private String warehouseNo; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInProduceOrderSurplusItem.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInProduceOrderSurplusItem.java index c3011535..31a9196b 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInProduceOrderSurplusItem.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInProduceOrderSurplusItem.java @@ -77,7 +77,7 @@ public class WmsInProduceOrderSurplusItem implements Serializable { private String rspos; /** - * 库存仓位 + * 库存储位 */ private String lgpbe; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInProduceOrderSurplusTicket.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInProduceOrderSurplusTicket.java index 6867d902..b8872bcd 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInProduceOrderSurplusTicket.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInProduceOrderSurplusTicket.java @@ -41,7 +41,7 @@ public class WmsInProduceOrderSurplusTicket implements Serializable { private String no; /** - * 实际入库仓库编号 + * 实际入库库存地点编号 */ private String lgort; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInTaskItem.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInTaskItem.java index af210e87..bc5eabd6 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInTaskItem.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInTaskItem.java @@ -71,7 +71,7 @@ public class WmsInTaskItem implements Serializable { private String unit; /** - * 仓库编号 + * 库存地点编号 */ private String receivedWarehouse; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInventory.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInventory.java index 578e1e65..0e086c68 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInventory.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInventory.java @@ -43,7 +43,7 @@ public class WmsInventory implements Serializable { private String factoryNo; /** - * 仓库编号 + * 库存地点编号 */ private String warehouseNo; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInventoryBarcodePrinting.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInventoryBarcodePrinting.java index d2c861fe..d16f2504 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInventoryBarcodePrinting.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInventoryBarcodePrinting.java @@ -88,12 +88,12 @@ public class WmsInventoryBarcodePrinting implements Serializable { private String factoryCode; // /** -// * 仓库id +// * 库存地点id // */ // private Long warehouseId; /** - * 仓库编号 + * 库存地点编号 */ private String warehouseNo; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInventoryCheckTaskItem.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInventoryCheckTaskItem.java index 44923a97..6281d5c5 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInventoryCheckTaskItem.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInventoryCheckTaskItem.java @@ -35,7 +35,7 @@ public class WmsInventoryCheckTaskItem implements Serializable { private Long taskId; /** - * 仓库id + * 库存地点id */ private Long warehouseId; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsNormalPrintOrder.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsNormalPrintOrder.java index 5dd33558..d5a95ff8 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsNormalPrintOrder.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsNormalPrintOrder.java @@ -148,7 +148,7 @@ public class WmsNormalPrintOrder implements Serializable { private String supplierCode; /** - * 仓库 + * 库存地点 */ private String storageLocation; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutAssistance.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutAssistance.java index 0a9a2210..89c7c5d2 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutAssistance.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutAssistance.java @@ -66,12 +66,12 @@ public class WmsOutAssistance implements Serializable { private String ekgrp; /** - * 收货仓库 + * 收货库存地点 */ private String lgort; /** - * 发货仓库 + * 发货库存地点 */ private String lgort1; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutAssistanceItem.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutAssistanceItem.java index 015f8bf9..1d997b4a 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutAssistanceItem.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutAssistanceItem.java @@ -99,7 +99,7 @@ public class WmsOutAssistanceItem implements Serializable { private String atwrt2; /** - * 库存仓位 + * 库存储位 */ private String lgpbe; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutAssistanceTicket.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutAssistanceTicket.java index dd64cb70..b5b7ac3c 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutAssistanceTicket.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutAssistanceTicket.java @@ -62,7 +62,7 @@ public class WmsOutAssistanceTicket implements Serializable { private String docYear; /** - * 实际出库仓库编号 + * 实际出库库存地点编号 */ private String lgort; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutCostcenterItem.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutCostcenterItem.java index 144088da..7a732877 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutCostcenterItem.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutCostcenterItem.java @@ -94,7 +94,7 @@ public class WmsOutCostcenterItem implements Serializable { private String lgort; /** - * 库存仓位 + * 库存储位 */ private String lgpbe; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutCostcenterTicket.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutCostcenterTicket.java index 6e74329c..a701f08f 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutCostcenterTicket.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutCostcenterTicket.java @@ -42,7 +42,7 @@ public class WmsOutCostcenterTicket implements Serializable { private String no; /** - * 实际出库仓库编号 + * 实际出库库存地点编号 */ private String lgort; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutProduceItem.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutProduceItem.java index 2d5b29a0..96dc1776 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutProduceItem.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutProduceItem.java @@ -102,7 +102,7 @@ public class WmsOutProduceItem implements Serializable { private String meins; /** - * 库存仓位 + * 库存储位 */ private String lgpbe; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutProduceTicket.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutProduceTicket.java index 125d3006..ffe02a4d 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutProduceTicket.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsOutProduceTicket.java @@ -42,7 +42,7 @@ public class WmsOutProduceTicket implements Serializable { private String no; /** - * 实际出库仓库编号 + * 实际出库库存地点编号 */ private String lgort; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsPoReceiptItem.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsPoReceiptItem.java index 9184865d..6d780dc3 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsPoReceiptItem.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsPoReceiptItem.java @@ -63,7 +63,7 @@ public class WmsPoReceiptItem implements Serializable { private LocalDateTime createTime; /** - * 仓库编号 + * 库存地点编号 */ private String receivedWarehouse; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsQcReceiveItem.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsQcReceiveItem.java index 004ae4fe..ae5615be 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsQcReceiveItem.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsQcReceiveItem.java @@ -63,7 +63,7 @@ public class WmsQcReceiveItem implements Serializable { private LocalDateTime createTime; /** - * 仓库编号 + * 库存地点编号 */ private String receivedWarehouse; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsQrCodeMaster.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsQrCodeMaster.java index e594bd28..5ef03e2d 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsQrCodeMaster.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsQrCodeMaster.java @@ -110,7 +110,7 @@ public class WmsQrCodeMaster implements Serializable { private String factoryCode; /** - * 仓库 + * 库存地点 */ private String storageLocation; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsReturnRequestItem.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsReturnRequestItem.java index 4d6b75c5..200603a0 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsReturnRequestItem.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsReturnRequestItem.java @@ -59,7 +59,7 @@ public class WmsReturnRequestItem implements Serializable { private String factoryCode; /** - * 库位 + * 库存地点 */ private String storageLocation; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsSrmMaterialQmsReceiptItem.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsSrmMaterialQmsReceiptItem.java index 610919d1..09861001 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsSrmMaterialQmsReceiptItem.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsSrmMaterialQmsReceiptItem.java @@ -68,7 +68,7 @@ public class WmsSrmMaterialQmsReceiptItem implements Serializable { private BigDecimal receiptNum; /** - * 仓库编号 + * 库存地点编号 */ private String receivedWarehouse; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsSrmMaterialReceiptItem.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsSrmMaterialReceiptItem.java index 0fae6c6d..0acc328a 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsSrmMaterialReceiptItem.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsSrmMaterialReceiptItem.java @@ -68,7 +68,7 @@ public class WmsSrmMaterialReceiptItem implements Serializable { private BigDecimal receiptNum; /** - * 仓库编号 + * 库存地点编号 */ private String receivedWarehouse; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsSrmQualityInspection.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsSrmQualityInspection.java index 6ffb3ba8..1ac071d2 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsSrmQualityInspection.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsSrmQualityInspection.java @@ -89,7 +89,7 @@ public class WmsSrmQualityInspection implements Serializable { private String unit; /** - * 仓库编号 + * 库存地点编号 */ private String receivedWarehouse; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStorage.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStorage.java index b00111a7..b125bf48 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStorage.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsStorage.java @@ -82,7 +82,7 @@ public class WmsStorage implements Serializable { private String sapError; /** - * 仓库ID + * 库存地点ID */ private Long warehouseId; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferCompanyItem.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferCompanyItem.java index d035035a..1ab1ef08 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferCompanyItem.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferCompanyItem.java @@ -109,12 +109,12 @@ public class WmsTransferCompanyItem implements Serializable { private BigDecimal wamng; /** - * 转出库位 + * 转出库存地点 */ private String lgpbe; /** - * 转入库位 + * 转入库存地点 */ private String lgpbe1; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferCompanyTicket.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferCompanyTicket.java index fd11b68e..36f8a872 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferCompanyTicket.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferCompanyTicket.java @@ -77,12 +77,12 @@ public class WmsTransferCompanyTicket implements Serializable { private LocalDateTime updateTime; /** - * 实际出库仓库编号 + * 实际出库库存地点编号 */ private String lgort; /** - * 实际入库仓库编号 + * 实际入库库存地点编号 */ private String lgort1; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferFactoryItem.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferFactoryItem.java index b2485c83..5a603b90 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferFactoryItem.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferFactoryItem.java @@ -89,7 +89,7 @@ public class WmsTransferFactoryItem implements Serializable { private String sgtxt; /** - * 库存仓位 + * 库存储位 */ private String lgpbe; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferFactoryTicket.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferFactoryTicket.java index a3b9f4dd..c931722e 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferFactoryTicket.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferFactoryTicket.java @@ -77,12 +77,12 @@ public class WmsTransferFactoryTicket implements Serializable { private LocalDateTime updateTime; /** - * 实际出库仓库编号 + * 实际出库库存地点编号 */ private String lgort; /** - * 实际入库仓库编号 + * 实际入库库存地点编号 */ private String lgort1; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferOrders.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferOrders.java index 303aa6e4..545d8f1b 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferOrders.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferOrders.java @@ -98,7 +98,7 @@ public class WmsTransferOrders implements Serializable { private String factoryCode; /** - * 仓库 + * 库存地点 */ private String storageLocation; } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsWarehouse.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsWarehouse.java index c75e61f8..d39aec90 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsWarehouse.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsWarehouse.java @@ -13,7 +13,7 @@ import java.time.LocalDateTime; /** *

- * 仓库 + * 库存地点 *

* * @author 代码生成器生成 @@ -32,12 +32,12 @@ public class WmsWarehouse implements Serializable { private Long id; /** - * 仓库编码 + * 库存地点编码 */ private String no; /** - * 仓库名称 + * 库存地点名称 */ private String name; diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsWarehouseMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsWarehouseMapper.java index c6a6886f..5471609b 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsWarehouseMapper.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsWarehouseMapper.java @@ -13,7 +13,7 @@ import java.util.List; /** *

- * 仓库 Mapper 接口 + * 库存地点 Mapper 接口 *

* * @author 代码生成器生成 diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsInventoryService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsInventoryService.java index f32eacdb..76950b61 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsInventoryService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsInventoryService.java @@ -33,7 +33,7 @@ public interface IWmsInventoryService extends IService { /** * 获取可用的库存数量，实际库存减去锁定库存 * @param factoryNo 工厂编号 - * @param warehouseNo 仓库编号 + * @param warehouseNo 库存地点编号 * @param materialNos 物料编号列表 * @return 物料和可用数量 */ @@ -42,7 +42,7 @@ public interface IWmsInventoryService extends IService { /** * 获取可用的库存数量，实际库存减去锁定库存 * @param factoryNo 工厂编号 - * @param warehouseNo 仓库编号 + * @param warehouseNo 库存地点编号 * @param materialNo 物料编号 * @return 物料和可用数量 */ diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsWarehouseService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsWarehouseService.java index e466eae8..5b801b12 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsWarehouseService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsWarehouseService.java @@ -14,7 +14,7 @@ import java.util.List; /** *

- * 仓库 服务类 + * 库存地点 服务类 *

* * @author 代码生成器生成 @@ -49,7 +49,7 @@ public interface IWmsWarehouseService extends IService { /** * 获取工厂名 * @param factoryNo 工厂编号 - * @param warehouseNo 仓库编号 + * @param warehouseNo 库存地点编号 * @return 工厂名 */ String getName(String factoryNo, String warehouseNo); diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInventoryCheckTaskServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInventoryCheckTaskServiceImpl.java index fef7ed6b..b929616a 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInventoryCheckTaskServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsInventoryCheckTaskServiceImpl.java @@ -82,7 +82,7 @@ public class WmsInventoryCheckTaskServiceImpl extends ServiceImpl ids = request.getItems().stream().map(InventoryCheckTaskSaveItemQO::getId).filter(Objects::nonNull).toList(); - VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(ids)).throwMessage("至少需要盘点一个仓库"); + VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(ids)).throwMessage("至少需要盘点一个库存地点"); inventoryCheckTaskItemService.remove(new LambdaQueryWrapper() .eq(WmsInventoryCheckTaskItem::getTaskId, request.getId()) .notIn(WmsInventoryCheckTaskItem::getId, ids) diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsWarehouseServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsWarehouseServiceImpl.java index 6304f65b..a92df5c7 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsWarehouseServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsWarehouseServiceImpl.java @@ -25,7 +25,7 @@ import java.util.Objects; /** *

- * 仓库 服务实现类 + * 库存地点 服务实现类 *

* * @author 代码生成器生成 @@ -46,7 +46,7 @@ public class WmsWarehouseServiceImpl extends ServiceImpl warehouseNos = StrUtil.isNotBlank(warehouseNo) ? StrUtil.split(warehouseNo, ",") : // warehouseService.getList().stream().map(WmsWarehouse::getNo).toList(); // if (CollectionUtil.isEmpty(warehouseNos)) { -// return new ProcessResult(false, "请先配置仓库"); +// return new ProcessResult(false, "请先配置库存地点"); // } -// log.info("仓库: {}", StrUtil.join(",", warehouseNos)); +// log.info("库存地点: {}", StrUtil.join(",", warehouseNos)); // boolean isInit = !storageService.lambdaQuery().exists(); // if (StrUtil.isBlank(beginDate)) { // if (!isInit) { @@ -115,7 +115,7 @@ public class SyncStorageFromSAPProcessor implements BasicProcessor { // log.info("没有获取到数据"); // } else { // log.info("获取到{}条数据", list.size()); -// //同步仓库信息 +// //同步库存地点信息 // warehouseNos = list.stream().map(SAPSyncFromDTO::getWarehouseNo).distinct().toList(); // List dbWarehouses = warehouseService.lambdaQuery().eq(WmsWarehouse::getFactoryId, fy.getId()).in(WmsWarehouse::getNo, warehouseNos).list(); // warehouseNos.forEach(wn -> { @@ -173,7 +173,7 @@ public class SyncStorageFromSAPProcessor implements BasicProcessor { // dbBins.add(dbBin); // } // if (Objects.isNull(dbStorage)) { -// log.info("添加，仓库:{},储位:{}", dto.getWarehouseNo(), sapBinNo); +// log.info("添加，库存地点:{},储位:{}", dto.getWarehouseNo(), sapBinNo); // WmsStorage storage = new WmsStorage() // .setId(IdUtil.getSnowflakeNextId()) // .setMaterialNo(dto.getMaterialNo()) @@ -190,7 +190,7 @@ public class SyncStorageFromSAPProcessor implements BasicProcessor { // .setBinId(dbBin.getId())); // } // } else { -// log.info("更新，仓库:{},储位:{}", dto.getWarehouseNo(), sapBinNo); +// log.info("更新，库存地点:{},储位:{}", dto.getWarehouseNo(), sapBinNo); // if (!StrUtil.equals(dbStorage.getWarehouseNo(), dto.getWarehouseNo())) { // storagesForUpdate.add(new WmsStorage() // .setId(dbStorage.getId()) diff --git a/nflg-wms-scheduled/src/main/java/com/nflg/wms/scheduled/service/SapService.java b/nflg-wms-scheduled/src/main/java/com/nflg/wms/scheduled/service/SapService.java index 266bc188..f08a8f14 100644 --- a/nflg-wms-scheduled/src/main/java/com/nflg/wms/scheduled/service/SapService.java +++ b/nflg-wms-scheduled/src/main/java/com/nflg/wms/scheduled/service/SapService.java @@ -28,7 +28,7 @@ public class SapService { * 保存库存 * @param factory 工厂编号 * @param materialNo 物料编号 - * @param warehouseNo 仓库编号 + * @param warehouseNo 库存地点编号 * @param binNos 储位编号列表 */ public void saveStorage(String factory,String materialNo,String warehouseNo,List binNos) throws JCoException { @@ -58,7 +58,7 @@ public class SapService { /** * 获取库存信息 * @param factory 工厂编号 - * @param warehouseNos 仓库编号列表 + * @param warehouseNos 库存地点编号列表 * @param beginTime 开始时间，格式yyyyMMdd * @param endTime 结束时间，格式yyyyMMdd */ diff --git a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/SiteStockController.java b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/SiteStockController.java index 520d6b86..da3cb080 100644 --- a/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/SiteStockController.java +++ b/nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/SiteStockController.java @@ -43,7 +43,7 @@ public class SiteStockController extends BaseController { private IWmsShipmentSiteStockMaterialItemRecordService siteStockMaterialItemRecordService; /** - * 查询仓库列表 + * 查询库存地点列表 */ @PostMapping("search") public ApiResult> search(@Valid @RequestBody ShipmentSiteStockSearchQO qo) { @@ -56,7 +56,7 @@ public class SiteStockController extends BaseController { } /** - * 获取仓库下的物料列表 + * 获取库存地点下的物料列表 */ @PostMapping("getMaterials") public ApiResult> getMaterials(@Valid @RequestBody ShipmentSiteStockItemQO qo) { diff --git a/nflg-wms-srm-receive/src/main/java/com/nflg/wms/srm/receive/pojo/dto/SAPMaterialInfoInOrderDTO.java b/nflg-wms-srm-receive/src/main/java/com/nflg/wms/srm/receive/pojo/dto/SAPMaterialInfoInOrderDTO.java index 4e518268..05fef5ba 100644 --- a/nflg-wms-srm-receive/src/main/java/com/nflg/wms/srm/receive/pojo/dto/SAPMaterialInfoInOrderDTO.java +++ b/nflg-wms-srm-receive/src/main/java/com/nflg/wms/srm/receive/pojo/dto/SAPMaterialInfoInOrderDTO.java @@ -19,7 +19,7 @@ public class SAPMaterialInfoInOrderDTO { private BigDecimal transportNum; /** - * 仓库编号 + * 库存地点编号 */ @JsonProperty("LGORT") private String warehouseNo; diff --git a/nflg-wms-srm-receive/src/main/java/com/nflg/wms/srm/receive/service/SapService.java b/nflg-wms-srm-receive/src/main/java/com/nflg/wms/srm/receive/service/SapService.java index 23051741..27ef79f5 100644 --- a/nflg-wms-srm-receive/src/main/java/com/nflg/wms/srm/receive/service/SapService.java +++ b/nflg-wms-srm-receive/src/main/java/com/nflg/wms/srm/receive/service/SapService.java @@ -312,10 +312,10 @@ public class SapService { } // /** -// * 保存库位 +// * 保存库存地点 // * @param factory 工厂编号 // * @param materialNo 物料编号 -// * @param warehouseNo 仓库编号 +// * @param warehouseNo 库存地点编号 // * @param binNos 储位编号列表 // */ // public void zwm3A02(String factory, String materialNo, String warehouseNo, Collection binNos) { @@ -339,7 +339,7 @@ public class SapService { // /** // * 获取库存信息 // * @param factory 工厂编号 -// * @param warehouseNo 仓库编号 +// * @param warehouseNo 库存地点编号 // * @param materialNo 物料编号 // */ // public SAPSyncFromDTO zwm3A01(String factory, String warehouseNo, String materialNo) { @@ -350,7 +350,7 @@ public class SapService { // /** // * 获取库存信息 // * @param factory 工厂编号 -// * @param warehouseNos 仓库编号列表 +// * @param warehouseNos 库存地点编号列表 // * @param beginTime 开始时间，格式yyyyMMdd // * @param endTime 结束时间，格式yyyyMMdd // */ @@ -1213,8 +1213,8 @@ public class SapService { } /** - * 获取物料的属性信息（仓库、库位、批次管理、序号管理，是否质检） - * @param query 查询条件封装对象，包含工厂、仓库、物料等信息 + * 获取物料的属性信息（库存地点、批次管理、序号管理，是否质检） + * @param query 查询条件封装对象，包含工厂、库存地点、物料等信息 * @return 物料属性信息列表，每个元素为 {@link ZWM3A21ResultDTO} 类型 */ public List zwm3a21(ZWM3A21QueryDTO query) { @@ -1395,7 +1395,7 @@ public class SapService { // /** // * 获取库存信息 // * @param factory 工厂编号 -// * @param warehouseNos 仓库编号列表 +// * @param warehouseNos 库存地点编号列表 // * @param beginTime 开始时间，格式yyyyMMdd // * @param endTime 结束时间，格式yyyyMMdd // */ From be8c7cedb6173014dfc8b6d86291b3c2aab0c8c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 1 Apr 2026 10:54:43 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat(out-purchase):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=89=AB=E7=A0=81=E6=89=B9=E6=AC=A1=E5=8F=B7=E5=92=8C=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E4=BF=A1=E6=81=AF=E5=A4=84=E7=90=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在出库采购控制器中新增批次号集合用于存储扫码批次信息 - 添加单位信息设置功能，从二维码主数据获取并设置到项目中 - 实现批次号去重合并功能，将多个批次号以逗号分隔形式存储 - 优化扫码数量累加逻辑，确保单位和批次信息正确关联 --- .../com/nflg/wms/admin/controller/OutPurchaseController.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java index fba82098..8e259d53 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutPurchaseController.java @@ -159,6 +159,7 @@ public class OutPurchaseController extends BaseController { item.setOrderId(orderId); item.setNum(BigDecimal.ZERO); item.setWerks(it.getWerks()); + Set batchNo=new HashSet<>(); if (CollectionUtil.isNotEmpty(it.getQrCodes())) { it.getQrCodes().forEach(qrCode -> { WmsQrCodeMaster qrCodeMaster = qrCodeMasters.stream() @@ -172,7 +173,9 @@ public class OutPurchaseController extends BaseController { .throwMessage("物料" + it.getMatnr() + "与二维码不匹配"); // VUtil.trueThrowBusinessError(!check(qrCodeMaster, it.getCharg(), it.getSernrs())) // .throwMessage("物料" + it.getMatnr() + "包含不符合批次号和序列号的扫码记录"); + item.setMeins(qrCodeMaster.getUnit()); item.setNum(item.getNum().add(qrCodeMaster.getQuantity())); + batchNo.add(qrCodeMaster.getBatchNo()); // qrCodeMaster.setFactoryCode(""); // qrCodeMaster.setStorageLocation(""); // qrCodeMaster.setBinLocation(""); @@ -203,6 +206,7 @@ public class OutPurchaseController extends BaseController { ); }); } + item.setCharg(StrUtil.join(",", batchNo)); // VUtil.trueThrowBusinessError(it.getNum().compareTo(item.getTemng()) > 0) // .throwMessage("物料" + it.getMatnr() + "的扫码数量大于退货数量"); // VUtil.trueThrowBusinessError(item.getNum().compareTo(it.getNum()) != 0) From 443cbfd1941e97efa6852b49933a87e0480206e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 1 Apr 2026 14:21:18 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat(pgi):=20=E6=B7=BB=E5=8A=A0=E6=99=AE?= =?UTF-8?q?=E9=80=9A=E7=89=A9=E6=96=99=E6=94=B6=E8=B4=A7=E5=8D=95=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=99=A8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 实现送货单列表查询和详情获取接口 - 添加PDA扫码收货确认功能 - 集成SAP物料信息同步机制 - 实现普通物料上架任务管理 - 添加采购物料入库确认流程 - 集成条码扫描和二维码处理功能 - 实现质检单和非质检单分别处理逻辑 - 添加储位管理和库存同步功能 - 实现一键收货查询功能 - 集成序列号和批次号验证机制 --- .../admin/controller/NormalPGIController.java | 211 ++++++++---------- 1 file changed, 88 insertions(+), 123 deletions(-) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java index 3c0d753e..6e3b74f7 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalPGIController.java @@ -10,7 +10,6 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.digest.DigestUtil; -import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.nflg.wms.admin.pojo.dto.*; import com.nflg.wms.admin.repository.OutMaterialScanRecordRespository; import com.nflg.wms.admin.repository.SrmMaterialReceiptNoScanCodesRepository; @@ -50,7 +49,10 @@ import java.math.BigDecimal; import java.time.Instant; import java.time.LocalDate; import java.time.LocalDateTime; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -427,57 +429,76 @@ public class NormalPGIController extends BaseController { if (CollectionUtil.isNotEmpty(scanCode)) { scanCode.forEach(code -> { - // 库存 - InventoryInDTO inventoryDTO = inventories.stream() - .filter(inventoriesDTO -> inventoriesDTO.getMaterialNo().equals(item.getItemCode()) - && inventoriesDTO.getBatchNo().equals(code.getBatchNumber()) - && inventoriesDTO.getSerialNo().equals(code.getSerialNumbers()) - && inventoriesDTO.getFactoryNo().equals(wmsPoReceipt.getFactoryCode()) - && inventoriesDTO.getWarehouseNo().equals(item.getReceivedWarehouse()) - ).findFirst().orElse(null); - - if (Objects.isNull(inventoryDTO)) { - inventoryDTO = new InventoryInDTO() - .setMaterialNo(item.getItemCode()) - .setFactoryNo(wmsPoReceipt.getFactoryCode()) - .setWarehouseNo(item.getReceivedWarehouse()) - .setBatchNo(code.getBatchNumber()) - .setSerialNo(code.getSerialNumbers()) - .setNum(code.getCodeNum()); - inventories.add(inventoryDTO); - } else { - inventoryDTO.setNum(inventoryDTO.getNum().add(code.getCodeNum())); + WmsQrCodeMaster qrCodeMaster = qrCodeMasterService.getByCode(code.getCodeId()); + VUtil.trueThrowBusinessError(Objects.isNull(qrCodeMaster)).throwMessage("条码不存在"); + qrCodeMaster.setProcessStage(BarCodeProcessStage.InBound.getState()) + .setLastScanBy(UserUtil.getUserId()) + .setLastScanByname(UserUtil.getUserName()) + .setLastScanTime(LocalDateTime.now()); + if (CollectionUtil.isNotEmpty(qo.getItems())) { + InCostCenterBackSubmitItemQRQO qrqo = qo.getItems() + .stream() + .filter(iit -> iit.getQrCode().contains(code.getCodeId())) + .findFirst() + .orElse(null); + if (Objects.nonNull(qrqo)) { + qrCodeMaster.setBinLocation(qrqo.getBinNo()); + } } - ZWM3A17Item1DTO ietm1Dto = item1.stream() - .filter(dto1 -> - dto1.getEBELP().equals(item.getPoLineNumber()) - && dto1.getMATNR().equals(item.getItemCode()) - && dto1.getMeins().equals(item.getUomCode()) - && dto1.getCHARG().equals(code.getBatchNumber()) - && dto1.getWERKS().equals(wmsPoReceipt.getFactoryCode()) - && dto1.getLGORT().equals(item.getReceivedWarehouse()) - ).findFirst().orElse(null); - if (Objects.isNull(ietm1Dto)) { - item1.add(new ZWM3A17Item1DTO() + qrCodeMasters.add(qrCodeMaster); + if (qrCodeMaster.getPackagingType() == 0) { + // 库存 + InventoryInDTO inventoryDTO = inventories.stream() + .filter(inventoriesDTO -> inventoriesDTO.getMaterialNo().equals(item.getItemCode()) + && inventoriesDTO.getBatchNo().equals(qrCodeMaster.getBatchNo()) + && inventoriesDTO.getSerialNo().equals(qrCodeMaster.getSerialNo()) + && inventoriesDTO.getFactoryNo().equals(qrCodeMaster.getFactoryCode()) + && inventoriesDTO.getWarehouseNo().equals(qrCodeMaster.getStorageLocation()) + && StrUtil.equals(inventoriesDTO.getBinLocation(), qrCodeMaster.getBinLocation()) + ).findFirst() + .orElse(null); + if (Objects.isNull(inventoryDTO)) { + inventoryDTO = new InventoryInDTO() + .setMaterialNo(qrCodeMaster.getMaterialCode()) + .setFactoryNo(qrCodeMaster.getFactoryCode()) + .setWarehouseNo(qrCodeMaster.getStorageLocation()) + .setBatchNo(qrCodeMaster.getBatchNo()) + .setSerialNo(qrCodeMaster.getSerialNo()) + .setNum(qrCodeMaster.getQuantity()); + inventories.add(inventoryDTO); + } else { + inventoryDTO.setNum(inventoryDTO.getNum().add(qrCodeMaster.getQuantity())); + } + ZWM3A17Item1DTO ietm1Dto = item1.stream() + .filter(dto1 -> + dto1.getEBELP().equals(item.getPoLineNumber()) + && dto1.getMATNR().equals(item.getItemCode()) + && dto1.getMeins().equals(item.getUomCode()) + && dto1.getCHARG().equals(code.getBatchNumber()) + && dto1.getWERKS().equals(wmsPoReceipt.getFactoryCode()) + && dto1.getLGORT().equals(item.getReceivedWarehouse()) + ).findFirst().orElse(null); + if (Objects.isNull(ietm1Dto)) { + item1.add(new ZWM3A17Item1DTO() + .setEBELP(item.getPoLineNumber()) + .setMATNR(item.getItemCode()) + .setERFMG(code.getCodeNum()) + .setMEINS(item.getUomCode()) + .setCHARG(code.getBatchNumber()) + .setWERKS(wmsPoReceipt.getFactoryCode()) + .setLGORT(item.getReceivedWarehouse()) + .setKZKRI("") + ); + } else { + ietm1Dto.setERFMG(ietm1Dto.getERFMG().add(code.getCodeNum())); + } + + item2.add(new ZWM3A17Item2DTO() .setEBELP(item.getPoLineNumber()) - .setMATNR(item.getItemCode()) - .setERFMG(code.getCodeNum()) - .setMEINS(item.getUomCode()) - .setCHARG(code.getBatchNumber()) - .setWERKS(wmsPoReceipt.getFactoryCode()) - .setLGORT(item.getReceivedWarehouse()) - .setKZKRI("") - ); - } else { - ietm1Dto.setERFMG(ietm1Dto.getERFMG().add(code.getCodeNum())); - } + .setFLAG("") + .setSERNR(code.getSerialNumbers())); - item2.add(new ZWM3A17Item2DTO() - .setEBELP(item.getPoLineNumber()) - .setFLAG("") - .setSERNR(code.getSerialNumbers())); - - scanCodes.add(code); + scanCodes.add(code); // WmsQrCodeMaster wmsQrCodeMaster = new WmsQrCodeMaster() // .setBarcodeCode(code.getCodeId()) // .setBarcodeType((short) 1) @@ -485,36 +506,6 @@ public class NormalPGIController extends BaseController { // .setLastScanBy(UserUtil.getUserId()) // .setLastScanByname(UserUtil.getUserName()) // .setLastScanTime(LocalDateTime.now()); - - WmsQrCodeMaster wmsQrCodeMaster = new WmsQrCodeMaster(); - WmsQrCodeMaster existCode = qrCodeMasterService.lambdaQuery() - .eq(WmsQrCodeMaster::getBarcodeCode, code.getCodeId()) - .one(); - if (existCode != null) { - wmsQrCodeMaster = existCode; - } else { - wmsQrCodeMaster.setId(IdWorker.getId()); - } - wmsQrCodeMaster - .setBarcodeCode(code.getCodeId()) - .setBarcodeType((short) 1) - .setMaterialCode(item.getItemCode()) - .setMaterialDescription(item.getItemName()) - .setProcessStage(BarCodeProcessStage.InBound.getState()) - .setReceiptItemId(item.getId()) - .setLastScanBy(UserUtil.getUserId()) - .setLastScanByname(UserUtil.getUserName()) - .setLastScanTime(LocalDateTime.now()); - - qrCodeMasters.add(wmsQrCodeMaster); - if (CollectionUtil.isNotEmpty(qo.getItems())) { - InCostCenterBackSubmitItemQRQO qrqo = qo.getItems() - .stream() - .filter(iit -> iit.getQrCode().contains(code.getCodeId())) - .findFirst() - .orElse(null); - VUtil.trueThrowBusinessError(Objects.isNull(qrqo)).throwMessage("条码" + code.getCodeId() + "已收货但不在本次扫码列表中"); - wmsQrCodeMaster.setBinLocation(qrqo.getBinNo()); } }); } else { @@ -542,49 +533,23 @@ public class NormalPGIController extends BaseController { } if (CollectionUtil.isNotEmpty(qrCodeMasters)) { //同步箱码信息到物料码中 - List parents = qrCodeMasters - .stream() -// .filter(qrCode -> qrCode.getPackagingType() == 1) - .filter(qrCode -> qrCode.getPackagingType() != null && qrCode.getPackagingType() == 1) - .toList(); -// List children = qrCodeMasterService.lambdaQuery() -// .in(WmsQrCodeMaster::getParentBarcodeId, parents -// .stream() -// .map(WmsQrCodeMaster::getId) -// .toList() -// ) -// .list(); - - List children; - if (CollectionUtil.isNotEmpty(parents)) { - children = qrCodeMasterService.lambdaQuery() - .in(WmsQrCodeMaster::getParentBarcodeId, - parents.stream() - .map(WmsQrCodeMaster::getId) - .toList() - ) - .list(); - } else { - children = new ArrayList<>(); - } - - parents.forEach(p -> { - children.stream() - .filter(c -> c.getParentBarcodeId().equals(p.getId())) - .forEach(c -> { - c.setProcessStage(p.getProcessStage()); - c.setLastScanBy(UserUtil.getUserId()); - c.setLastScanByname(UserUtil.getUserName()); - c.setLastScanTime(LocalDateTime.now()); - c.setFactoryCode(p.getFactoryCode()); - c.setStorageLocation(p.getStorageLocation()); - c.setBinLocation(p.getBinLocation()); - c.setReceiptItemId(p.getReceiptItemId()); - }); - }); - qrCodeMasters.addAll(children); -// qrCodeMasterService.updateBarCode(qrCodeMasters); - qrCodeMasterService.saveOrUpdateBatch(qrCodeMasters); + qrCodeMasters.stream() + .filter(qr -> qr.getPackagingType() == 1) + .forEach(p -> { + qrCodeMasters.stream() + .filter(qr -> Objects.equals(qr.getParentBarcodeId(), p.getId())) + .forEach(c -> { + c.setProcessStage(p.getProcessStage()); + c.setLastScanBy(UserUtil.getUserId()); + c.setLastScanByname(UserUtil.getUserName()); + c.setLastScanTime(LocalDateTime.now()); + c.setFactoryCode(p.getFactoryCode()); + c.setStorageLocation(p.getStorageLocation()); + c.setBinLocation(p.getBinLocation()); + c.setReceiptItemId(p.getReceiptItemId()); + }); + }); + qrCodeMasterService.updateBarCode(qrCodeMasters); } normalPGIControllerService.takeDeliveryConfirm(receiptItems, storageLocationDTOS, inventories, zwm3A17DTOS, request.getTaskId(), scanCodes); return ApiResult.success();