From 341486ba234850ba974b0a9a9d645c9d7c2c4565 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Tue, 16 Jan 2024 14:37:31 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E5=93=81=E6=94=B9=E6=88=90=E7=89=A9?= =?UTF-8?q?=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/wms/enums/DictTypeConstants.java | 12 ++--- .../module/wms/enums/ErrorCodeConstants.java | 54 +++++++++---------- .../vo/BackflushRequestDetailbBaseVO.java | 10 ++-- .../vo/BackflushRequestDetailbExcelVO.java | 8 +-- .../BackflushRequestDetailbExportReqVO.java | 8 +-- .../vo/BackflushRequestDetailbPageReqVO.java | 8 +-- .../wms/controller/bom/BomController.java | 2 +- .../businesstype/BusinesstypeController.java | 2 +- .../businesstype/vo/BusinesstypeBaseVO.java | 8 +-- .../businesstype/vo/BusinesstypeExcelVO.java | 4 +- .../vo/BusinesstypeExportReqVO.java | 4 +- .../vo/BusinesstypeImportExcelVo.java | 4 +- .../vo/BusinesstypePageReqVO.java | 4 +- .../controller/carrier/CarrierController.java | 2 +- .../countJob/vo/CountJobDetailBaseVO.java | 8 +-- .../countJob/vo/CountJobDetailExcelVO.java | 8 +-- .../vo/CountJobDetailExportReqVO.java | 8 +-- .../countJob/vo/CountJobDetailPageReqVO.java | 8 +-- .../countJob/vo/CountJobMainExcelVO.java | 8 +-- .../countPlan/vo/CountPlanMainBaseVO.java | 2 +- .../countPlan/vo/CountPlanMainExcelVO.java | 4 +- .../vo/CountPlanMainExportReqVO.java | 2 +- .../countPlan/vo/CountPlanMainPageReqVO.java | 2 +- .../vo/CountRecordDetailBaseVO.java | 8 +-- .../vo/CountRecordDetailExcelVO.java | 8 +-- .../vo/CountRecordDetailExportReqVO.java | 8 +-- .../vo/CountRecordDetailPageReqVO.java | 8 +-- .../vo/CountRecordMainExcelVO.java | 8 +-- .../vo/CountRequestDetailBaseVO.java | 8 +-- .../vo/CountRequestDetailExcelVO.java | 8 +-- .../vo/CountRequestDetailExportReqVO.java | 8 +-- .../vo/CountRequestDetailPageReqVO.java | 8 +-- .../vo/CountRequestMainExcelVO.java | 8 +-- .../vo/CountRequestMainImportVO.java | 2 +- .../vo/CountadjustRecordDetailBaseVO.java | 8 +-- .../vo/CountadjustRecordDetailExcelVO.java | 8 +-- .../CountadjustRecordDetailExportReqVO.java | 8 +-- .../vo/CountadjustRecordDetailPageReqVO.java | 8 +-- .../vo/CountadjustRecordMainExcelVO.java | 8 +-- .../vo/CountadjustRequestDetailBaseVO.java | 8 +-- .../vo/CountadjustRequestDetailExcelVO.java | 8 +-- .../CountadjustRequestDetailExportReqVO.java | 8 +-- .../vo/CountadjustRequestDetailPageReqVO.java | 8 +-- .../vo/CountadjustRequestMainExcelVO.java | 8 +-- .../customeritem/CustomeritemController.java | 30 +++++------ .../customeritem/vo/CustomeritemBaseVO.java | 2 +- .../vo/CustomeritemCreateReqVO.java | 2 +- .../customeritem/vo/CustomeritemExcelVO.java | 2 +- .../vo/CustomeritemExportReqVO.java | 2 +- .../vo/CustomeritemPageReqVO.java | 2 +- .../customeritem/vo/CustomeritemRespVO.java | 2 +- .../vo/CustomeritemUpdateReqVO.java | 2 +- .../vo/CustomerreceiptRecordDetailBaseVO.java | 8 +-- .../CustomerreceiptRecordDetailExcelVO.java | 8 +-- ...ustomerreceiptRecordDetailExportReqVO.java | 8 +-- .../CustomerreceiptRecordDetailPageReqVO.java | 8 +-- .../vo/CustomerreceiptRecordMainExcelVO.java | 8 +-- .../CustomerreceiptRequestDetailBaseVO.java | 8 +-- .../CustomerreceiptRequestDetailExcelVO.java | 8 +-- ...stomerreceiptRequestDetailExportReqVO.java | 8 +-- ...CustomerreceiptRequestDetailPageReqVO.java | 8 +-- .../vo/CustomerreceiptRequestMainExcelVO.java | 8 +-- .../vo/CustomerreturnJobDetailBaseVO.java | 8 +-- .../vo/CustomerreturnJobDetailExcelVO.java | 8 +-- .../CustomerreturnJobDetailExportReqVO.java | 8 +-- .../vo/CustomerreturnJobDetailPageReqVO.java | 8 +-- .../vo/CustomerreturnJobMainExcelVO.java | 8 +-- .../vo/CustomerreturnRecordDetailBaseVO.java | 8 +-- .../vo/CustomerreturnRecordDetailExcelVO.java | 8 +-- ...CustomerreturnRecordDetailExportReqVO.java | 8 +-- .../CustomerreturnRecordDetailPageReqVO.java | 8 +-- .../vo/CustomerreturnRecordMainExcelVO.java | 8 +-- .../vo/CustomerreturnRequestDetailBaseVO.java | 10 ++-- .../CustomerreturnRequestDetailExcelVO.java | 8 +-- ...ustomerreturnRequestDetailExportReqVO.java | 8 +-- .../CustomerreturnRequestDetailPageReqVO.java | 8 +-- .../vo/CustomerreturnRequestImportVO.java | 2 +- .../vo/CustomerreturnRequestMainExcelVO.java | 8 +-- .../vo/CustomersettleRecordDetailBaseVO.java | 8 +-- .../vo/CustomersettleRecordDetailExcelVO.java | 8 +-- ...CustomersettleRecordDetailExportReqVO.java | 8 +-- .../CustomersettleRecordDetailPageReqVO.java | 8 +-- .../vo/CustomersettleRecordMainExcelVO.java | 8 +-- .../vo/CustomersettleRequestDetailBaseVO.java | 8 +-- .../CustomersettleRequestDetailExcelVO.java | 8 +-- ...ustomersettleRequestDetailExportReqVO.java | 8 +-- .../CustomersettleRequestDetailPageReqVO.java | 8 +-- .../vo/CustomersettleRequestMainExcelVO.java | 8 +-- .../vo/CustomersettleRequestMainImportVO.java | 2 +- .../deliverJob/vo/DeliverJobDetailBaseVO.java | 8 +-- .../vo/DeliverJobDetailExcelVO.java | 8 +-- .../vo/DeliverJobDetailExportReqVO.java | 8 +-- .../vo/DeliverJobDetailPageReqVO.java | 8 +-- .../deliverJob/vo/DeliverJobMainExcelVO.java | 8 +-- .../vo/DeliverPlanDetailBaseVO.java | 2 +- .../vo/DeliverPlanDetailExcelVO.java | 2 +- .../vo/DeliverPlanDetailExportReqVO.java | 2 +- .../vo/DeliverPlanDetailPageReqVO.java | 2 +- .../vo/DeliverPlanMainExcelVO.java | 2 +- .../vo/DeliverPlanMainImportVO.java | 2 +- .../vo/DeliverRecordDetailBaseVO.java | 8 +-- .../vo/DeliverRecordDetailExcelVO.java | 8 +-- .../vo/DeliverRecordDetailExportReqVO.java | 8 +-- .../vo/DeliverRecordDetailPageReqVO.java | 8 +-- .../vo/DeliverRecordMainExcelVO.java | 8 +-- .../vo/DeliverRequestDetailBaseVO.java | 8 +-- .../vo/DeliverRequestDetailExcelVO.java | 8 +-- .../vo/DeliverRequestDetailExportReqVO.java | 8 +-- .../vo/DeliverRequestDetailPageReqVO.java | 8 +-- .../vo/DeliverRequestImportVO.java | 2 +- .../vo/DeliverRequestMainExcelVO.java | 8 +-- .../vo/DemandforecastingDetailBaseVO.java | 4 +- .../vo/DemandforecastingDetailExcelVO.java | 2 +- .../DemandforecastingDetailExportReqVO.java | 2 +- .../vo/DemandforecastingDetailPageReqVO.java | 2 +- .../vo/DemandforecastingImportVO.java | 2 +- .../inspectJob/vo/InspectJobDetailBaseVO.java | 8 +-- .../vo/InspectJobDetailExcelVO.java | 8 +-- .../vo/InspectJobDetailExportReqVO.java | 8 +-- .../vo/InspectJobDetailPageReqVO.java | 8 +-- .../inspectJob/vo/InspectJobMainBaseVO.java | 4 +- .../inspectJob/vo/InspectJobMainExcelVO.java | 8 +-- .../vo/InspectJobMainExportReqVO.java | 2 +- .../vo/InspectJobMainPageReqVO.java | 2 +- .../vo/InspectRecordDetailBaseVO.java | 8 +-- .../vo/InspectRecordDetailExcelVO.java | 8 +-- .../vo/InspectRecordDetailExportReqVO.java | 8 +-- .../vo/InspectRecordDetailPageReqVO.java | 8 +-- .../vo/InspectRecordMainBaseVO.java | 2 +- .../vo/InspectRecordMainExcelVO.java | 8 +-- .../vo/InspectRecordMainExportReqVO.java | 2 +- .../vo/InspectRecordMainPageReqVO.java | 2 +- .../vo/InspectRequestDetailBaseVO.java | 8 +-- .../vo/InspectRequestDetailExcelVO.java | 8 +-- .../vo/InspectRequestDetailExportReqVO.java | 8 +-- .../vo/InspectRequestDetailPageReqVO.java | 8 +-- .../vo/InspectRequestImportVO.java | 2 +- .../vo/InspectRequestMainBaseVO.java | 2 +- .../vo/InspectRequestMainExcelVO.java | 8 +-- .../vo/InspectRequestMainExportReqVO.java | 2 +- .../vo/InspectRequestMainPageReqVO.java | 2 +- .../vo/InventorychangeRecordDetailBaseVO.java | 10 ++-- .../InventorychangeRecordDetailExcelVO.java | 8 +-- ...nventorychangeRecordDetailExportReqVO.java | 8 +-- .../InventorychangeRecordDetailPageReqVO.java | 8 +-- .../vo/InventorychangeRecordMainExcelVO.java | 8 +-- .../InventorychangeRequestDetailBaseVO.java | 10 ++-- .../InventorychangeRequestDetailExcelVO.java | 8 +-- ...ventorychangeRequestDetailExportReqVO.java | 8 +-- ...InventorychangeRequestDetailPageReqVO.java | 8 +-- .../vo/InventorychangeRequestMainExcelVO.java | 8 +-- .../vo/InventoryinitRecordDetailBaseVO.java | 8 +-- .../vo/InventoryinitRecordDetailExcelVO.java | 8 +-- .../InventoryinitRecordDetailExportReqVO.java | 8 +-- .../InventoryinitRecordDetailPageReqVO.java | 8 +-- .../vo/InventoryinitRecordMainExcelVO.java | 8 +-- .../vo/InventoryinitRequestDetailBaseVO.java | 8 +-- .../vo/InventoryinitRequestDetailExcelVO.java | 8 +-- ...InventoryinitRequestDetailExportReqVO.java | 8 +-- .../InventoryinitRequestDetailPageReqVO.java | 8 +-- .../vo/InventoryinitRequestMainExcelVO.java | 8 +-- .../vo/InventoryinitRequestMainImportVO.java | 4 +- .../vo/InventorymoveJobDetailBaseVO.java | 8 +-- .../vo/InventorymoveJobDetailExcelVO.java | 8 +-- .../vo/InventorymoveJobDetailExportReqVO.java | 8 +-- .../vo/InventorymoveJobDetailPageReqVO.java | 8 +-- .../vo/InventorymoveJobMainExcelVO.java | 8 +-- .../vo/InventorymoveRecordDetailBaseVO.java | 10 ++-- .../vo/InventorymoveRecordDetailExcelVO.java | 8 +-- .../InventorymoveRecordDetailExportReqVO.java | 8 +-- .../InventorymoveRecordDetailPageReqVO.java | 8 +-- .../vo/InventorymoveRecordMainExcelVO.java | 8 +-- .../vo/InventorymoveRequestDetailBaseVO.java | 10 ++-- .../vo/InventorymoveRequestDetailExcelVO.java | 8 +-- ...InventorymoveRequestDetailExportReqVO.java | 8 +-- .../InventorymoveRequestDetailPageReqVO.java | 8 +-- .../vo/InventorymoveRequestMainExcelVO.java | 8 +-- .../vo/InventorymoveRequestMainImportVO.java | 2 +- .../issueJob/vo/IssueJobDetailBaseVO.java | 8 +-- .../issueJob/vo/IssueJobDetailExcelVO.java | 8 +-- .../vo/IssueJobDetailExportReqVO.java | 8 +-- .../issueJob/vo/IssueJobDetailPageReqVO.java | 8 +-- .../issueJob/vo/IssueJobMainExcelVO.java | 8 +-- .../vo/IssueRecordDetailBaseVO.java | 8 +-- .../vo/IssueRecordDetailExcelVO.java | 8 +-- .../vo/IssueRecordDetailExportReqVO.java | 8 +-- .../vo/IssueRecordDetailPageReqVO.java | 8 +-- .../vo/IssueRecordMainExcelVO.java | 8 +-- .../vo/IssueRequestDetailBaseVO.java | 8 +-- .../vo/IssueRequestDetailExcelVO.java | 8 +-- .../vo/IssueRequestDetailExportReqVO.java | 8 +-- .../vo/IssueRequestDetailPageReqVO.java | 8 +-- .../issueRequest/vo/IssueRequestImportVO.java | 2 +- .../vo/IssueRequestMainExcelVO.java | 8 +-- .../itembasic/ItembasicController.java | 38 ++++++------- .../itembasic/vo/ItembasicBaseVO.java | 2 +- .../itembasic/vo/ItembasicCreateReqVO.java | 2 +- .../itembasic/vo/ItembasicExcelVO.java | 2 +- .../itembasic/vo/ItembasicExportReqVO.java | 2 +- .../itembasic/vo/ItembasicPageReqVO.java | 2 +- .../itembasic/vo/ItembasicRespVO.java | 2 +- .../itembasic/vo/ItembasicUpdateReqVO.java | 2 +- .../ItempackagingController.java | 32 +++++------ .../itempackaging/vo/ItempackagingBaseVO.java | 6 +-- .../vo/ItempackagingCreateReqVO.java | 2 +- .../vo/ItempackagingExcelVO.java | 4 +- .../vo/ItempackagingExportReqVO.java | 4 +- .../vo/ItempackagingImportErrorVO.java | 2 +- .../vo/ItempackagingImportExcelVO.java | 2 +- .../vo/ItempackagingPageReqVO.java | 4 +- .../itempackaging/vo/ItempackagingRespVO.java | 2 +- .../vo/ItempackagingUpdateReqVO.java | 2 +- .../labelBarbasic/BarbasicController.java | 4 +- .../location/LocationController.java | 2 +- .../location/vo/LocationRecommendVO.java | 4 +- .../location/vo/LocationValidateVO.java | 4 +- .../OfflinesettlementRecordDetailBaseVO.java | 8 +-- .../OfflinesettlementRecordDetailExcelVO.java | 8 +-- ...linesettlementRecordDetailExportReqVO.java | 8 +-- ...fflinesettlementRecordDetailPageReqVO.java | 8 +-- .../OfflinesettlementRecordMainExcelVO.java | 8 +-- .../OfflinesettlementRequestDetailBaseVO.java | 10 ++-- ...OfflinesettlementRequestDetailExcelVO.java | 8 +-- ...inesettlementRequestDetailExportReqVO.java | 8 +-- ...flinesettlementRequestDetailPageReqVO.java | 8 +-- .../OnlinesettlementRecordDetailBaseVO.java | 8 +-- .../OnlinesettlementRecordDetailExcelVO.java | 8 +-- ...linesettlementRecordDetailExportReqVO.java | 8 +-- ...OnlinesettlementRecordDetailPageReqVO.java | 8 +-- .../vo/OnlinesettlementRecordMainExcelVO.java | 8 +-- .../OnlinesettlementRequestDetailBaseVO.java | 10 ++-- .../OnlinesettlementRequestDetailExcelVO.java | 8 +-- ...inesettlementRequestDetailExportReqVO.java | 8 +-- ...nlinesettlementRequestDetailPageReqVO.java | 8 +-- .../packageMassage/vo/PackageBaseVO.java | 10 ++-- .../packageMassage/vo/PackageExcelVO.java | 10 ++-- .../packageMassage/vo/PackageExportReqVO.java | 10 ++-- .../packageMassage/vo/PackagePageReqVO.java | 10 ++-- .../vo/PackagemergeDetailBaseVO.java | 8 +-- .../vo/PackagemergeDetailExcelVO.java | 8 +-- .../vo/PackagemergeDetailExportReqVO.java | 8 +-- .../vo/PackagemergeDetailPageReqVO.java | 8 +-- .../vo/PackageoverDetailBaseVO.java | 8 +-- .../vo/PackageoverDetailExcelVO.java | 8 +-- .../vo/PackageoverDetailExportReqVO.java | 8 +-- .../vo/PackageoverDetailPageReqVO.java | 8 +-- .../vo/PackagesplitDetailBaseVO.java | 8 +-- .../vo/PackagesplitDetailExcelVO.java | 8 +-- .../vo/PackagesplitDetailExportReqVO.java | 8 +-- .../vo/PackagesplitDetailPageReqVO.java | 8 +-- .../pickJob/vo/PickJobDetailBaseVO.java | 8 +-- .../pickJob/vo/PickJobDetailExcelVO.java | 8 +-- .../pickJob/vo/PickJobDetailExportReqVO.java | 8 +-- .../pickJob/vo/PickJobDetailPageReqVO.java | 8 +-- .../pickRecord/vo/PickRecordDetailBaseVO.java | 8 +-- .../vo/PickRecordDetailExcelVO.java | 8 +-- .../vo/PickRecordDetailExportReqVO.java | 8 +-- .../vo/PickRecordDetailPageReqVO.java | 8 +-- .../vo/PickRequestDetailBaseVO.java | 8 +-- .../vo/PickRequestDetailExcelVO.java | 8 +-- .../vo/PickRequestDetailExportReqVO.java | 8 +-- .../vo/PickRequestDetailPageReqVO.java | 8 +-- .../vo/PreparetoissueDetailBaseVO.java | 4 +- .../vo/PreparetoissueDetailExcelVO.java | 2 +- .../vo/PreparetoissueDetailExportReqVO.java | 2 +- .../vo/PreparetoissueDetailPageReqVO.java | 2 +- .../vo/PreparetoissueMainExcelVO.java | 2 +- .../vo/ProductdismantleJobDetailBaseVO.java | 8 +-- .../vo/ProductdismantleJobDetailExcelVO.java | 8 +-- .../ProductdismantleJobDetailExportReqVO.java | 8 +-- .../ProductdismantleJobDetailPageReqVO.java | 8 +-- .../ProductdismantleRecordDetailaBaseVO.java | 8 +-- .../ProductdismantleRecordDetailaExcelVO.java | 8 +-- ...ductdismantleRecordDetailaExportReqVO.java | 8 +-- ...roductdismantleRecordDetailaPageReqVO.java | 8 +-- .../ProductdismantleRecordDetailbBaseVO.java | 8 +-- .../ProductdismantleRecordDetailbExcelVO.java | 8 +-- ...ductdismantleRecordDetailbExportReqVO.java | 8 +-- ...roductdismantleRecordDetailbPageReqVO.java | 8 +-- .../vo/ProductdismantleRecordMainExcelVO.java | 8 +-- .../ProductdismantleRequestDetailaBaseVO.java | 8 +-- ...ProductdismantleRequestDetailaExcelVO.java | 8 +-- ...uctdismantleRequestDetailaExportReqVO.java | 8 +-- ...oductdismantleRequestDetailaPageReqVO.java | 8 +-- .../ProductdismantleRequestDetailbBaseVO.java | 10 ++-- ...ProductdismantleRequestDetailbExcelVO.java | 8 +-- ...uctdismantleRequestDetailbExportReqVO.java | 8 +-- ...oductdismantleRequestDetailbPageReqVO.java | 8 +-- .../ProductdismantleRequestDetailbRespVO.java | 4 +- .../ProductdismantleRequestMainExcelVO.java | 8 +-- .../production/vo/ProductionDetailBaseVO.java | 2 +- .../vo/ProductionDetailExcelVO.java | 2 +- .../vo/ProductionDetailExportReqVO.java | 2 +- .../vo/ProductionDetailPageReqVO.java | 2 +- .../production/vo/ProductionMainExcelVO.java | 2 +- .../production/vo/ProductionMainImportVO.java | 2 +- .../vo/ProductionlineItemImportErrorVO.java | 2 +- .../vo/ProductionlineItemImportExcelVO.java | 2 +- .../vo/ProductionlineitemBaseVO.java | 4 +- .../vo/ProductionlineitemExcelVO.java | 2 +- .../vo/ProductionlineitemExportReqVO.java | 2 +- .../vo/ProductionlineitemPageReqVO.java | 2 +- .../vo/ProductionreceiptJobDetailBaseVO.java | 8 +-- .../vo/ProductionreceiptJobDetailExcelVO.java | 8 +-- ...ProductionreceiptJobDetailExportReqVO.java | 8 +-- .../ProductionreceiptJobDetailPageReqVO.java | 8 +-- .../vo/ProductionreceiptJobMainExcelVO.java | 8 +-- .../ProductionreceiptRecordDetailBaseVO.java | 10 ++-- .../ProductionreceiptRecordDetailExcelVO.java | 8 +-- ...ductionreceiptRecordDetailExportReqVO.java | 8 +-- ...roductionreceiptRecordDetailPageReqVO.java | 8 +-- .../ProductionreceiptRecordMainExcelVO.java | 8 +-- .../vo/ProductionreturnJobDetailBaseVO.java | 8 +-- .../vo/ProductionreturnJobDetailExcelVO.java | 8 +-- .../ProductionreturnJobDetailExportReqVO.java | 8 +-- .../ProductionreturnJobDetailPageReqVO.java | 8 +-- .../vo/ProductionreturnJobMainExcelVO.java | 8 +-- .../ProductionreturnRecordDetailBaseVO.java | 8 +-- .../ProductionreturnRecordDetailExcelVO.java | 8 +-- ...oductionreturnRecordDetailExportReqVO.java | 8 +-- ...ProductionreturnRecordDetailPageReqVO.java | 8 +-- .../vo/ProductionreturnRecordMainExcelVO.java | 8 +-- .../ProductionreturnRequestDetailBaseVO.java | 8 +-- .../ProductionreturnRequestDetailExcelVO.java | 8 +-- ...ductionreturnRequestDetailExportReqVO.java | 8 +-- ...roductionreturnRequestDetailPageReqVO.java | 8 +-- .../vo/ProductionreturnRequestImportVO.java | 2 +- .../ProductionreturnRequestMainExcelVO.java | 8 +-- .../vo/ProductputawayJobDetailBaseVO.java | 8 +-- .../vo/ProductputawayJobDetailExcelVO.java | 8 +-- .../ProductputawayJobDetailExportReqVO.java | 8 +-- .../vo/ProductputawayJobDetailPageReqVO.java | 8 +-- .../vo/ProductputawayJobMainExcelVO.java | 8 +-- .../vo/ProductputawayRecordDetailBaseVO.java | 8 +-- .../vo/ProductputawayRecordDetailExcelVO.java | 8 +-- ...ProductputawayRecordDetailExportReqVO.java | 8 +-- .../ProductputawayRecordDetailPageReqVO.java | 8 +-- .../vo/ProductputawayRecordMainExcelVO.java | 8 +-- .../vo/ProductputawayImportExcelVO.java | 2 +- .../vo/ProductputawayImportVO.java | 2 +- .../vo/ProductputawayRequestDetailBaseVO.java | 8 +-- .../ProductputawayRequestDetailExcelVO.java | 8 +-- ...roductputawayRequestDetailExportReqVO.java | 8 +-- .../ProductputawayRequestDetailPageReqVO.java | 8 +-- .../vo/ProductputawayRequestImportVO.java | 2 +- .../vo/ProductputawayRequestMainExcelVO.java | 8 +-- .../vo/ProductreceiptJobDetailBaseVO.java | 8 +-- .../vo/ProductreceiptJobDetailExcelVO.java | 8 +-- .../ProductreceiptJobDetailExportReqVO.java | 8 +-- .../vo/ProductreceiptJobDetailPageReqVO.java | 8 +-- .../vo/ProductreceiptJobMainExcelVO.java | 8 +-- .../vo/BackflushRecordDetailbBaseVO.java | 10 ++-- .../vo/BackflushRecordDetailbExcelVO.java | 8 +-- .../vo/BackflushRecordDetailbExportReqVO.java | 8 +-- .../vo/BackflushRecordDetailbPageReqVO.java | 8 +-- .../vo/ProductreceiptRecordDetailBaseVO.java | 8 +-- .../vo/ProductreceiptRecordDetailExcelVO.java | 8 +-- ...ProductreceiptRecordDetailExportReqVO.java | 8 +-- .../ProductreceiptRecordDetailPageReqVO.java | 8 +-- .../vo/ProductreceiptRecordMainExcelVO.java | 8 +-- .../vo/ProductreceiptRequestDetailBaseVO.java | 8 +-- .../ProductreceiptRequestDetailExcelVO.java | 8 +-- ...roductreceiptRequestDetailExportReqVO.java | 8 +-- .../ProductreceiptRequestDetailPageReqVO.java | 8 +-- .../vo/ProductreceiptRequestImportVO.java | 2 +- .../vo/ProductreceiptRequestMainExcelVO.java | 8 +-- .../vo/ConsumeRecordDetailbBaseVO.java | 8 +-- .../vo/ConsumeRecordDetailbExcelVO.java | 8 +-- .../vo/ConsumeRecordDetailbExportReqVO.java | 8 +-- .../vo/ConsumeRecordDetailbPageReqVO.java | 8 +-- .../vo/ProductrepairRecordDetailBaseVO.java | 8 +-- .../vo/ProductrepairRecordDetailExcelVO.java | 8 +-- .../ProductrepairRecordDetailExportReqVO.java | 8 +-- .../ProductrepairRecordDetailPageReqVO.java | 8 +-- .../vo/ProductrepairRequestBomRespVO.java | 2 +- .../vo/ProductrepairRequestDetailaBaseVO.java | 10 ++-- .../ProductrepairRequestDetailaExcelVO.java | 8 +-- ...roductrepairRequestDetailaExportReqVO.java | 8 +-- .../ProductrepairRequestDetailaPageReqVO.java | 8 +-- .../vo/ProductrepairRequestDetailbBaseVO.java | 10 ++-- .../ProductrepairRequestDetailbExcelVO.java | 8 +-- ...roductrepairRequestDetailbExportReqVO.java | 8 +-- .../ProductrepairRequestDetailbPageReqVO.java | 8 +-- .../vo/ProductrepairRequestMainImportVO.java | 4 +- .../ProductscrapJobDetailController.java | 2 +- .../ProductscrapJobMainController.java | 2 +- .../vo/ProductscrapJobDetailBaseVO.java | 8 +-- .../vo/ProductscrapJobDetailExcelVO.java | 8 +-- .../vo/ProductscrapJobDetailExportReqVO.java | 8 +-- .../vo/ProductscrapJobDetailPageReqVO.java | 8 +-- .../ProductscrapRecordMainController.java | 2 +- .../vo/ProductscrapRecordDetailBaseVO.java | 8 +-- .../vo/ProductscrapRecordDetailExcelVO.java | 8 +-- .../ProductscrapRecordDetailExportReqVO.java | 8 +-- .../vo/ProductscrapRecordDetailPageReqVO.java | 8 +-- .../vo/RawscrapRecordDetailBaseVO.java | 8 +-- .../vo/RawscrapRecordDetailExcelVO.java | 8 +-- .../vo/RawscrapRecordDetailExportReqVO.java | 8 +-- .../vo/RawscrapRecordDetailPageReqVO.java | 8 +-- .../ProductscrapRequestDetailController.java | 2 +- .../ProductscrapRequestMainController.java | 2 +- .../vo/ProductscrapRequestBomRespVO.java | 2 +- .../vo/ProductscrapRequestDetailBaseVO.java | 10 ++-- .../vo/ProductscrapRequestDetailExcelVO.java | 8 +-- .../ProductscrapRequestDetailExportReqVO.java | 8 +-- .../ProductscrapRequestDetailPageReqVO.java | 8 +-- .../vo/ProductscrapRequestImportVO.java | 4 +- .../vo/RawscrapRequestDetailBaseVO.java | 10 ++-- .../vo/RawscrapRequestDetailExcelVO.java | 8 +-- .../vo/RawscrapRequestDetailExportReqVO.java | 8 +-- .../vo/RawscrapRequestDetailPageReqVO.java | 8 +-- .../controller/project/ProjectController.java | 2 +- .../purchase/PurchaseMainController.java | 2 +- .../purchase/vo/PurchaseDetailBaseVO.java | 4 +- .../purchase/vo/PurchaseDetailExcelVO.java | 2 +- .../vo/PurchaseDetailExportReqVO.java | 2 +- .../purchase/vo/PurchaseDetailPageReqVO.java | 2 +- .../purchase/vo/PurchaseMainImportVO.java | 2 +- .../PurchasePlanMainController.java | 2 +- .../vo/PurchasePlanDetailBaseVO.java | 4 +- .../vo/PurchasePlanDetailExcelVO.java | 2 +- .../vo/PurchasePlanDetailExportReqVO.java | 2 +- .../vo/PurchasePlanDetailPageReqVO.java | 2 +- .../vo/PurchasePlanMainImportVO.java | 2 +- .../PurchaseclaimRecordDetailController.java | 2 +- .../PurchaseclaimRecordMainController.java | 2 +- .../vo/PurchaseclaimRecordDetailBaseVO.java | 8 +-- .../vo/PurchaseclaimRecordDetailExcelVO.java | 8 +-- .../PurchaseclaimRecordDetailExportReqVO.java | 8 +-- .../PurchaseclaimRecordDetailPageReqVO.java | 8 +-- .../vo/PurchaseclaimRequestDetailBaseVO.java | 8 +-- .../vo/PurchaseclaimRequestDetailExcelVO.java | 8 +-- ...PurchaseclaimRequestDetailExportReqVO.java | 8 +-- .../PurchaseclaimRequestDetailPageReqVO.java | 8 +-- .../vo/PurchaseclaimRequestImportVO.java | 2 +- .../vo/PurchasereceiptJobDetailBaseVO.java | 8 +-- .../vo/PurchasereceiptJobDetailExcelVO.java | 8 +-- .../PurchasereceiptJobDetailExportReqVO.java | 8 +-- .../vo/PurchasereceiptJobDetailPageReqVO.java | 8 +-- .../vo/PurchasereceiptJobMainExcelVO.java | 8 +-- .../vo/PurchasereceiptRecordDetailBaseVO.java | 10 ++-- .../PurchasereceiptRecordDetailExcelVO.java | 8 +-- ...urchasereceiptRecordDetailExportReqVO.java | 8 +-- .../PurchasereceiptRecordDetailPageReqVO.java | 8 +-- .../vo/PurchasereceiptRecordMainExcelVO.java | 8 +-- .../vo/PurchaseshortageDetailBaseVO.java | 10 ++-- .../vo/PurchaseshortageDetailExcelVO.java | 8 +-- .../vo/PurchaseshortageDetailExportReqVO.java | 8 +-- .../vo/PurchaseshortageDetailPageReqVO.java | 8 +-- ...urchasereceiptRequestDetailController.java | 2 +- .../PurchasereceiptRequestMainController.java | 2 +- .../PurchasereceiptRequestDetailBaseVO.java | 10 ++-- .../PurchasereceiptRequestDetailExcelVO.java | 8 +-- ...rchasereceiptRequestDetailExportReqVO.java | 8 +-- ...PurchasereceiptRequestDetailPageReqVO.java | 8 +-- .../vo/PurchasereceiptRequestMainExcelVO.java | 8 +-- .../PurchasereceiptRequestMainImportVO.java | 4 +- .../PurchasereturnJobDetailController.java | 2 +- .../PurchasereturnJobMainController.java | 2 +- .../vo/PurchasereturnJobDetailBaseVO.java | 8 +-- .../vo/PurchasereturnJobDetailExcelVO.java | 8 +-- .../PurchasereturnJobDetailExportReqVO.java | 8 +-- .../vo/PurchasereturnJobDetailPageReqVO.java | 8 +-- .../vo/PurchasereturnJobMainExcelVO.java | 8 +-- .../PurchasereturnRecordMainController.java | 2 +- .../vo/PurchasereturnRecordDetailBaseVO.java | 10 ++-- .../vo/PurchasereturnRecordDetailExcelVO.java | 8 +-- ...PurchasereturnRecordDetailExportReqVO.java | 8 +-- .../PurchasereturnRecordDetailPageReqVO.java | 8 +-- .../vo/PurchasereturnRecordMainExcelVO.java | 8 +-- .../PurchasereturnRequestMainController.java | 2 +- .../vo/PurchasereturnRequestDetailBaseVO.java | 8 +-- .../PurchasereturnRequestDetailExcelVO.java | 8 +-- ...urchasereturnRequestDetailExportReqVO.java | 8 +-- .../PurchasereturnRequestDetailPageReqVO.java | 8 +-- .../vo/PurchasereturnRequestImportVO.java | 2 +- .../vo/PurchasereturnRequestMainExcelVO.java | 8 +-- .../PutawayJobDetailController.java | 2 +- .../putawayJob/PutawayJobMainController.java | 2 +- .../putawayJob/vo/PutawayJobDetailBaseVO.java | 8 +-- .../vo/PutawayJobDetailExcelVO.java | 8 +-- .../vo/PutawayJobDetailExportReqVO.java | 8 +-- .../vo/PutawayJobDetailPageReqVO.java | 8 +-- .../putawayJob/vo/PutawayJobMainExcelVO.java | 8 +-- .../PutawayRecordDetailController.java | 2 +- .../PutawayRecordMainController.java | 2 +- .../vo/PutawayRecordDetailBaseVO.java | 10 ++-- .../vo/PutawayRecordDetailExcelVO.java | 8 +-- .../vo/PutawayRecordDetailExportReqVO.java | 8 +-- .../vo/PutawayRecordDetailPageReqVO.java | 8 +-- .../vo/PutawayRecordMainExcelVO.java | 8 +-- .../PutawayRequestMainController.java | 2 +- .../vo/PutawayRequestDetailBaseVO.java | 8 +-- .../vo/PutawayRequestDetailExcelVO.java | 8 +-- .../vo/PutawayRequestDetailExportReqVO.java | 8 +-- .../vo/PutawayRequestDetailPageReqVO.java | 8 +-- .../vo/PutawayRequestImportVO.java | 2 +- .../vo/PutawayRequestMainExcelVO.java | 8 +-- .../RecordsettingController.java | 2 +- .../RepleinshJobDetailController.java | 2 +- .../vo/RepleinshJobDetailBaseVO.java | 8 +-- .../vo/RepleinshJobDetailExcelVO.java | 8 +-- .../vo/RepleinshJobDetailExportReqVO.java | 8 +-- .../vo/RepleinshJobDetailPageReqVO.java | 8 +-- .../vo/RepleinshJobMainExcelVO.java | 8 +-- .../RepleinshRecordDetailController.java | 2 +- .../vo/RepleinshRecordDetailBaseVO.java | 8 +-- .../vo/RepleinshRecordDetailExcelVO.java | 8 +-- .../vo/RepleinshRecordDetailExportReqVO.java | 8 +-- .../vo/RepleinshRecordDetailPageReqVO.java | 8 +-- .../vo/RepleinshRecordMainExcelVO.java | 8 +-- .../RepleinshRequestDetailController.java | 2 +- .../RepleinshRequestMainController.java | 2 +- .../vo/RepleinshRequestDetailBaseVO.java | 8 +-- .../vo/RepleinshRequestDetailExcelVO.java | 8 +-- .../vo/RepleinshRequestDetailExportReqVO.java | 8 +-- .../vo/RepleinshRequestDetailPageReqVO.java | 8 +-- .../vo/RepleinshRequestMainExcelVO.java | 8 +-- .../vo/RepleinshRequestMainImportVO.java | 2 +- .../RequestsettingController.java | 2 +- .../wms/controller/rule/RuleController.java | 6 +-- .../rule/vo/PrecisionStrategyReqVO.java | 4 +- .../rule/vo/PrecisionStrategyReqVO2.java | 4 +- .../wms/controller/rule/vo/RuleExcelVO.java | 2 +- .../controller/sale/SaleDetailController.java | 2 +- .../controller/sale/vo/SaleDetailBaseVO.java | 4 +- .../controller/sale/vo/SaleDetailExcelVO.java | 2 +- .../sale/vo/SaleDetailExportReqVO.java | 2 +- .../sale/vo/SaleDetailPageReqVO.java | 2 +- .../controller/sale/vo/SaleMainImportVO.java | 2 +- .../scrapJob/ScrapJobDetailController.java | 2 +- .../scrapJob/ScrapJobMainController.java | 2 +- .../scrapJob/vo/ScrapJobDetailBaseVO.java | 8 +-- .../scrapJob/vo/ScrapJobDetailExcelVO.java | 8 +-- .../vo/ScrapJobDetailExportReqVO.java | 8 +-- .../scrapJob/vo/ScrapJobDetailPageReqVO.java | 8 +-- .../ScrapRecordDetailController.java | 2 +- .../vo/ScrapRecordDetailBaseVO.java | 8 +-- .../vo/ScrapRecordDetailExcelVO.java | 8 +-- .../vo/ScrapRecordDetailExportReqVO.java | 8 +-- .../vo/ScrapRecordDetailPageReqVO.java | 8 +-- .../ScrapRequestDetailController.java | 2 +- .../vo/ScrapRequestDetailBaseVO.java | 8 +-- .../vo/ScrapRequestDetailExcelVO.java | 8 +-- .../vo/ScrapRequestDetailExportReqVO.java | 8 +-- .../vo/ScrapRequestDetailPageReqVO.java | 8 +-- .../scrapRequest/vo/ScrapRequestImportVO.java | 2 +- .../vo/ScrapRequestMainExcelVO.java | 8 +-- .../supplier/SupplierController.java | 2 +- ...SupplierdeliverRecordDetailController.java | 2 +- .../SupplierdeliverRecordMainController.java | 2 +- .../vo/SupplierdeliverRecordDetailBaseVO.java | 8 +-- .../SupplierdeliverRecordDetailExcelVO.java | 8 +-- ...upplierdeliverRecordDetailExportReqVO.java | 8 +-- .../SupplierdeliverRecordDetailPageReqVO.java | 8 +-- .../vo/SupplierdeliverRecordMainExcelVO.java | 8 +-- ...upplierdeliverRequestDetailController.java | 2 +- .../SupplierdeliverRequestMainController.java | 2 +- .../SupplierdeliverRequestDetailBaseVO.java | 10 ++-- .../SupplierdeliverRequestDetailExcelVO.java | 8 +-- ...pplierdeliverRequestDetailExportReqVO.java | 8 +-- ...SupplierdeliverRequestDetailPageReqVO.java | 8 +-- .../SupplierdeliverRequestMainImportVO.java | 2 +- ...SupplierinvoiceRecordDeatilController.java | 2 +- .../SupplierinvoiceRecordMainController.java | 2 +- .../vo/SupplierinvoiceRecordDeatilBaseVO.java | 8 +-- .../SupplierinvoiceRecordDeatilExcelVO.java | 8 +-- ...upplierinvoiceRecordDeatilExportReqVO.java | 8 +-- .../SupplierinvoiceRecordDeatilPageReqVO.java | 8 +-- ...upplierinvoiceRequestDetailController.java | 2 +- .../SupplierinvoiceRequestDetailBaseVO.java | 2 +- .../SupplierinvoiceRequestDetailExcelVO.java | 2 +- ...pplierinvoiceRequestDetailExportReqVO.java | 2 +- ...SupplierinvoiceRequestDetailPageReqVO.java | 2 +- .../vo/SupplierinvoiceRequestMainExcelVO.java | 2 +- .../supplieritem/SupplieritemController.java | 34 ++++++------ .../supplieritem/vo/SupplieritemBaseVO.java | 2 +- .../vo/SupplieritemCreateReqVO.java | 2 +- .../supplieritem/vo/SupplieritemExcelVO.java | 2 +- .../vo/SupplieritemExportReqVO.java | 2 +- .../vo/SupplieritemPageReqVO.java | 2 +- .../supplieritem/vo/SupplieritemRespVO.java | 2 +- .../vo/SupplieritemUpdateReqVO.java | 2 +- .../SystemcalendarController.java | 2 +- .../wms/controller/team/TeamController.java | 2 +- .../transaction/TransactionController.java | 2 +- .../TransactiontypeController.java | 2 +- .../TransferissueJobDetailController.java | 2 +- .../TransferissueJobMainController.java | 2 +- .../vo/TransferissueJobDetailBaseVO.java | 8 +-- .../vo/TransferissueJobDetailExcelVO.java | 8 +-- .../vo/TransferissueJobDetailExportReqVO.java | 8 +-- .../vo/TransferissueJobDetailPageReqVO.java | 8 +-- .../TransferissueRecordDetailController.java | 2 +- .../TransferissueRecordMainController.java | 2 +- .../vo/TransferissueRecordDetailBaseVO.java | 10 ++-- .../vo/TransferissueRecordDetailExcelVO.java | 8 +-- .../TransferissueRecordDetailExportReqVO.java | 8 +-- .../TransferissueRecordDetailPageReqVO.java | 8 +-- .../TransferissueRequestDetailController.java | 2 +- .../TransferissueRequestMainController.java | 2 +- .../vo/TransferissueRequestDetailBaseVO.java | 10 ++-- .../vo/TransferissueRequestDetailExcelVO.java | 8 +-- ...TransferissueRequestDetailExportReqVO.java | 8 +-- .../TransferissueRequestDetailPageReqVO.java | 8 +-- .../transferlog/TransferlogController.java | 2 +- .../TransferreceiptJobDetailController.java | 2 +- .../TransferreceiptJobMainController.java | 2 +- .../vo/TransferreceiptJobDetailBaseVO.java | 8 +-- .../vo/TransferreceiptJobDetailExcelVO.java | 8 +-- .../TransferreceiptJobDetailExportReqVO.java | 8 +-- .../vo/TransferreceiptJobDetailPageReqVO.java | 8 +-- ...TransferreceiptRecordDetailController.java | 2 +- .../TransferreceiptRecordMainController.java | 2 +- .../vo/TransferreceiptRecordDetailBaseVO.java | 8 +-- .../TransferreceiptRecordDetailExcelVO.java | 8 +-- ...ransferreceiptRecordDetailExportReqVO.java | 8 +-- .../TransferreceiptRecordDetailPageReqVO.java | 8 +-- ...ransferreceiptRequestDetailController.java | 2 +- .../TransferreceiptRequestMainController.java | 2 +- .../TransferreceiptRequestDetailBaseVO.java | 10 ++-- .../TransferreceiptRequestDetailExcelVO.java | 8 +-- ...ansferreceiptRequestDetailExportReqVO.java | 8 +-- ...TransferreceiptRequestDetailPageReqVO.java | 8 +-- .../UnplannedissueJobMainController.java | 2 +- .../vo/UnplannedissueJobDetailBaseVO.java | 8 +-- .../vo/UnplannedissueJobDetailExcelVO.java | 8 +-- .../UnplannedissueJobDetailExportReqVO.java | 8 +-- .../vo/UnplannedissueJobDetailPageReqVO.java | 8 +-- .../UnplannedissueRecordDetailController.java | 2 +- .../UnplannedissueRecordMainController.java | 2 +- .../vo/UnplannedissueRecordDetailBaseVO.java | 8 +-- .../vo/UnplannedissueRecordDetailExcelVO.java | 8 +-- ...UnplannedissueRecordDetailExportReqVO.java | 8 +-- .../UnplannedissueRecordDetailPageReqVO.java | 8 +-- ...UnplannedissueRequestDetailController.java | 2 +- .../UnplannedissueRequestMainController.java | 2 +- .../vo/UnplannedissueRequestDetailBaseVO.java | 10 ++-- .../UnplannedissueRequestDetailExcelVO.java | 8 +-- ...nplannedissueRequestDetailExportReqVO.java | 8 +-- .../UnplannedissueRequestDetailPageReqVO.java | 8 +-- .../vo/UnplannedissueRequestMainExcelVO.java | 8 +-- .../UnplannedreceiptJobDetailController.java | 2 +- .../UnplannedreceiptJobMainController.java | 2 +- .../vo/UnplannedreceiptJobDetailBaseVO.java | 8 +-- .../vo/UnplannedreceiptJobDetailExcelVO.java | 8 +-- .../UnplannedreceiptJobDetailExportReqVO.java | 8 +-- .../UnplannedreceiptJobDetailPageReqVO.java | 8 +-- ...nplannedreceiptRecordDetailController.java | 2 +- .../UnplannedreceiptRecordMainController.java | 2 +- .../UnplannedreceiptRecordDetailBaseVO.java | 8 +-- .../UnplannedreceiptRecordDetailExcelVO.java | 8 +-- ...plannedreceiptRecordDetailExportReqVO.java | 8 +-- ...UnplannedreceiptRecordDetailPageReqVO.java | 8 +-- ...plannedreceiptRequestDetailController.java | 2 +- ...UnplannedreceiptRequestMainController.java | 2 +- .../UnplannedreceiptRequestDetailBaseVO.java | 8 +-- .../UnplannedreceiptRequestDetailExcelVO.java | 8 +-- ...lannedreceiptRequestDetailExportReqVO.java | 8 +-- ...nplannedreceiptRequestDetailPageReqVO.java | 8 +-- .../UnplannedreceiptRequestMainExcelVO.java | 8 +-- .../warehouse/WarehouseController.java | 2 +- .../controller/work/WorkMainController.java | 2 +- .../controller/work/vo/WorkDetailBaseVO.java | 4 +- .../controller/work/vo/WorkDetailExcelVO.java | 2 +- .../work/vo/WorkDetailExportReqVO.java | 2 +- .../work/vo/WorkDetailPageReqVO.java | 2 +- .../controller/work/vo/WorkMainExcelVO.java | 2 +- .../controller/work/vo/WorkMainImportVO.java | 2 +- .../customeritem/CustomeritemConvert.java | 2 +- .../convert/itembasic/ItembasicConvert.java | 2 +- .../itempackaging/ItempackagingConvert.java | 2 +- .../supplieritem/SupplieritemConvert.java | 2 +- .../BackflushRequestDetailbDO.java | 8 +-- .../businesstype/BusinesstypeDO.java | 4 +- .../dataobject/countJob/CountJobDetailDO.java | 8 +-- .../dataobject/countPlan/CountPlanMainDO.java | 2 +- .../countRecord/CountRecordDetailDO.java | 8 +-- .../countRequest/CountRequestDetailDO.java | 8 +-- .../CountadjustRecordDetailDO.java | 8 +-- .../CountadjustRequestDetailDO.java | 8 +-- .../customeritem/CustomeritemDO.java | 2 +- .../CustomerreceiptRecordDetailDO.java | 8 +-- .../CustomerreceiptRequestDetailDO.java | 8 +-- .../CustomerreturnJobDetailDO.java | 8 +-- .../CustomerreturnRecordDetailDO.java | 8 +-- .../CustomerreturnRequestDetailDO.java | 8 +-- .../CustomersettleRecordDetailDO.java | 8 +-- .../CustomersettleRequestDetailDO.java | 8 +-- .../deliverJob/DeliverJobDetailDO.java | 8 +-- .../deliverPlan/DeliverPlanDetailDO.java | 2 +- .../deliverRecord/DeliverRecordDetailDO.java | 8 +-- .../DeliverRequestDetailDO.java | 8 +-- .../DemandforecastingDetailDO.java | 2 +- .../inspectJob/InspectJobDetailDO.java | 8 +-- .../inspectJob/InspectJobMainDO.java | 2 +- .../inspectRecord/InspectRecordDetailDO.java | 8 +-- .../inspectRecord/InspectRecordMainDO.java | 2 +- .../InspectRequestDetailDO.java | 8 +-- .../inspectRequest/InspectRequestMainDO.java | 2 +- .../InventorychangeRecordDetailDO.java | 8 +-- .../InventorychangeRequestDetailDO.java | 8 +-- .../InventoryinitRecordDetailDO.java | 8 +-- .../InventoryinitRequestDetailDO.java | 8 +-- .../InventorymoveJobDetailDO.java | 8 +-- .../InventorymoveRecordDetailDO.java | 8 +-- .../InventorymoveRequestDetailDO.java | 8 +-- .../dataobject/issueJob/IssueJobDetailDO.java | 8 +-- .../issueRecord/IssueRecordDetailDO.java | 8 +-- .../issueRequest/IssueRequestDetailDO.java | 8 +-- .../dal/dataobject/itembasic/ItembasicDO.java | 2 +- .../itempackaging/ItempackagingDO.java | 4 +- .../OfflinesettlementRecordDetailDO.java | 8 +-- .../OfflinesettlementRequestDetailDO.java | 8 +-- .../OnlinesettlementRecordDetailDO.java | 8 +-- .../OnlinesettlementRequestDetailDO.java | 8 +-- .../dataobject/packageMassage/PackageDO.java | 10 ++-- .../PackagemergeDetailDO.java | 8 +-- .../packageovermain/PackageoverDetailDO.java | 8 +-- .../PackagesplitDetailDO.java | 8 +-- .../dataobject/pickJob/PickJobDetailDO.java | 8 +-- .../pickRecord/PickRecordDetailDO.java | 8 +-- .../pickRequest/PickRequestDetailDO.java | 8 +-- .../PreparetoissueDetailDO.java | 2 +- .../ProductdismantleJobDetailDO.java | 8 +-- .../ProductdismantleRecordDetailaDO.java | 8 +-- .../ProductdismantleRecordDetailbDO.java | 8 +-- .../ProductdismantleRequestDetailaDO.java | 8 +-- .../ProductdismantleRequestDetailbDO.java | 8 +-- .../production/ProductionDetailDO.java | 2 +- .../ProductionlineitemDO.java | 2 +- .../ProductionreceiptJobDetailDO.java | 8 +-- .../ProductionreceiptRecordDetailDO.java | 8 +-- .../ProductionreturnJobDetailDO.java | 8 +-- .../ProductionreturnRecordDetailDO.java | 8 +-- .../ProductionreturnRequestDetailDO.java | 8 +-- .../ProductputawayJobDetailDO.java | 8 +-- .../ProductputawayRecordDetailDO.java | 8 +-- .../ProductputawayRequestDetailDO.java | 8 +-- .../ProductreceiptJobDetailDO.java | 8 +-- .../BackflushRecordDetailbDO.java | 8 +-- .../ProductreceiptRecordDetailDO.java | 8 +-- .../ProductreceiptRequestDetailDO.java | 8 +-- .../ConsumeRecordDetailbDO.java | 8 +-- .../ProductrepairRecordDetailDO.java | 8 +-- .../ProductrepairRequestDetailaDO.java | 8 +-- .../ProductrepairRequestDetailbDO.java | 8 +-- .../ProductscrapJobDetailDO.java | 8 +-- .../ProductscrapRecordDetailDO.java | 8 +-- .../RawscrapRecordDetailDO.java | 8 +-- .../ProductscrapRequestDetailDO.java | 8 +-- .../RawscrapRequestDetailDO.java | 8 +-- .../dataobject/purchase/PurchaseDetailDO.java | 2 +- .../purchasePlan/PurchasePlanDetailDO.java | 2 +- .../PurchaseclaimRecordDetailDO.java | 8 +-- .../PurchaseclaimRequestDetailDO.java | 8 +-- .../PurchasereceiptJobDetailDO.java | 8 +-- .../PurchasereceiptRecordDetailDO.java | 8 +-- .../PurchaseshortageDetailDO.java | 8 +-- .../PurchasereceiptRequestDetailDO.java | 8 +-- .../PurchasereturnJobDetailDO.java | 8 +-- .../PurchasereturnRecordDetailDO.java | 8 +-- .../PurchasereturnRequestDetailDO.java | 8 +-- .../putawayJob/PutawayJobDetailDO.java | 8 +-- .../putawayRecord/PutawayRecordDetailDO.java | 8 +-- .../PutawayRequestDetailDO.java | 8 +-- .../repleinshJob/RepleinshJobDetailDO.java | 8 +-- .../RepleinshRecordDetailDO.java | 8 +-- .../RepleinshRequestDetailDO.java | 8 +-- .../wms/dal/dataobject/sale/SaleDetailDO.java | 2 +- .../dataobject/scrapJob/ScrapJobDetailDO.java | 8 +-- .../scrapRecord/ScrapRecordDetailDO.java | 8 +-- .../scrapRequest/ScrapRequestDetailDO.java | 8 +-- .../SupplierdeliverRecordDetailDO.java | 8 +-- .../SupplierdeliverRequestDetailDO.java | 8 +-- .../SupplierinvoiceRecordDeatilDO.java | 8 +-- .../SupplierinvoiceRequestDetailDO.java | 2 +- .../supplieritem/SupplieritemDO.java | 2 +- .../TransferissueJobDetailDO.java | 8 +-- .../TransferissueRecordDetailDO.java | 8 +-- .../TransferissueRequestDetailDO.java | 8 +-- .../TransferreceiptJobDetailDO.java | 8 +-- .../TransferreceiptRecordDetailDO.java | 8 +-- .../TransferreceiptRequestDetailDO.java | 8 +-- .../UnplannedissueJobDetailDO.java | 8 +-- .../UnplannedissueRecordDetailDO.java | 8 +-- .../UnplannedissueRequestDetailDO.java | 8 +-- .../UnplannedreceiptJobDetailDO.java | 8 +-- .../UnplannedreceiptRecordDetailDO.java | 8 +-- .../UnplannedreceiptRequestDetailDO.java | 8 +-- .../wms/dal/dataobject/work/WorkDetailDO.java | 2 +- .../wms/dal/mysql/balance/BalanceMapper.java | 2 +- .../customeritem/CustomeritemMapper.java | 2 +- .../dal/mysql/itembasic/ItembasicMapper.java | 2 +- .../itempackaging/ItempackagingMapper.java | 2 +- .../supplieritem/SupplieritemMapper.java | 2 +- .../wms/service/balance/BalanceService.java | 8 +-- .../service/balance/BalanceServiceImpl.java | 6 +-- .../module/wms/service/bom/BomService.java | 4 +- .../countJob/CountJobMainServiceImpl.java | 2 +- .../countPlan/CountPlanMainServiceImpl.java | 4 +- .../CountRequestMainServiceImpl.java | 6 +-- .../customeritem/CustomeritemService.java | 30 +++++------ .../customeritem/CustomeritemServiceImpl.java | 2 +- .../CustomerreturnJobMainService.java | 4 +- ...ustomerreturnRequestDetailServiceImpl.java | 4 +- .../CustomerreturnRequestMainServiceImpl.java | 10 ++-- .../deliverJob/DeliverJobMainService.java | 4 +- .../DeliverPlanMainServiceImpl.java | 6 +-- .../DeliverRecordMainService.java | 2 +- .../DeliverRecordMainServiceImpl.java | 2 +- .../DeliverRequestDetailServiceImpl.java | 2 +- .../DeliverRequestMainServiceImpl.java | 8 +-- .../DemandforecastingMainServiceImpl.java | 12 ++--- .../service/enterprise/EnterpriseService.java | 2 +- .../service/expectout/ExpectoutService.java | 6 +-- ...InventorychangeRequestMainServiceImpl.java | 6 +-- .../InventorymoveRequestMainServiceImpl.java | 2 +- .../issueJob/IssueJobMainServiceImpl.java | 2 +- .../IssueRequestMainServiceImpl.java | 4 +- .../service/itembasic/ItembasicService.java | 40 +++++++------- .../itembasic/ItembasicServiceImpl.java | 4 +- .../itempackaging/ItempackagingService.java | 30 +++++------ .../ItempackagingServiceImpl.java | 2 +- .../service/location/LocationServiceImpl.java | 10 ++-- .../packageMassage/PackageServiceImpl.java | 2 +- .../PreparetoissueDetailServiceImpl.java | 4 +- .../PreparetoissueMainServiceImpl.java | 4 +- ...ProductdismantleRecordMainServiceImpl.java | 2 +- ...uctdismantleRequestDetailaServiceImpl.java | 6 +-- ...uctdismantleRequestDetailbServiceImpl.java | 4 +- ...roductdismantleRequestMainServiceImpl.java | 12 ++--- .../ProductionDetailServiceImpl.java | 6 +-- .../production/ProductionMainService.java | 2 +- .../production/ProductionMainServiceImpl.java | 18 +++---- .../ProductionlineitemService.java | 2 +- .../ProductionreceiptJobMainServiceImpl.java | 6 +-- ...ductionreturnRequestDetailServiceImpl.java | 6 +-- ...roductionreturnRequestMainServiceImpl.java | 6 +-- ...roductputawayRequestDetailServiceImpl.java | 2 +- .../ProductputawayRequestMainService.java | 4 +- .../ProductputawayRequestMainServiceImpl.java | 4 +- .../ProductreceiptJobMainService.java | 2 +- .../ProductreceiptRecordMainServiceImpl.java | 2 +- ...roductreceiptRequestDetailServiceImpl.java | 12 ++--- .../ProductreceiptRequestMainServiceImpl.java | 26 ++++----- ...roductrepairRequestDetailaServiceImpl.java | 6 +-- .../ProductrepairRequestMainServiceImpl.java | 4 +- .../ProductscrapRequestDetailServiceImpl.java | 4 +- .../RawscrapRequestDetailServiceImpl.java | 4 +- .../purchase/PurchaseDetailService.java | 2 +- .../purchase/PurchaseDetailServiceImpl.java | 6 +-- .../service/purchase/PurchaseMainService.java | 2 +- .../purchase/PurchaseMainServiceImpl.java | 12 ++--- .../PurchasePlanDetailServiceImpl.java | 2 +- .../purchasePlan/PurchasePlanMainService.java | 2 +- .../PurchasePlanMainServiceImpl.java | 6 +-- .../PurchasereceiptJobMainService.java | 2 +- .../PurchasereceiptJobMainServiceImpl.java | 4 +- .../PurchasereceiptRecordMainServiceImpl.java | 4 +- ...rchasereceiptRequestDetailServiceImpl.java | 4 +- ...PurchasereceiptRequestMainServiceImpl.java | 4 +- .../PurchasereturnJobMainServiceImpl.java | 2 +- ...urchasereturnRequestDetailServiceImpl.java | 2 +- .../RepleinshRequestDetailServiceImpl.java | 4 +- .../RepleinshRequestMainServiceImpl.java | 4 +- .../module/wms/service/rule/RuleService.java | 28 +++++----- .../wms/service/sale/SaleMainService.java | 2 +- .../wms/service/sale/SaleMainServiceImpl.java | 8 +-- .../service/saleprice/SalepriceService.java | 2 +- .../ScrapRequestMainServiceImpl.java | 2 +- .../SupplierdeliverRecordMainService.java | 2 +- .../SupplierdeliverRecordMainServiceImpl.java | 2 +- ...pplierdeliverRequestDetailServiceImpl.java | 4 +- ...SupplierdeliverRequestMainServiceImpl.java | 10 ++-- .../supplieritem/SupplieritemService.java | 32 +++++------ .../supplieritem/SupplieritemServiceImpl.java | 2 +- ...TransferissueRequestDetailServiceImpl.java | 2 +- .../TransferissueRequestMainServiceImpl.java | 4 +- ...ansferreceiptRequestDetailServiceImpl.java | 2 +- .../UnplannedissueRequestMainServiceImpl.java | 8 +-- .../wms/service/work/WorkMainServiceImpl.java | 12 ++--- .../com/win/module/wms/util/JobUtils.java | 28 +++++----- 883 files changed, 2910 insertions(+), 2910 deletions(-) diff --git a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java index 4e1be04868..d43daab581 100644 --- a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java +++ b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java @@ -7,7 +7,7 @@ package com.win.module.wms.enums; */ public interface DictTypeConstants { - String ITEM_STATUS = "item_status";// 物品状态 + String ITEM_STATUS = "item_status";// 物料状态 String UOM = "uom";// 计量单位 @@ -15,15 +15,15 @@ public interface DictTypeConstants { String ABC_CLASS = "abc_class";// ABC类 - String ITEM_TYPE = "item_type";// 物品类型 + String ITEM_TYPE = "item_type";// 物料类型 - String ITEM_CATEGORY = "Item_category";// 物品种类 + String ITEM_CATEGORY = "Item_category";// 物料种类 - String ITEM_GROUP = "item_group";// 物品分组 + String ITEM_GROUP = "item_group";// 物料分组 - String ITEM_COLOR = "item_color";// 物品颜色 + String ITEM_COLOR = "item_color";// 物料颜色 - String ITEM_CONFIGURATION = "item_configuration";// 物品配置 + String ITEM_CONFIGURATION = "item_configuration";// 物料配置 String EQ_LEVEL = "eq_level";// 质量等级 diff --git a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java index 0b762f9fc4..0b01f9d320 100644 --- a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java +++ b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java @@ -8,9 +8,9 @@ import com.win.framework.common.exception.ErrorCode; * system 系统，使用 1-002-000-000 段 */ public interface ErrorCodeConstants { - //物品基本信息ErrorCode - ErrorCode ITEMBASIC_NOT_EXISTS = new ErrorCode(1_000_020_000, "物品基本信息不存在"); - ErrorCode ITEMBASIC_CODE_NOT_EXISTS = new ErrorCode(1_000_020_001, "物品基本信息不正确"); + //物料基本信息ErrorCode + ErrorCode ITEMBASIC_NOT_EXISTS = new ErrorCode(1_000_020_000, "物料基本信息不存在"); + ErrorCode ITEMBASIC_CODE_NOT_EXISTS = new ErrorCode(1_000_020_001, "物料基本信息不正确"); ErrorCode ITEMBASIC_CODE_EXISTS = new ErrorCode(1_000_020_002, "代码已存在"); ErrorCode ITEMBASIC_STATUS_NOT_EXISTS = new ErrorCode(1_000_020_003, "状态不存在"); ErrorCode ITEMBASIC_UOM_NOT_EXISTS = new ErrorCode(1_000_020_004, "计量单位不存在"); @@ -24,19 +24,19 @@ public interface ErrorCodeConstants { ErrorCode ITEMBASIC_TYPE_NOT_EXISTS = new ErrorCode(1_000_020_012, "类型不存在"); ErrorCode ITEMBASIC_VALIDITY_DAYS_NOT_EXISTS = new ErrorCode(1_000_020_013, "有效天数不存在"); ErrorCode ITEMBASIC_AVAIABLE_NOT_EXISTS = new ErrorCode(1_000_020_014, "是否可用不存在"); - ErrorCode ITEMBASIC_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_020_015, "导入物品基础信息不能为空"); - ErrorCode ITEMBASIC_EXCEPTION = new ErrorCode(1_000_020_016, "物品基础信息错误:【{}】"); + ErrorCode ITEMBASIC_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_020_015, "导入物料基础信息不能为空"); + ErrorCode ITEMBASIC_EXCEPTION = new ErrorCode(1_000_020_016, "物料基础信息错误:【{}】"); ErrorCode ITEMBASIC_UOM_EXCEPTION = new ErrorCode(1_000_020_017, "计量单位【{}】错误，应该是【{}】"); - //物品包装信息ErrorCode - ErrorCode ITEMPACKAGING_NOT_EXISTS = new ErrorCode(1_000_021_000, "物品包装信息 不存在"); + //物料包装信息ErrorCode + ErrorCode ITEMPACKAGING_NOT_EXISTS = new ErrorCode(1_000_021_000, "物料包装信息 不存在"); ErrorCode ITEMPACKAGING_ITEM_CODE_NOT_EXISTS = new ErrorCode(1_000_021_001, "代码不存在"); ErrorCode ITEMPACKAGING_ITEM_CODE_EXISTS = new ErrorCode(1_000_021_002, "代码已存在"); ErrorCode ITEMPACKAGING_UOM_NOT_EXISTS = new ErrorCode(1_000_021_003, "计量单位不存在"); ErrorCode ITEMPACKAGING_STD_PACK_UNIT_NOT_EXISTS = new ErrorCode(1_000_021_004, "包装单位不存在"); ErrorCode ITEMPACKAGING_STD_PACK_QTY_NOT_EXISTS = new ErrorCode(1_000_021_005, "包装数量不存在"); ErrorCode ITEMPACKAGING_AVAILABLE_NOT_EXISTS = new ErrorCode(1_000_021_006, "是否可用不存在"); - ErrorCode ITEMPACKAGING_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_021_007, "导入物品包装信息不能为空"); - ErrorCode ITEMPACKAGING_NULL = new ErrorCode(1_000_021_008, "物品包装信息无效"); + ErrorCode ITEMPACKAGING_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_021_007, "导入物料包装信息不能为空"); + ErrorCode ITEMPACKAGING_NULL = new ErrorCode(1_000_021_008, "物料包装信息无效"); //物料清单ErrorCode ErrorCode BOM_NOT_EXISTS = new ErrorCode(1_000_022_000, "物料清单不存在"); ErrorCode BOM_PRODUCT_ITEM_CODE_NOT_EXISTS = new ErrorCode(1_000_022_001, "父物料代码不存在"); @@ -62,11 +62,11 @@ public interface ErrorCodeConstants { ErrorCode PRODUCTIONLINEITEM_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_024_001, "导入生产线物料关系不能为空"); ErrorCode PRODUCTIONLINEITEM_FGLOCATION_CODE_NOT_EXISTS = new ErrorCode(1_000_024_002, "完工收货库位不存在"); ErrorCode PRODUCTIONLINEITEM_PRODUCT_LINE_COED_NOT_EXISTS = new ErrorCode(1_000_024_003, "产线代码不存在"); - ErrorCode PRODUCTIONLINEITEM_ITEM_CODE_NOT_EXISTS = new ErrorCode(1_000_024_004, "物品代码不存在"); + ErrorCode PRODUCTIONLINEITEM_ITEM_CODE_NOT_EXISTS = new ErrorCode(1_000_024_004, "物料代码不存在"); ErrorCode PRODUCTIONLINEITEM_AVAILABLE_NOT_EXISTS = new ErrorCode(1_000_024_005, "是否可用不存在"); ErrorCode PRODUCTIONLINEITEM_NOT_EXIST = new ErrorCode(1_000_024_006, "生产线物料关系不存在【{}】"); ErrorCode PRODUCTIONLINEITEM_PRODUCT_LINE_COED_IS_EMPTY = new ErrorCode(1_000_024_007, "产线代码不能为空"); - ErrorCode PRODUCTIONLINEITEM_ITEM_CODE_IS_EMPTY = new ErrorCode(1_000_024_008, "物品代码不能为空"); + ErrorCode PRODUCTIONLINEITEM_ITEM_CODE_IS_EMPTY = new ErrorCode(1_000_024_008, "物料代码不能为空"); //采购价格单ErrorCode ErrorCode SUPPLIERPRICE_NOT_EXISTS = new ErrorCode(1_023_000_000, "采购价格单不存在"); ErrorCode SUPPLIER_NOT_EXISTS = new ErrorCode(1_000_025_000, "供应商不存在"); @@ -75,14 +75,14 @@ public interface ErrorCodeConstants { ErrorCode SUPPLIER_AVAILABLE_NOT_EXISTS = new ErrorCode(1_000_025_003, "是否可用不存在"); ErrorCode SUPPLIER_SHORTNAME_NOT_EXISTS = new ErrorCode(1_000_025_004, "简称不存在"); ErrorCode SUPPLIER_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_025_005, "导入供货商不能为空"); - //供应商物品ErrorCode - ErrorCode SUPPLIERITEM_NOT_EXISTS = new ErrorCode(1_000_026_000, "供应商物品不存在"); + //供应商物料ErrorCode + ErrorCode SUPPLIERITEM_NOT_EXISTS = new ErrorCode(1_000_026_000, "供应商物料不存在"); ErrorCode SUPPLIERITEM_SUPPLIER_CODE_NOT_EXISTS = new ErrorCode(1_000_026_001, "供应商代码不存在"); ErrorCode SUPPLIERITEM_ITEM_CODE_NOT_EXISTS = new ErrorCode(1_000_026_002, "物料代码不存在"); ErrorCode SUPPLIERITEM_PACK_UNIT_NOT_EXISTS = new ErrorCode(1_000_026_003, "供应商包装单位不存在"); ErrorCode SUPPLIERITEM_PACK_QTY_NOT_EXISTS = new ErrorCode(1_000_026_004, "供应商包装数量不存在"); ErrorCode SUPPLIERITEM_AVAILABLE_NOT_EXISTS = new ErrorCode(1_000_026_005, "是否可用不存在"); - ErrorCode SUPPLIERITEM_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_026_006, "导入供应商物品不能为空"); + ErrorCode SUPPLIERITEM_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_026_006, "导入供应商物料不能为空"); ErrorCode SUPPLIERITEM_ITEM_CODE_EXISTS = new ErrorCode(1_000_026_007, "物料代码已存在"); ErrorCode SUPPLIERITEM_PACK_QTY_OF_CONTAINER_NOT_EXISTS = new ErrorCode(1_000_026_008, "供应商每器具包装数量不存在"); //采购价格单ErrorCode @@ -109,8 +109,8 @@ public interface ErrorCodeConstants { ErrorCode CUSTOMERDOCK_DEFAULT_LOCATION_CODE_NOT_EXISTS = new ErrorCode(1_000_029_004, "默认库位不存在"); ErrorCode CUSTOMERDOCK_AVAILABLE_NOT_EXISTS = new ErrorCode(1_000_029_005, "是否可用不存在"); ErrorCode CUSTOMERDOCK_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_029_006, "导入客户月台不能为空"); - //客户物品ErrorCode - ErrorCode CUSTOMERITEM_NOT_EXISTS = new ErrorCode(1_000_030_000, "客户物品不存在"); + //客户物料ErrorCode + ErrorCode CUSTOMERITEM_NOT_EXISTS = new ErrorCode(1_000_030_000, "客户物料不存在"); ErrorCode CUSTOMERITEM_AVAILABLE_NOT_EXISTS = new ErrorCode(1_000_030_001, "是否可用不存在"); ErrorCode CUSTOMERITEM_ITEM_CODE_NOT_EXISTS = new ErrorCode(1_000_030_002, "物料代码不存在"); ErrorCode CUSTOMERITEM_ITEM_CODE_EXISTS = new ErrorCode(1_000_030_003, "物料代码已存在"); @@ -118,7 +118,7 @@ public interface ErrorCodeConstants { ErrorCode CUSTOMERITEM_PACKUNIT_NOT_EXISTS = new ErrorCode(1_000_030_005, "客户包装单位不存在"); ErrorCode CUSTOMERITEM_PACKQTY_NOT_EXISTS = new ErrorCode(1_000_030_006, "客户包装量不存在"); ErrorCode CUSTOMERITEM_PACKQTY_OF_CONTAINER_NOT_EXISTS = new ErrorCode(1_000_030_007, "每器具包装数不存在"); - ErrorCode CUSTOMERITEM_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_030_008, "导入客户物品不能为空"); + ErrorCode CUSTOMERITEM_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_030_008, "导入客户物料不能为空"); //项目ErrorCode ErrorCode PROJECT_NOT_EXISTS = new ErrorCode(1_000_031_000, "项目不存在"); ErrorCode PROJECT_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_000_031_001, "导入项目不能为空"); @@ -274,8 +274,8 @@ public interface ErrorCodeConstants { ErrorCode BUSINESSTYPE_CODE_NOT_EXISTS = new ErrorCode(1_050_000_001, "代码不存在"); ErrorCode BUSINESSTYPE_CODE_EXISTS = new ErrorCode(1_050_000_002, "代码已存在"); ErrorCode BUSINESSTYPE_NAME_NOT_EXISTS = new ErrorCode(1_050_000_003, "名称不存在"); - ErrorCode BUSINESSTYPE_ITEM_TYPES_NOT_EXISTS = new ErrorCode(1_050_000_004, "可用物品类型范围不存在"); - ErrorCode BUSINESSTYPE_ITEM_STATUSES_ITEM_CODE_NOT_EXISTS = new ErrorCode(1_050_000_005, "可用物品状态范围不存在"); + ErrorCode BUSINESSTYPE_ITEM_TYPES_NOT_EXISTS = new ErrorCode(1_050_000_004, "可用物料类型范围不存在"); + ErrorCode BUSINESSTYPE_ITEM_STATUSES_ITEM_CODE_NOT_EXISTS = new ErrorCode(1_050_000_005, "可用物料状态范围不存在"); ErrorCode BUSINESSTYPE_OUT_TRANSACTION_TYPE_NOT_EXISTS = new ErrorCode(1_050_000_006, "出库事务类型不存在"); ErrorCode BUSINESSTYPE_IN_TRANSACTION_TYPE_NOT_EXISTS = new ErrorCode(1_050_000_007, "入库事务类型不存在"); ErrorCode BUSINESSTYPE_USE_ON_THE_WAY__NOT_EXISTS = new ErrorCode(1_050_000_007, "是否使用在途库不存在"); @@ -395,7 +395,7 @@ public interface ErrorCodeConstants { ErrorCode PURCHASE_DETAIL_NOT_EXISTS = new ErrorCode(1_000_063_001, "采购订单子不存在"); ErrorCode PURCHASE_DETAIL_ARGUMENT_NOT_EXISTS = new ErrorCode(1_000_063_002, "采购订单明细：订单号ppo_number、订单行pline_number、零件号pitem_code无效"); ErrorCode PURCHASE_DETAIL_NUMBER_NOT_EXISTS = new ErrorCode(1_000_063_003, "采购订单【{}】无效"); - ErrorCode PURCHASE_DETAIL_ITEMCODE_EXISTS = new ErrorCode(1_000_063_004, "采购订单物品编码【{}】已经存在"); + ErrorCode PURCHASE_DETAIL_ITEMCODE_EXISTS = new ErrorCode(1_000_063_004, "采购订单物料编码【{}】已经存在"); ErrorCode PURCHASE_DETAIL_LINENUMBER_EXISTS = new ErrorCode(1_000_063_005, "行号已经存在"); //采购索赔申请主ErrorCode @@ -912,7 +912,7 @@ public interface ErrorCodeConstants { //调拨出库申请ErrorCode ErrorCode TRANSFERISSUE_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_136_000, "调拨出库申请主不存在"); ErrorCode TRANSFERISSUE_REQUEST_DETAIL_NOT_EXISTS = new ErrorCode(1_000_136_001, "调拨出库申请子不存在"); - ErrorCode TRANSFERISSUE_REQUEST_DETAIL_ITEM_NOT_EXISTS = new ErrorCode(1_000_136_002, "物品【{}】无效"); + ErrorCode TRANSFERISSUE_REQUEST_DETAIL_ITEM_NOT_EXISTS = new ErrorCode(1_000_136_002, "物料【{}】无效"); ErrorCode TRANSFERISSUE_REQUEST_DETAIL_LOCALTIONCODE_NOT_EXISTS = new ErrorCode(1_000_136_003, "库位【{}】无效"); ErrorCode TRANSFERISSUE_REQUEST_CANNOT_CLOSE = new ErrorCode(1_000_136_004, "调拨出库申请状态不支持关闭"); ErrorCode TRANSFERISSUE_REQUEST_CANNOT_RE_ADD = new ErrorCode(1_000_136_005, "调拨出库申请状态不支持关闭"); @@ -935,7 +935,7 @@ public interface ErrorCodeConstants { ErrorCode TRANSFERRECEIPT_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_140_000, "调拨入库申请主不存在"); ErrorCode TRANSFERRECEIPT_REQUEST_DETAIL_NOT_EXISTS = new ErrorCode(1_000_140_001, "调拨入库申请子不存在"); ErrorCode TRANSFERRECEIPT_REQUEST_DETAIL_LOCALTIONCODE_NOT_EXISTS = new ErrorCode(1_000_140_002, "库位【{}】无效"); - ErrorCode TRANSFERRECEIPT_REQUEST_DETAIL_ITEM_NOT_EXISTS = new ErrorCode(1_000_140_003, "物品【{}】无效"); + ErrorCode TRANSFERRECEIPT_REQUEST_DETAIL_ITEM_NOT_EXISTS = new ErrorCode(1_000_140_003, "物料【{}】无效"); ErrorCode TRANSFERRECEIPT_REQUEST_CANNOT_RE_ADD = new ErrorCode(1_000_140_004, "调拨入库申请状态不支持关闭"); ErrorCode TRANSFERRECEIPT_REQUEST_CANNOT_CLOSE = new ErrorCode(1_000_140_005, "调拨入库申请状态不支持关闭"); ErrorCode TRANSFERRECEIPT_REQUEST_CANNOT_SUBMIT = new ErrorCode(1_000_140_006, "调拨入库申请状态不支持提交"); @@ -1001,7 +1001,7 @@ public interface ErrorCodeConstants { ErrorCode SCRAP_REQUEST_DETAIL_NOT_EXISTS = new ErrorCode(1_000_149_001, "报废出库申请子不存在"); ErrorCode SCRAP_REQUEST_LOCATIONCODE_INVALID = new ErrorCode(1_000_149_002, "库位【location_code】无效"); ErrorCode SCRAP_REQUEST_WAREHOSECODE_VALIDATE = new ErrorCode(1_000_149_003, "仓库【from_warehouse_code】与库位【from_location_code】关系错误"); - ErrorCode SCRAP_REQUEST_ITEMCODE_INVALID = new ErrorCode(1_000_149_004, "物品【item_code】无效"); + ErrorCode SCRAP_REQUEST_ITEMCODE_INVALID = new ErrorCode(1_000_149_004, "物料【item_code】无效"); ErrorCode SCRAP_REQUEST_CANNOT_CLOSE = new ErrorCode(1_000_149_005, "报废出库申请状态不支持关闭"); ErrorCode SCRAP_REQUEST_CANNOT_RE_ADD = new ErrorCode(1_000_149_006, "报废出库申请状态不支持关闭"); ErrorCode SCRAP_REQUEST_CANNOT_SUBMIT = new ErrorCode(1_000_149_007, "报废出库申请状态不支持提交"); @@ -1081,11 +1081,11 @@ public interface ErrorCodeConstants { ErrorCode EXPECTIN_NOT_EXISTS = new ErrorCode(1_000_162_000, "预计入库存不存在"); //库存余额ErrorCode ErrorCode BALANCE_NOT_EXISTS = new ErrorCode(1_000_163_000, "库存余额不存在"); - ErrorCode BALANCE_ITEM_NOT_EXISTS = new ErrorCode(1_000_163_001, "查询库存余额 物品不能为空"); + ErrorCode BALANCE_ITEM_NOT_EXISTS = new ErrorCode(1_000_163_001, "查询库存余额 物料不能为空"); ErrorCode BALANCE_STATU_NOT_EXISTS = new ErrorCode(1_000_163_002, "查询库存余额 库存状态不能为空"); ErrorCode BALANCE_QTY_NOT_EXISTS = new ErrorCode(1_000_163_003, "查询库存余额 数量不能为空"); ErrorCode BALANCE_FROZEN = new ErrorCode(1_000_163_003, "库存余额已经被冻结"); - ErrorCode BALANCE_NOT_ERROR = new ErrorCode(1_000_163_004, "物品:【{}】 库存余额不足"); + ErrorCode BALANCE_NOT_ERROR = new ErrorCode(1_000_163_004, "物料:【{}】 库存余额不足"); //库存事务ErrorCode ErrorCode TRANSACTION_NOT_EXISTS = new ErrorCode(1_000_164_000, "库存事务不存在"); @@ -1149,7 +1149,7 @@ public interface ErrorCodeConstants { ErrorCode UOM_ERRORR = new ErrorCode(1_000_300_001, "计量单位【{}】错误，应该是【{}】"); - ErrorCode QTY_ERROR = new ErrorCode(1_000_301_000, "发货数量【{}】大于订单号【{}】、订单行【{}】、物品代码【{}】的未发货数量【{}】"); + ErrorCode QTY_ERROR = new ErrorCode(1_000_301_000, "发货数量【{}】大于订单号【{}】、订单行【{}】、物料代码【{}】的未发货数量【{}】"); ErrorCode QTY_ERRORR = new ErrorCode(1_000_301_001, "上架数量【{}】不能大于库存数量【{}】"); @@ -1163,7 +1163,7 @@ public interface ErrorCodeConstants { ErrorCode BACKFLUSH_REQUEST_DETAILB_NOT_EXISTS = new ErrorCode(1_000_304_001, "制品收货申请二子表不存在"); - ErrorCode ENABLE_BUG = new ErrorCode(1_000_303_001, "物品代码【{}】, 不可采购 ！"); + ErrorCode ENABLE_BUG = new ErrorCode(1_000_303_001, "物料代码【{}】, 不可采购 ！"); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRequest/vo/BackflushRequestDetailbBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRequest/vo/BackflushRequestDetailbBaseVO.java index 46aeb6ef02..399e2e88b1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRequest/vo/BackflushRequestDetailbBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRequest/vo/BackflushRequestDetailbBaseVO.java @@ -26,8 +26,8 @@ public class BackflushRequestDetailbBaseVO { @Schema(description = "BOM版本") private String bomVersion; - @Schema(description = "物品代码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "物品代码不能为空") + @Schema(description = "物料代码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "物料代码不能为空") private String itemCode; @Schema(description = "单据号") @@ -41,13 +41,13 @@ public class BackflushRequestDetailbBaseVO { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime createTime; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRequest/vo/BackflushRequestDetailbExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRequest/vo/BackflushRequestDetailbExcelVO.java index b31a309365..5487a70911 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRequest/vo/BackflushRequestDetailbExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRequest/vo/BackflushRequestDetailbExcelVO.java @@ -26,7 +26,7 @@ public class BackflushRequestDetailbExcelVO { @ExcelProperty("BOM版本") private String bomVersion; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("单据号") @@ -38,13 +38,13 @@ public class BackflushRequestDetailbExcelVO { @ExcelProperty("创建时间") private LocalDateTime createTime; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRequest/vo/BackflushRequestDetailbExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRequest/vo/BackflushRequestDetailbExportReqVO.java index b037080d5d..e77ad15764 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRequest/vo/BackflushRequestDetailbExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRequest/vo/BackflushRequestDetailbExportReqVO.java @@ -21,7 +21,7 @@ public class BackflushRequestDetailbExportReqVO { @Schema(description = "BOM版本") private String bomVersion; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "单据号") @@ -34,13 +34,13 @@ public class BackflushRequestDetailbExportReqVO { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRequest/vo/BackflushRequestDetailbPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRequest/vo/BackflushRequestDetailbPageReqVO.java index 2e3e328399..58a27ac59a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRequest/vo/BackflushRequestDetailbPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRequest/vo/BackflushRequestDetailbPageReqVO.java @@ -23,7 +23,7 @@ public class BackflushRequestDetailbPageReqVO extends PageParam { @Schema(description = "BOM版本") private String bomVersion; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "单据号") @@ -36,13 +36,13 @@ public class BackflushRequestDetailbPageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/bom/BomController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/bom/BomController.java index 1e25060d4f..e7286f9977 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/bom/BomController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/bom/BomController.java @@ -117,7 +117,7 @@ public class BomController { List list = bomService.getBomList(exportReqVO); Map mapDropDown = new HashMap<>(); List resultList = this.getExcelVo(list, mapDropDown); - ExcelUtils.write(response, "物品基本信息.xlsx", "数据", BomExcelVO.class, resultList, mapDropDown); + ExcelUtils.write(response, "物料基本信息.xlsx", "数据", BomExcelVO.class, resultList, mapDropDown); } @PostMapping("/export-excel-senior") @Operation(summary = "导出物料清单 Excel") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/BusinesstypeController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/BusinesstypeController.java index 7d57fbe461..b9888031a5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/BusinesstypeController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/BusinesstypeController.java @@ -104,7 +104,7 @@ public class BusinesstypeController { } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:businesstype:query')") public CommonResult> getBusinesstypeSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = businesstypeService.getBusinesstypeSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/vo/BusinesstypeBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/vo/BusinesstypeBaseVO.java index 8e4640d4c9..294f78b33d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/vo/BusinesstypeBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/vo/BusinesstypeBaseVO.java @@ -30,12 +30,12 @@ public class BusinesstypeBaseVO { @Schema(description = "描述") private String description; - @Schema(description = "可用物品类型范围", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "可用物品类型范围不能为空") + @Schema(description = "可用物料类型范围", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "可用物料类型范围不能为空") private String itemTypes; - @Schema(description = "可用物品状态范围", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "可用物品状态范围不能为空") + @Schema(description = "可用物料状态范围", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "可用物料状态范围不能为空") private String itemStatuses; @Schema(description = "出库库位类型范围") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/vo/BusinesstypeExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/vo/BusinesstypeExcelVO.java index 66a63a22ce..c3ce576155 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/vo/BusinesstypeExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/vo/BusinesstypeExcelVO.java @@ -31,11 +31,11 @@ public class BusinesstypeExcelVO { @ExcelProperty("描述") private String description; - @ExcelProperty(value = "可用物品类型范围", converter = DictConvert.class) + @ExcelProperty(value = "可用物料类型范围", converter = DictConvert.class) @DictFormat("item_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String itemTypes; - @ExcelProperty(value = "可用物品状态范围", converter = DictConvert.class) + @ExcelProperty(value = "可用物料状态范围", converter = DictConvert.class) @DictFormat("item_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String itemStatuses; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/vo/BusinesstypeExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/vo/BusinesstypeExportReqVO.java index f99379f892..49c6b261e3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/vo/BusinesstypeExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/vo/BusinesstypeExportReqVO.java @@ -22,10 +22,10 @@ public class BusinesstypeExportReqVO { @Schema(description = "描述") private String description; - @Schema(description = "可用物品类型范围") + @Schema(description = "可用物料类型范围") private String itemTypes; - @Schema(description = "可用物品状态范围") + @Schema(description = "可用物料状态范围") private String itemStatuses; @Schema(description = "出库库位类型范围") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/vo/BusinesstypeImportExcelVo.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/vo/BusinesstypeImportExcelVo.java index c1fff08850..9d65dc26c5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/vo/BusinesstypeImportExcelVo.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/vo/BusinesstypeImportExcelVo.java @@ -23,11 +23,11 @@ public class BusinesstypeImportExcelVo { @ExcelProperty("名称") private String name; - @ExcelProperty(value = "可用物品类型范围", converter = DictConvert.class) + @ExcelProperty(value = "可用物料类型范围", converter = DictConvert.class) @DictFormat(DictTypeConstants.ITEM_TYPE) private String itemTypes; - @ExcelProperty(value = "可用物品状态范围", converter = DictConvert.class) + @ExcelProperty(value = "可用物料状态范围", converter = DictConvert.class) @DictFormat(DictTypeConstants.ITEM_STATUS) private String itemStatuses; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/vo/BusinesstypePageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/vo/BusinesstypePageReqVO.java index a1e3f9f918..6a39f17972 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/vo/BusinesstypePageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/vo/BusinesstypePageReqVO.java @@ -24,10 +24,10 @@ public class BusinesstypePageReqVO extends PageParam { @Schema(description = "描述") private String description; - @Schema(description = "可用物品类型范围") + @Schema(description = "可用物料类型范围") private String itemTypes; - @Schema(description = "可用物品状态范围") + @Schema(description = "可用物料状态范围") private String itemStatuses; @Schema(description = "出库库位类型范围") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/CarrierController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/CarrierController.java index b3b02b4bdb..04df7ad386 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/CarrierController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/CarrierController.java @@ -100,7 +100,7 @@ public class CarrierController { return success(result); } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:carrier:query')") public CommonResult> getCarrierSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = carrierService.getCarrierSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobDetailBaseVO.java index d9f2a21c11..1114d2381a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobDetailBaseVO.java @@ -38,16 +38,16 @@ public class CountJobDetailBaseVO { @Schema(description = "库存状态") private String inventoryStatus; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobDetailExcelVO.java index 81c679054a..101d8a1072 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobDetailExcelVO.java @@ -38,16 +38,16 @@ public class CountJobDetailExcelVO { @DictFormat("inventory_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String inventoryStatus; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobDetailExportReqVO.java index a3dba0269b..01a838b1d4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobDetailExportReqVO.java @@ -33,16 +33,16 @@ public class CountJobDetailExportReqVO { @Schema(description = "库存状态") private String inventoryStatus; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobDetailPageReqVO.java index 5b57cb8e2c..232a01b745 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobDetailPageReqVO.java @@ -36,16 +36,16 @@ public class CountJobDetailPageReqVO extends PageParam { @Schema(description = "库存状态") private String inventoryStatus; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainExcelVO.java index 15179e6780..22968509d9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainExcelVO.java @@ -145,16 +145,16 @@ public class CountJobMainExcelVO { @DictFormat(DictTypeConstants.INVENTORY_STATUS) private String inventoryStatus; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainBaseVO.java index dc1271ed85..dc86f03265 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainBaseVO.java @@ -31,7 +31,7 @@ public class CountPlanMainBaseVO { @Schema(description = "限值") private BigDecimal limitedValue; - @Schema(description = "物品忽略名单") + @Schema(description = "物料忽略名单") private String ignoreListOfItem; @Schema(description = "库位忽略名单") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainExcelVO.java index fbb73cf9a9..894aacf0c2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainExcelVO.java @@ -33,7 +33,7 @@ public class CountPlanMainExcelVO { @ExcelProperty("限值") private BigDecimal limitedValue; - @ExcelProperty("物品忽略名单") + @ExcelProperty("物料忽略名单") private String ignoreListOfItem; @ExcelProperty("库位忽略名单") @@ -78,7 +78,7 @@ public class CountPlanMainExcelVO { @ExcelProperty("盘点范围值") private String value; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("计划数量") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainExportReqVO.java index 3dba4656b0..c571c20c76 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainExportReqVO.java @@ -27,7 +27,7 @@ public class CountPlanMainExportReqVO { @Schema(description = "限值") private BigDecimal limitedValue; - @Schema(description = "物品忽略名单") + @Schema(description = "物料忽略名单") private String ignoreListOfItem; @Schema(description = "库位忽略名单") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainPageReqVO.java index 65ffa48abc..66c7e9c6d7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainPageReqVO.java @@ -29,7 +29,7 @@ public class CountPlanMainPageReqVO extends PageParam { @Schema(description = "限值") private BigDecimal limitedValue; - @Schema(description = "物品忽略名单") + @Schema(description = "物料忽略名单") private String ignoreListOfItem; @Schema(description = "库位忽略名单") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailBaseVO.java index 425bdc6b2c..16b4ea8999 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailBaseVO.java @@ -59,13 +59,13 @@ public class CountRecordDetailBaseVO { @Schema(description = "盘点描述") private String countDescription; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -86,7 +86,7 @@ public class CountRecordDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailExcelVO.java index 4fde13edff..31054d6a54 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailExcelVO.java @@ -62,13 +62,13 @@ public class CountRecordDetailExcelVO { @ExcelProperty("盘点描述") private String countDescription; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") @@ -91,7 +91,7 @@ public class CountRecordDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailExportReqVO.java index 1a09c509ef..1ad4c7d2b7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailExportReqVO.java @@ -53,13 +53,13 @@ public class CountRecordDetailExportReqVO { @Schema(description = "盘点描述") private String countDescription; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -80,7 +80,7 @@ public class CountRecordDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailPageReqVO.java index fb0c8c8fed..fbd9c6eca4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailPageReqVO.java @@ -58,13 +58,13 @@ public class CountRecordDetailPageReqVO extends PageParam { @Schema(description = "盘点描述") private String countDescription; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -85,7 +85,7 @@ public class CountRecordDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordMainExcelVO.java index a1c332ff0e..0e39ec86a7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordMainExcelVO.java @@ -119,13 +119,13 @@ public class CountRecordMainExcelVO { @ExcelProperty("盘点描述") private String countDescription; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") @@ -138,7 +138,7 @@ public class CountRecordMainExcelVO { @DictFormat(DictTypeConstants.UOM) private String uom; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("子备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailBaseVO.java index 0cfa0c394f..511016831f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailBaseVO.java @@ -47,13 +47,13 @@ public class CountRequestDetailBaseVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -72,7 +72,7 @@ public class CountRequestDetailBaseVO { @Schema(description = "最后更新者用户名") private String updater; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "从包装号") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailExcelVO.java index 28895740b3..641d42c3ad 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailExcelVO.java @@ -48,13 +48,13 @@ public class CountRequestDetailExcelVO { @ExcelProperty("创建者用户名") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") @@ -73,7 +73,7 @@ public class CountRequestDetailExcelVO { @ExcelProperty("最后更新者用户名") private String updater; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("从包装号") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailExportReqVO.java index 5cd7dcc4dd..a0a8076adb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailExportReqVO.java @@ -43,13 +43,13 @@ public class CountRequestDetailExportReqVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -68,7 +68,7 @@ public class CountRequestDetailExportReqVO { @Schema(description = "最后更新者用户名") private String updater; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "从包装号") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailPageReqVO.java index 5cd4377c5a..ec97a1bb55 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailPageReqVO.java @@ -46,13 +46,13 @@ public class CountRequestDetailPageReqVO extends PageParam { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -71,7 +71,7 @@ public class CountRequestDetailPageReqVO extends PageParam { @Schema(description = "最后更新者用户名") private String updater; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "从包装号") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainExcelVO.java index 04b32b34da..addbac7739 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainExcelVO.java @@ -82,13 +82,13 @@ public class CountRequestMainExcelVO { @DictFormat(DictTypeConstants.INVENTORY_STATUS) private String inventoryStatus; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") @@ -101,7 +101,7 @@ public class CountRequestMainExcelVO { @DictFormat(DictTypeConstants.UOM) private String uom; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("从包装号") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainImportVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainImportVO.java index 2b9d80b00a..1f3eec38d4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainImportVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainImportVO.java @@ -29,7 +29,7 @@ public class CountRequestMainImportVO { private String warehouseCode; //子表数据 - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("包装号") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordDetailBaseVO.java index 33186cd4d6..86c35c5ea6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordDetailBaseVO.java @@ -49,13 +49,13 @@ public class CountadjustRecordDetailBaseVO { @Schema(description = "调整数量") private BigDecimal adjustQty; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -79,7 +79,7 @@ public class CountadjustRecordDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordDetailExcelVO.java index 769b1cd071..d0783fa519 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordDetailExcelVO.java @@ -48,13 +48,13 @@ public class CountadjustRecordDetailExcelVO { @ExcelProperty("调整数量") private BigDecimal adjustQty; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") @@ -80,7 +80,7 @@ public class CountadjustRecordDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordDetailExportReqVO.java index 59b54ed579..07584490a9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordDetailExportReqVO.java @@ -43,13 +43,13 @@ public class CountadjustRecordDetailExportReqVO { @Schema(description = "调整数量") private BigDecimal adjustQty; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -70,7 +70,7 @@ public class CountadjustRecordDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordDetailPageReqVO.java index f0cb540321..6d9ad8982d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordDetailPageReqVO.java @@ -48,13 +48,13 @@ public class CountadjustRecordDetailPageReqVO extends PageParam { @Schema(description = "调整数量") private BigDecimal adjustQty; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -75,7 +75,7 @@ public class CountadjustRecordDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordMainExcelVO.java index 05b089f61f..2945069187 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/vo/CountadjustRecordMainExcelVO.java @@ -98,13 +98,13 @@ public class CountadjustRecordMainExcelVO { @ExcelProperty("调整数量") private BigDecimal adjustQty; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") @@ -117,7 +117,7 @@ public class CountadjustRecordMainExcelVO { @DictFormat(DictTypeConstants.UOM) private String uom; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("创建时间") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestDetailBaseVO.java index f20a7b78de..341587a912 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestDetailBaseVO.java @@ -71,13 +71,13 @@ public class CountadjustRequestDetailBaseVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -96,7 +96,7 @@ public class CountadjustRequestDetailBaseVO { @Schema(description = "最后更新者用户名") private String updater; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "乐观锁") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestDetailExcelVO.java index fc7e95e954..5562035677 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestDetailExcelVO.java @@ -60,13 +60,13 @@ public class CountadjustRequestDetailExcelVO { @ExcelProperty("创建者用户名") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itelDesc2; @ExcelProperty("项目代码") @@ -85,7 +85,7 @@ public class CountadjustRequestDetailExcelVO { @ExcelProperty("最后更新者用户名") private String updater; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestDetailExportReqVO.java index dc61fd9247..3d5e705fcb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestDetailExportReqVO.java @@ -56,13 +56,13 @@ public class CountadjustRequestDetailExportReqVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -81,7 +81,7 @@ public class CountadjustRequestDetailExportReqVO { @Schema(description = "最后更新者用户名") private String updater; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "主表ID") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestDetailPageReqVO.java index 731b745686..e8d4a596c8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestDetailPageReqVO.java @@ -61,13 +61,13 @@ public class CountadjustRequestDetailPageReqVO extends PageParam { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -86,7 +86,7 @@ public class CountadjustRequestDetailPageReqVO extends PageParam { @Schema(description = "最后更新者用户名") private String updater; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "主表ID") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestMainExcelVO.java index 12f2776afc..5dead4aa51 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestMainExcelVO.java @@ -88,13 +88,13 @@ public class CountadjustRequestMainExcelVO { @ExcelProperty("调整数量") private BigDecimal adjustQty; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itelDesc2; @ExcelProperty("项目代码") @@ -107,7 +107,7 @@ public class CountadjustRequestMainExcelVO { @DictFormat(DictTypeConstants.UOM) private String uom; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("创建时间") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/CustomeritemController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/CustomeritemController.java index 157b1232aa..0fdaf161bc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/CustomeritemController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/CustomeritemController.java @@ -33,7 +33,7 @@ import java.util.*; import static com.win.framework.common.pojo.CommonResult.success; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; -@Tag(name = "管理后台 - 客户物品") +@Tag(name = "管理后台 - 客户物料") @RestController @RequestMapping("/wms/customeritem") @Validated @@ -46,14 +46,14 @@ public class CustomeritemController { private AdminUserApi userApi; @PostMapping("/create") - @Operation(summary = "创建客户物品") + @Operation(summary = "创建客户物料") @PreAuthorize("@ss.hasPermission('wms:customeritem:create')") public CommonResult createCustomeritem(@Valid @RequestBody CustomeritemCreateReqVO createReqVO) { return success(customeritemService.createCustomeritem(createReqVO)); } @PutMapping("/update") - @Operation(summary = "更新客户物品") + @Operation(summary = "更新客户物料") @PreAuthorize("@ss.hasPermission('wms:customeritem:update')") public CommonResult updateCustomeritem(@Valid @RequestBody CustomeritemUpdateReqVO updateReqVO) { customeritemService.updateCustomeritem(updateReqVO); @@ -61,7 +61,7 @@ public class CustomeritemController { } @DeleteMapping("/delete") - @Operation(summary = "删除客户物品") + @Operation(summary = "删除客户物料") @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('wms:customeritem:delete')") public CommonResult deleteCustomeritem(@RequestParam("id") Long id) { @@ -70,7 +70,7 @@ public class CustomeritemController { } @GetMapping("/get") - @Operation(summary = "获得客户物品") + @Operation(summary = "获得客户物料") @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('wms:customeritem:query')") public CommonResult getCustomeritem(@RequestParam("id") Long id) { @@ -80,7 +80,7 @@ public class CustomeritemController { @GetMapping("/page") - @Operation(summary = "获得客户物品分页") + @Operation(summary = "获得客户物料分页") @PreAuthorize("@ss.hasPermission('wms:customeritem:query')") public CommonResult> getCustomeritemPage(@Valid CustomeritemPageReqVO pageVO) { PageResult pageResult = customeritemService.getCustomeritemPage(pageVO); @@ -93,7 +93,7 @@ public class CustomeritemController { return success(result); } @PostMapping("/senior") - @Operation(summary = "高级搜索获得客户物品分页") + @Operation(summary = "高级搜索获得客户物料分页") @PreAuthorize("@ss.hasPermission('wms:customeritem:query')") public CommonResult> getCustomeritemSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = customeritemService.getCustomeritemSenior(conditions); @@ -106,7 +106,7 @@ public class CustomeritemController { return success(result); } @GetMapping("/export-excel") - @Operation(summary = "导出客户物品 Excel") + @Operation(summary = "导出客户物料 Excel") @PreAuthorize("@ss.hasPermission('wms:customeritem:export')") @OperateLog(type = EXPORT) public void exportCustomeritemExcel(@Valid CustomeritemExportReqVO exportReqVO, @@ -114,17 +114,17 @@ public class CustomeritemController { List list = customeritemService.getCustomeritemList(exportReqVO); Map mapDropDown = new HashMap<>(); List resultList = this.getExcelVo(list, mapDropDown); - ExcelUtils.write(response, "客户物品.xlsx", "数据", CustomeritemExcelVO.class, resultList, mapDropDown); + ExcelUtils.write(response, "客户物料.xlsx", "数据", CustomeritemExcelVO.class, resultList, mapDropDown); } @PostMapping("/export-excel-senior") - @Operation(summary = "导出客户物品 Excel") + @Operation(summary = "导出客户物料 Excel") @PreAuthorize("@ss.hasPermission('wms:customeritem:export')") @OperateLog(type = EXPORT) public void exportCustomeritemExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { List list = customeritemService.getCustomeritemList(conditions); Map mapDropDown = new HashMap<>(); List resultList = this.getExcelVo(list, mapDropDown); - ExcelUtils.write(response, "客户物品.xlsx", "数据", CustomeritemExcelVO.class, resultList, mapDropDown); + ExcelUtils.write(response, "客户物料.xlsx", "数据", CustomeritemExcelVO.class, resultList, mapDropDown); } private List getExcelVo(List list, Map mapDropDown) { String[] cusotmerUom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); @@ -146,7 +146,7 @@ public class CustomeritemController { } @GetMapping("/get-import-template") - @Operation(summary = "获得导入客户物品模板") + @Operation(summary = "获得导入客户物料模板") public void importTemplate(HttpServletResponse response) throws IOException { // 手动创建导出 demo List list = Arrays.asList(); @@ -160,11 +160,11 @@ public class CustomeritemController { String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); mapDropDown.put(10, available); // 输出 - ExcelUtils.write(response, "客户物品导入模板.xls", "客户物品列表", CustomeritemImportExcelVO.class, list,mapDropDown); + ExcelUtils.write(response, "客户物料导入模板.xls", "客户物料列表", CustomeritemImportExcelVO.class, list,mapDropDown); } @PostMapping("/import") - @Operation(summary = "导入客户物品") + @Operation(summary = "导入客户物料") @Parameters({ @Parameter(name = "file", description = "Excel 文件", required = true), @Parameter(name = "mode", description = "导入模式1更新2追加3覆盖", example = "1"), @@ -180,7 +180,7 @@ public class CustomeritemController { Map returnMap = new HashMap<>(); returnMap.put("errorCount", errorList.size()); if(!errorList.isEmpty()) { - String url = ExcelUtils.writeLocalFile("客户物品导入错误数据" + LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")) + ".xls", "错误列表", errorList); + String url = ExcelUtils.writeLocalFile("客户物料导入错误数据" + LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")) + ".xls", "错误列表", errorList); returnMap.put("errorFile", url); } return success(returnMap); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemBaseVO.java index 158ddb27eb..02f05b41f3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemBaseVO.java @@ -11,7 +11,7 @@ import java.time.LocalDateTime; import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; /** - * 客户物品 Base VO，提供给添加、修改、详细的子 VO 使用 + * 客户物料 Base VO，提供给添加、修改、详细的子 VO 使用 * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 */ @Data diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemCreateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemCreateReqVO.java index 0e0f5b4f86..b3ca5553e6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemCreateReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemCreateReqVO.java @@ -5,7 +5,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -@Schema(description = "管理后台 - 客户物品创建 Request VO") +@Schema(description = "管理后台 - 客户物料创建 Request VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemExcelVO.java index 1d2f94a3d4..05c2475355 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemExcelVO.java @@ -11,7 +11,7 @@ import java.time.LocalDateTime; /** - * 客户物品 Excel VO + * 客户物料 Excel VO * * @author 超级管理员 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemExportReqVO.java index 72a29f5000..4970852878 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemExportReqVO.java @@ -9,7 +9,7 @@ import java.time.LocalDateTime; import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; -@Schema(description = "管理后台 - 客户物品 Excel 导出 Request VO，参数和 CustomeritemPageReqVO 是一致的") +@Schema(description = "管理后台 - 客户物料 Excel 导出 Request VO，参数和 CustomeritemPageReqVO 是一致的") @Data public class CustomeritemExportReqVO { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemPageReqVO.java index 499627ffee..08a0d35a60 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemPageReqVO.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; -@Schema(description = "管理后台 - 客户物品分页 Request VO") +@Schema(description = "管理后台 - 客户物料分页 Request VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemRespVO.java index 569a33093e..90956e76a9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemRespVO.java @@ -7,7 +7,7 @@ import lombok.ToString; import java.time.LocalDateTime; -@Schema(description = "管理后台 - 客户物品 Response VO") +@Schema(description = "管理后台 - 客户物料 Response VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemUpdateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemUpdateReqVO.java index 4f7b450242..4ccec6e98a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemUpdateReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemUpdateReqVO.java @@ -5,7 +5,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -@Schema(description = "管理后台 - 客户物品更新 Request VO") +@Schema(description = "管理后台 - 客户物料更新 Request VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/vo/CustomerreceiptRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/vo/CustomerreceiptRecordDetailBaseVO.java index 7129eb79ae..b4967090ac 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/vo/CustomerreceiptRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/vo/CustomerreceiptRecordDetailBaseVO.java @@ -73,7 +73,7 @@ public class CustomerreceiptRecordDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -86,13 +86,13 @@ public class CustomerreceiptRecordDetailBaseVO { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/vo/CustomerreceiptRecordDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/vo/CustomerreceiptRecordDetailExcelVO.java index 32d5a3e87d..93c1ce29fe 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/vo/CustomerreceiptRecordDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/vo/CustomerreceiptRecordDetailExcelVO.java @@ -73,7 +73,7 @@ public class CustomerreceiptRecordDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -85,13 +85,13 @@ public class CustomerreceiptRecordDetailExcelVO { @ExcelProperty("创建者Id") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/vo/CustomerreceiptRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/vo/CustomerreceiptRecordDetailExportReqVO.java index 68e9ad4747..e21d5cf369 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/vo/CustomerreceiptRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/vo/CustomerreceiptRecordDetailExportReqVO.java @@ -66,7 +66,7 @@ public class CustomerreceiptRecordDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -79,13 +79,13 @@ public class CustomerreceiptRecordDetailExportReqVO { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/vo/CustomerreceiptRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/vo/CustomerreceiptRecordDetailPageReqVO.java index 892a948212..ac74a593ca 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/vo/CustomerreceiptRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/vo/CustomerreceiptRecordDetailPageReqVO.java @@ -68,7 +68,7 @@ public class CustomerreceiptRecordDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -81,13 +81,13 @@ public class CustomerreceiptRecordDetailPageReqVO extends PageParam { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/vo/CustomerreceiptRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/vo/CustomerreceiptRecordMainExcelVO.java index 5df8908605..43325109d1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/vo/CustomerreceiptRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/vo/CustomerreceiptRecordMainExcelVO.java @@ -172,7 +172,7 @@ public class CustomerreceiptRecordMainExcelVO { @ExcelProperty("金额") private BigDecimal amount; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -185,13 +185,13 @@ public class CustomerreceiptRecordMainExcelVO { @ExcelProperty("创建者Id") private String creatorDetail; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestDetailBaseVO.java index fa7a6c233f..3099e93290 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestDetailBaseVO.java @@ -48,7 +48,7 @@ public class CustomerreceiptRequestDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -61,13 +61,13 @@ public class CustomerreceiptRequestDetailBaseVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestDetailExcelVO.java index e0986fb059..863504bb2b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestDetailExcelVO.java @@ -48,7 +48,7 @@ public class CustomerreceiptRequestDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -60,13 +60,13 @@ public class CustomerreceiptRequestDetailExcelVO { @ExcelProperty("创建者用户名") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestDetailExportReqVO.java index 002d77e268..67c3a53afb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestDetailExportReqVO.java @@ -42,7 +42,7 @@ public class CustomerreceiptRequestDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -55,13 +55,13 @@ public class CustomerreceiptRequestDetailExportReqVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestDetailPageReqVO.java index ef0b46b15f..759d756115 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestDetailPageReqVO.java @@ -44,7 +44,7 @@ public class CustomerreceiptRequestDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -57,13 +57,13 @@ public class CustomerreceiptRequestDetailPageReqVO extends PageParam { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestMainExcelVO.java index 90690ad69d..1a2379e2ac 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestMainExcelVO.java @@ -125,7 +125,7 @@ public class CustomerreceiptRequestMainExcelVO { @ExcelProperty("到库位代码") private String toLocationCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -137,13 +137,13 @@ public class CustomerreceiptRequestMainExcelVO { @ExcelProperty("创建者用户名") private String creatorDetail; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailBaseVO.java index bd1cf816d1..02e4ea855f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailBaseVO.java @@ -47,16 +47,16 @@ public class CustomerreturnJobDetailBaseVO { @Schema(description = "到库位代码") private String toLocationCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailExcelVO.java index 52ae048661..64e9d8a7c2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailExcelVO.java @@ -47,16 +47,16 @@ public class CustomerreturnJobDetailExcelVO { @ExcelProperty("到库位代码") private String toLocationCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailExportReqVO.java index 7c34244fdd..4ec601257f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailExportReqVO.java @@ -42,16 +42,16 @@ public class CustomerreturnJobDetailExportReqVO { @Schema(description = "到库位代码") private String toLocationCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailPageReqVO.java index ba88b6bde4..0fea1f8aad 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobDetailPageReqVO.java @@ -44,16 +44,16 @@ public class CustomerreturnJobDetailPageReqVO extends PageParam { @Schema(description = "到库位代码") private String toLocationCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobMainExcelVO.java index 4b61b09731..f205661519 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobMainExcelVO.java @@ -195,16 +195,16 @@ public class CustomerreturnJobMainExcelVO { @ExcelProperty("到库位代码") private String toLocationCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordDetailBaseVO.java index bb4fd4b3af..ae310efe31 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordDetailBaseVO.java @@ -75,7 +75,7 @@ public class CustomerreturnRecordDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -88,13 +88,13 @@ public class CustomerreturnRecordDetailBaseVO { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordDetailExcelVO.java index a067c8f2ae..69e0516edb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordDetailExcelVO.java @@ -73,7 +73,7 @@ public class CustomerreturnRecordDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -85,13 +85,13 @@ public class CustomerreturnRecordDetailExcelVO { @ExcelProperty("创建者Id") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordDetailExportReqVO.java index b86dafdb94..8d5e50be09 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordDetailExportReqVO.java @@ -66,7 +66,7 @@ public class CustomerreturnRecordDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -79,13 +79,13 @@ public class CustomerreturnRecordDetailExportReqVO { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordDetailPageReqVO.java index 335b4e1bff..6426bbddc3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordDetailPageReqVO.java @@ -68,7 +68,7 @@ public class CustomerreturnRecordDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -81,13 +81,13 @@ public class CustomerreturnRecordDetailPageReqVO extends PageParam { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordMainExcelVO.java index b3bd11ab4c..107bc7b23e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordMainExcelVO.java @@ -175,7 +175,7 @@ public class CustomerreturnRecordMainExcelVO { @ExcelProperty("金额") private BigDecimal amount; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -188,13 +188,13 @@ public class CustomerreturnRecordMainExcelVO { @ExcelProperty("创建者Id") private String creatorDetail; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailBaseVO.java index 9a181eb7b3..e9ef22e371 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailBaseVO.java @@ -55,8 +55,8 @@ public class CustomerreturnRequestDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "物品代码不能为空") + @Schema(description = "物料代码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "物料代码不能为空") private String itemCode; @Schema(description = "备注") @@ -69,13 +69,13 @@ public class CustomerreturnRequestDetailBaseVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailExcelVO.java index 5a2ee08478..e3492d03fb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailExcelVO.java @@ -48,7 +48,7 @@ public class CustomerreturnRequestDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -60,13 +60,13 @@ public class CustomerreturnRequestDetailExcelVO { @ExcelProperty("创建者用户名") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailExportReqVO.java index f593a2feba..70f55cd413 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailExportReqVO.java @@ -42,7 +42,7 @@ public class CustomerreturnRequestDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -55,13 +55,13 @@ public class CustomerreturnRequestDetailExportReqVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailPageReqVO.java index b0e682e88d..6bf13d5c60 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestDetailPageReqVO.java @@ -44,7 +44,7 @@ public class CustomerreturnRequestDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -57,13 +57,13 @@ public class CustomerreturnRequestDetailPageReqVO extends PageParam { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestImportVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestImportVO.java index 67dec391f3..f03acde95f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestImportVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestImportVO.java @@ -42,7 +42,7 @@ public class CustomerreturnRequestImportVO { // @ExcelProperty("销售订单行") // private String soLine; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("包装号") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestMainExcelVO.java index 56be71edb5..650f63c14f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestMainExcelVO.java @@ -145,7 +145,7 @@ public class CustomerreturnRequestMainExcelVO { @ExcelProperty("从库位代码") private String fromLocationCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -158,13 +158,13 @@ public class CustomerreturnRequestMainExcelVO { @ExcelProperty("创建者用户名") private String creatorDetail; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/vo/CustomersettleRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/vo/CustomersettleRecordDetailBaseVO.java index 06bee378df..f181235138 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/vo/CustomersettleRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/vo/CustomersettleRecordDetailBaseVO.java @@ -55,13 +55,13 @@ public class CustomersettleRecordDetailBaseVO { @Schema(description = "金额") private BigDecimal amount; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -82,7 +82,7 @@ public class CustomersettleRecordDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/vo/CustomersettleRecordDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/vo/CustomersettleRecordDetailExcelVO.java index d99ab2aa98..33a81a5135 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/vo/CustomersettleRecordDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/vo/CustomersettleRecordDetailExcelVO.java @@ -55,13 +55,13 @@ public class CustomersettleRecordDetailExcelVO { @ExcelProperty("金额") private BigDecimal amount; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") @@ -84,7 +84,7 @@ public class CustomersettleRecordDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/vo/CustomersettleRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/vo/CustomersettleRecordDetailExportReqVO.java index 639be2db33..dfa328a2a9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/vo/CustomersettleRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/vo/CustomersettleRecordDetailExportReqVO.java @@ -48,13 +48,13 @@ public class CustomersettleRecordDetailExportReqVO { @Schema(description = "金额") private BigDecimal amount; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -75,7 +75,7 @@ public class CustomersettleRecordDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/vo/CustomersettleRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/vo/CustomersettleRecordDetailPageReqVO.java index e71ee08d54..d2e4017218 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/vo/CustomersettleRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/vo/CustomersettleRecordDetailPageReqVO.java @@ -50,13 +50,13 @@ public class CustomersettleRecordDetailPageReqVO extends PageParam { @Schema(description = "金额") private BigDecimal amount; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -77,7 +77,7 @@ public class CustomersettleRecordDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/vo/CustomersettleRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/vo/CustomersettleRecordMainExcelVO.java index 43630b0079..19db64d281 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/vo/CustomersettleRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/vo/CustomersettleRecordMainExcelVO.java @@ -133,13 +133,13 @@ public class CustomersettleRecordMainExcelVO { @ExcelProperty("金额") private BigDecimal amount; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") @@ -159,7 +159,7 @@ public class CustomersettleRecordMainExcelVO { @ExcelProperty("代码") private String codeDetail; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestDetailBaseVO.java index 74a731f3f9..4201002923 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestDetailBaseVO.java @@ -45,7 +45,7 @@ public class CustomersettleRequestDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -58,13 +58,13 @@ public class CustomersettleRequestDetailBaseVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestDetailExcelVO.java index 13055b1ffa..1c8220b3e7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestDetailExcelVO.java @@ -45,7 +45,7 @@ public class CustomersettleRequestDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -57,13 +57,13 @@ public class CustomersettleRequestDetailExcelVO { @ExcelProperty("创建者用户名") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestDetailExportReqVO.java index 574e246046..cd17a4d535 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestDetailExportReqVO.java @@ -39,7 +39,7 @@ public class CustomersettleRequestDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -52,13 +52,13 @@ public class CustomersettleRequestDetailExportReqVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestDetailPageReqVO.java index 3b5b5bdc6e..157f75e736 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestDetailPageReqVO.java @@ -41,7 +41,7 @@ public class CustomersettleRequestDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -54,13 +54,13 @@ public class CustomersettleRequestDetailPageReqVO extends PageParam { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestMainExcelVO.java index 01c93cb3c8..01bcd9e382 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestMainExcelVO.java @@ -116,7 +116,7 @@ public class CustomersettleRequestMainExcelVO { @ExcelProperty("从库位代码") private String fromLocationCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -129,13 +129,13 @@ public class CustomersettleRequestMainExcelVO { @ExcelProperty("创建者用户名") private String creatorDetail; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestMainImportVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestMainImportVO.java index 0774f11c13..4e1f0de543 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestMainImportVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestMainImportVO.java @@ -34,7 +34,7 @@ public class CustomersettleRequestMainImportVO { // @ExcelProperty("销售订单行") // private String soLine; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("包装号") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobDetailBaseVO.java index c8b45448c8..35ea3dc4dc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobDetailBaseVO.java @@ -47,16 +47,16 @@ public class DeliverJobDetailBaseVO { @Schema(description = "到库位代码") private String toLocationCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobDetailExcelVO.java index 6d033eca0f..44cfec8a93 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobDetailExcelVO.java @@ -46,16 +46,16 @@ public class DeliverJobDetailExcelVO { @ExcelProperty("到库位代码") private String toLocationCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobDetailExportReqVO.java index c4fa15fd63..6237ada03a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobDetailExportReqVO.java @@ -40,16 +40,16 @@ public class DeliverJobDetailExportReqVO { @Schema(description = "到库位代码") private String toLocationCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobDetailPageReqVO.java index c3366b4ac9..92c31a882e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobDetailPageReqVO.java @@ -43,16 +43,16 @@ public class DeliverJobDetailPageReqVO extends PageParam { @Schema(description = "到库位代码") private String toLocationCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobMainExcelVO.java index b657fd1d5e..438044badf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobMainExcelVO.java @@ -204,16 +204,16 @@ public class DeliverJobMainExcelVO { @ExcelProperty("到库位代码") private String toLocationCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanDetailBaseVO.java index 493990cd5b..1a5761c1bd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanDetailBaseVO.java @@ -36,7 +36,7 @@ public class DeliverPlanDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanDetailExcelVO.java index 9df89d9d77..333667577b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanDetailExcelVO.java @@ -35,7 +35,7 @@ public class DeliverPlanDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanDetailExportReqVO.java index 068d5234db..9704c07d81 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanDetailExportReqVO.java @@ -30,7 +30,7 @@ public class DeliverPlanDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanDetailPageReqVO.java index 92c5ff8530..d5cb9f208f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanDetailPageReqVO.java @@ -32,7 +32,7 @@ public class DeliverPlanDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanMainExcelVO.java index 379146e1b9..3ce795a488 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanMainExcelVO.java @@ -85,7 +85,7 @@ public class DeliverPlanMainExcelVO { @ExcelProperty("项目") private String project; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") @ColumnWidth(value = 15) private String itemCode; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanMainImportVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanMainImportVO.java index 186beb15ab..77de0ba25d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanMainImportVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanMainImportVO.java @@ -49,7 +49,7 @@ public class DeliverPlanMainImportVO { // @ExcelProperty("销售订单行") // private BigDecimal soLine; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("计划数量") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordDetailBaseVO.java index 1752942206..f412eb7a96 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordDetailBaseVO.java @@ -76,7 +76,7 @@ public class DeliverRecordDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -89,13 +89,13 @@ public class DeliverRecordDetailBaseVO { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordDetailExcelVO.java index eee47f83dc..57132f69cc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordDetailExcelVO.java @@ -76,7 +76,7 @@ public class DeliverRecordDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -88,13 +88,13 @@ public class DeliverRecordDetailExcelVO { @ExcelProperty("创建者Id") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordDetailExportReqVO.java index 3053b8aed5..739b276c38 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordDetailExportReqVO.java @@ -69,7 +69,7 @@ public class DeliverRecordDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -82,13 +82,13 @@ public class DeliverRecordDetailExportReqVO { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordDetailPageReqVO.java index af36af7fb2..8b9586ba99 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordDetailPageReqVO.java @@ -71,7 +71,7 @@ public class DeliverRecordDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -84,13 +84,13 @@ public class DeliverRecordDetailPageReqVO extends PageParam { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordMainExcelVO.java index 34c071f24e..d580bd36f6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordMainExcelVO.java @@ -181,7 +181,7 @@ public class DeliverRecordMainExcelVO { @ExcelProperty("金额") private BigDecimal amount; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -194,13 +194,13 @@ public class DeliverRecordMainExcelVO { @ExcelProperty("创建者Id") private String creatorDetail; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/vo/DeliverRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/vo/DeliverRequestDetailBaseVO.java index a1e163b04e..da2c60b96d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/vo/DeliverRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/vo/DeliverRequestDetailBaseVO.java @@ -55,13 +55,13 @@ public class DeliverRequestDetailBaseVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -80,7 +80,7 @@ public class DeliverRequestDetailBaseVO { @Schema(description = "最后更新者用户名") private String updater; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "从货主代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/vo/DeliverRequestDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/vo/DeliverRequestDetailExcelVO.java index ac0c307939..de8fc311fe 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/vo/DeliverRequestDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/vo/DeliverRequestDetailExcelVO.java @@ -57,13 +57,13 @@ public class DeliverRequestDetailExcelVO { @ExcelProperty("创建者用户名") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") @@ -82,7 +82,7 @@ public class DeliverRequestDetailExcelVO { @ExcelProperty("最后更新者用户名") private String updater; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("从货主代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/vo/DeliverRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/vo/DeliverRequestDetailExportReqVO.java index 2e41dad4d7..c39805fa5c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/vo/DeliverRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/vo/DeliverRequestDetailExportReqVO.java @@ -52,13 +52,13 @@ public class DeliverRequestDetailExportReqVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -77,7 +77,7 @@ public class DeliverRequestDetailExportReqVO { @Schema(description = "最后更新者用户名") private String updater; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "从货主代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/vo/DeliverRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/vo/DeliverRequestDetailPageReqVO.java index 9dc066918e..ab429dd449 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/vo/DeliverRequestDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/vo/DeliverRequestDetailPageReqVO.java @@ -54,13 +54,13 @@ public class DeliverRequestDetailPageReqVO extends PageParam { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -79,7 +79,7 @@ public class DeliverRequestDetailPageReqVO extends PageParam { @Schema(description = "最后更新者用户名") private String updater; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "从货主代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/vo/DeliverRequestImportVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/vo/DeliverRequestImportVO.java index 24dd79cc20..578e496e80 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/vo/DeliverRequestImportVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/vo/DeliverRequestImportVO.java @@ -46,7 +46,7 @@ public class DeliverRequestImportVO { // @ExcelProperty("销售订单行") // private BigDecimal soLine; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("计划数量") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/vo/DeliverRequestMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/vo/DeliverRequestMainExcelVO.java index 1de867f465..d2e69daa84 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/vo/DeliverRequestMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/vo/DeliverRequestMainExcelVO.java @@ -149,13 +149,13 @@ public class DeliverRequestMainExcelVO { @ExcelProperty("创建者用户名") private String creatorDetail; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") @@ -174,7 +174,7 @@ public class DeliverRequestMainExcelVO { @ExcelProperty("最后更新者用户名") private String updaterDetail; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("从货主代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingDetailBaseVO.java index e2f8fdef33..a4cbb3f538 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingDetailBaseVO.java @@ -34,8 +34,8 @@ public class DemandforecastingDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "物品代码不能为空") + @Schema(description = "物料代码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "物料代码不能为空") private String itemCode; @Schema(description = "订单号") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingDetailExcelVO.java index 5206c0222c..da91cf76a2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingDetailExcelVO.java @@ -31,7 +31,7 @@ public class DemandforecastingDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("订单号") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingDetailExportReqVO.java index e977c4dc3f..b6ebdc8857 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingDetailExportReqVO.java @@ -25,7 +25,7 @@ public class DemandforecastingDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "订单号") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingDetailPageReqVO.java index ec2aa30c65..e87db6be05 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingDetailPageReqVO.java @@ -27,7 +27,7 @@ public class DemandforecastingDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "订单号") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingImportVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingImportVO.java index 491eb48266..989cc64c2d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingImportVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/vo/DemandforecastingImportVO.java @@ -42,7 +42,7 @@ public class DemandforecastingImportVO { @ColumnWidth(value = 16) private LocalDateTime dueTime; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String departmentCode; @ExcelProperty("计划数量") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobDetailBaseVO.java index d90a0d6995..8d83e78cba 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobDetailBaseVO.java @@ -49,16 +49,16 @@ public class InspectJobDetailBaseVO { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobDetailExcelVO.java index a49641a37a..eaa93bf783 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobDetailExcelVO.java @@ -44,16 +44,16 @@ public class InspectJobDetailExcelVO { @ExcelProperty("创建者Id") private String creator; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobDetailExportReqVO.java index b7e84308cf..22c679915c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobDetailExportReqVO.java @@ -40,16 +40,16 @@ public class InspectJobDetailExportReqVO { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobDetailPageReqVO.java index e48fa265e7..cade2693e5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobDetailPageReqVO.java @@ -43,16 +43,16 @@ public class InspectJobDetailPageReqVO extends PageParam { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainBaseVO.java index f2c1286c2d..d515814486 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainBaseVO.java @@ -118,8 +118,8 @@ public class InspectJobMainBaseVO { @NotNull(message = "批次不能为空") private String batch; - @Schema(description = "物品代码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "物品代码不能为空") + @Schema(description = "物料代码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "物料代码不能为空") private String itemCode; @Schema(description = "检验类型", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainExcelVO.java index 7493161035..4ff446d844 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainExcelVO.java @@ -88,7 +88,7 @@ public class InspectJobMainExcelVO { @ExcelProperty("批次") private String batch; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty(value = "检验类型", converter = DictConvert.class) @@ -169,13 +169,13 @@ public class InspectJobMainExcelVO { @ExcelProperty("从库位代码") private String fromLocationCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainExportReqVO.java index 06aac8e149..e6348c7725 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainExportReqVO.java @@ -104,7 +104,7 @@ public class InspectJobMainExportReqVO { @Schema(description = "批次") private String batch; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "检验类型") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainPageReqVO.java index 8de066f493..d3aebf81fb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainPageReqVO.java @@ -110,7 +110,7 @@ public class InspectJobMainPageReqVO extends PageParam { @Schema(description = "批次") private String batch; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "检验类型") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailBaseVO.java index 8f42432b64..bdb2ca0d7e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailBaseVO.java @@ -86,7 +86,7 @@ public class InspectRecordDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -100,13 +100,13 @@ public class InspectRecordDetailBaseVO { @NotNull(message = "创建者Id不能为空") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailExcelVO.java index 0e16b68f9f..74cfcae831 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailExcelVO.java @@ -82,7 +82,7 @@ public class InspectRecordDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -94,13 +94,13 @@ public class InspectRecordDetailExcelVO { @ExcelProperty("创建者Id") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailExportReqVO.java index 7db931d939..077d13482a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailExportReqVO.java @@ -70,7 +70,7 @@ public class InspectRecordDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -83,13 +83,13 @@ public class InspectRecordDetailExportReqVO { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailPageReqVO.java index 7469a0be08..c36ca5f991 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordDetailPageReqVO.java @@ -75,7 +75,7 @@ public class InspectRecordDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -88,13 +88,13 @@ public class InspectRecordDetailPageReqVO extends PageParam { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordMainBaseVO.java index d31edc7a74..84376cb602 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordMainBaseVO.java @@ -125,7 +125,7 @@ public class InspectRecordMainBaseVO { @Schema(description = "最终不合格数量") private BigDecimal batchNotPassedQty; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "从仓库代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordMainExcelVO.java index cba1b93db5..aae28052c9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordMainExcelVO.java @@ -104,7 +104,7 @@ public class InspectRecordMainExcelVO { @ExcelProperty("最终不合格数量") private BigDecimal batchNotPassedQty; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("从仓库代码") @@ -179,13 +179,13 @@ public class InspectRecordMainExcelVO { @ExcelProperty("其他属性") private String otherProperties; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordMainExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordMainExportReqVO.java index 2c52740508..2c19daf54b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordMainExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordMainExportReqVO.java @@ -110,7 +110,7 @@ public class InspectRecordMainExportReqVO { @Schema(description = "最终不合格数量") private BigDecimal batchNotPassedQty; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "从仓库代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordMainPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordMainPageReqVO.java index 969ad478ed..935e89a0aa 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordMainPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/vo/InspectRecordMainPageReqVO.java @@ -112,7 +112,7 @@ public class InspectRecordMainPageReqVO extends PageParam { @Schema(description = "最终不合格数量") private BigDecimal batchNotPassedQty; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "从仓库代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailBaseVO.java index 15d40c945e..ab0dc4358a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailBaseVO.java @@ -47,16 +47,16 @@ public class InspectRequestDetailBaseVO { @Schema(description = "最后更新者用户名") private String updater; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailExcelVO.java index fc7501facd..b448a6b770 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailExcelVO.java @@ -43,16 +43,16 @@ public class InspectRequestDetailExcelVO { @ExcelProperty("最后更新者用户名") private String updater; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailExportReqVO.java index f329cab65e..5f970f01d9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailExportReqVO.java @@ -38,16 +38,16 @@ public class InspectRequestDetailExportReqVO { @Schema(description = "最后更新者用户名") private String updater; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailPageReqVO.java index 467f1861fd..19032203bd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailPageReqVO.java @@ -43,16 +43,16 @@ public class InspectRequestDetailPageReqVO extends PageParam { @Schema(description = "最后更新者用户名") private String updater; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestImportVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestImportVO.java index 72d479efc3..bfe1e0fab6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestImportVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestImportVO.java @@ -35,7 +35,7 @@ public class InspectRequestImportVO { @ExcelProperty("订单行") private String poLine; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("包装号") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestMainBaseVO.java index 537cc59932..6d72e4b68a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestMainBaseVO.java @@ -90,7 +90,7 @@ public class InspectRequestMainBaseVO { // @NotNull(message = "批次不能为空") private String batch; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "检验类型", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestMainExcelVO.java index 298c134538..a555f8c85d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestMainExcelVO.java @@ -116,16 +116,16 @@ public class InspectRequestMainExcelVO { @ExcelProperty("从库位代码") private String fromLocationCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestMainExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestMainExportReqVO.java index c4101e8d52..41a5ce811e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestMainExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestMainExportReqVO.java @@ -74,7 +74,7 @@ public class InspectRequestMainExportReqVO { @Schema(description = "批次") private String batch; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "检验类型") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestMainPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestMainPageReqVO.java index 1bcbd251c0..dbe0941990 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestMainPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestMainPageReqVO.java @@ -79,7 +79,7 @@ public class InspectRequestMainPageReqVO extends PageParam { @Schema(description = "批次") private String batch; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "检验类型") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/vo/InventorychangeRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/vo/InventorychangeRecordDetailBaseVO.java index dbf9123276..912636771e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/vo/InventorychangeRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/vo/InventorychangeRecordDetailBaseVO.java @@ -106,13 +106,13 @@ public class InventorychangeRecordDetailBaseVO { @Schema(description = "到库存状态") private String toInventoryStatus; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -135,8 +135,8 @@ public class InventorychangeRecordDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "物品代码不能为空") + @Schema(description = "物料代码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "物料代码不能为空") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/vo/InventorychangeRecordDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/vo/InventorychangeRecordDetailExcelVO.java index c79d8ddfdc..ef65773bbe 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/vo/InventorychangeRecordDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/vo/InventorychangeRecordDetailExcelVO.java @@ -98,13 +98,13 @@ public class InventorychangeRecordDetailExcelVO { @DictFormat("inventory_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String toInventoryStatus; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") @@ -127,7 +127,7 @@ public class InventorychangeRecordDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/vo/InventorychangeRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/vo/InventorychangeRecordDetailExportReqVO.java index 3353c6a064..fd7da8a61c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/vo/InventorychangeRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/vo/InventorychangeRecordDetailExportReqVO.java @@ -90,13 +90,13 @@ public class InventorychangeRecordDetailExportReqVO { @Schema(description = "到库存状态") private String toInventoryStatus; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -117,7 +117,7 @@ public class InventorychangeRecordDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/vo/InventorychangeRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/vo/InventorychangeRecordDetailPageReqVO.java index b8746ba407..2be4356f0e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/vo/InventorychangeRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/vo/InventorychangeRecordDetailPageReqVO.java @@ -92,13 +92,13 @@ public class InventorychangeRecordDetailPageReqVO extends PageParam { @Schema(description = "到库存状态") private String toInventoryStatus; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -119,7 +119,7 @@ public class InventorychangeRecordDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/vo/InventorychangeRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/vo/InventorychangeRecordMainExcelVO.java index 49106d2175..495a119d1e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/vo/InventorychangeRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/vo/InventorychangeRecordMainExcelVO.java @@ -161,13 +161,13 @@ public class InventorychangeRecordMainExcelVO { @DictFormat("inventory_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String toInventoryStatus; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") @@ -187,7 +187,7 @@ public class InventorychangeRecordMainExcelVO { @DictFormat("interface_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String interfaceTypeDetail; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestDetailBaseVO.java index 469ee6e9b8..393ac8f938 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestDetailBaseVO.java @@ -118,13 +118,13 @@ public class InventorychangeRequestDetailBaseVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -143,8 +143,8 @@ public class InventorychangeRequestDetailBaseVO { @Schema(description = "最后更新者用户名") private String updater; - @Schema(description = "物品代码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "物品代码不能为空") + @Schema(description = "物料代码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "物料代码不能为空") private String itemCode; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestDetailExcelVO.java index 5369bdb096..704dfdfd3c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestDetailExcelVO.java @@ -111,13 +111,13 @@ public class InventorychangeRequestDetailExcelVO { @ExcelProperty("创建者用户名") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") @@ -136,7 +136,7 @@ public class InventorychangeRequestDetailExcelVO { @ExcelProperty("最后更新者用户名") private String updater; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestDetailExportReqVO.java index 92dcc91b7a..d7b140e4d7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestDetailExportReqVO.java @@ -103,13 +103,13 @@ public class InventorychangeRequestDetailExportReqVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -128,7 +128,7 @@ public class InventorychangeRequestDetailExportReqVO { @Schema(description = "最后更新者用户名") private String updater; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "主表id") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestDetailPageReqVO.java index a8eb181bd5..4a072a43cc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestDetailPageReqVO.java @@ -105,13 +105,13 @@ public class InventorychangeRequestDetailPageReqVO extends PageParam { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -130,7 +130,7 @@ public class InventorychangeRequestDetailPageReqVO extends PageParam { @Schema(description = "最后更新者用户名") private String updater; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "主表id") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestMainExcelVO.java index 1d0385d9fc..a49bceeefe 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestMainExcelVO.java @@ -165,13 +165,13 @@ public class InventorychangeRequestMainExcelVO { @ExcelProperty("创建者用户名") private String creatorDetail; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") @@ -191,6 +191,6 @@ public class InventorychangeRequestMainExcelVO { @ExcelProperty("最后更新者用户名") private String updaterDetail; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/vo/InventoryinitRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/vo/InventoryinitRecordDetailBaseVO.java index 5df8cbb4f7..11adf399f9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/vo/InventoryinitRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/vo/InventoryinitRecordDetailBaseVO.java @@ -80,13 +80,13 @@ public class InventoryinitRecordDetailBaseVO { @Schema(description = "金额") private BigDecimal amount; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -104,7 +104,7 @@ public class InventoryinitRecordDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/vo/InventoryinitRecordDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/vo/InventoryinitRecordDetailExcelVO.java index 0f53e5998e..f809d9c6ca 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/vo/InventoryinitRecordDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/vo/InventoryinitRecordDetailExcelVO.java @@ -78,13 +78,13 @@ public class InventoryinitRecordDetailExcelVO { @ExcelProperty("金额") private BigDecimal amount; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") @@ -104,7 +104,7 @@ public class InventoryinitRecordDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/vo/InventoryinitRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/vo/InventoryinitRecordDetailExportReqVO.java index 4888aa17f9..3d084452bc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/vo/InventoryinitRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/vo/InventoryinitRecordDetailExportReqVO.java @@ -69,13 +69,13 @@ public class InventoryinitRecordDetailExportReqVO { @Schema(description = "金额") private BigDecimal amount; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -93,7 +93,7 @@ public class InventoryinitRecordDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/vo/InventoryinitRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/vo/InventoryinitRecordDetailPageReqVO.java index 90d7a93cdf..526673c5eb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/vo/InventoryinitRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/vo/InventoryinitRecordDetailPageReqVO.java @@ -71,13 +71,13 @@ public class InventoryinitRecordDetailPageReqVO extends PageParam { @Schema(description = "金额") private BigDecimal amount; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -95,7 +95,7 @@ public class InventoryinitRecordDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/vo/InventoryinitRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/vo/InventoryinitRecordMainExcelVO.java index 7d1691ef60..736d167b5e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/vo/InventoryinitRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/vo/InventoryinitRecordMainExcelVO.java @@ -144,13 +144,13 @@ public class InventoryinitRecordMainExcelVO { @ExcelProperty("金额") private BigDecimal amount; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") @@ -160,7 +160,7 @@ public class InventoryinitRecordMainExcelVO { @DictFormat(DictTypeConstants.UOM) private String uom; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/vo/InventoryinitRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/vo/InventoryinitRequestDetailBaseVO.java index 79368f1628..71b310900c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/vo/InventoryinitRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/vo/InventoryinitRequestDetailBaseVO.java @@ -86,13 +86,13 @@ public class InventoryinitRequestDetailBaseVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -108,7 +108,7 @@ public class InventoryinitRequestDetailBaseVO { @Schema(description = "最后更新者用户名") private String updater; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/vo/InventoryinitRequestDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/vo/InventoryinitRequestDetailExcelVO.java index 797279e24e..9f09fae418 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/vo/InventoryinitRequestDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/vo/InventoryinitRequestDetailExcelVO.java @@ -83,13 +83,13 @@ public class InventoryinitRequestDetailExcelVO { @ExcelProperty("创建者用户名") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") @@ -105,7 +105,7 @@ public class InventoryinitRequestDetailExcelVO { @ExcelProperty("最后更新者用户名") private String updater; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/vo/InventoryinitRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/vo/InventoryinitRequestDetailExportReqVO.java index a3decc1b8a..cf6f108fdb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/vo/InventoryinitRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/vo/InventoryinitRequestDetailExportReqVO.java @@ -76,13 +76,13 @@ public class InventoryinitRequestDetailExportReqVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -98,7 +98,7 @@ public class InventoryinitRequestDetailExportReqVO { @Schema(description = "最后更新者用户名") private String updater; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/vo/InventoryinitRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/vo/InventoryinitRequestDetailPageReqVO.java index 600a94199e..f44cbdfa23 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/vo/InventoryinitRequestDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/vo/InventoryinitRequestDetailPageReqVO.java @@ -78,13 +78,13 @@ public class InventoryinitRequestDetailPageReqVO extends PageParam { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -100,7 +100,7 @@ public class InventoryinitRequestDetailPageReqVO extends PageParam { @Schema(description = "最后更新者用户名") private String updater; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "master_id", example = "master_id") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/vo/InventoryinitRequestMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/vo/InventoryinitRequestMainExcelVO.java index 0af87830d1..dcbb92598c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/vo/InventoryinitRequestMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/vo/InventoryinitRequestMainExcelVO.java @@ -110,16 +110,16 @@ public class InventoryinitRequestMainExcelVO { private String reason; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/vo/InventoryinitRequestMainImportVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/vo/InventoryinitRequestMainImportVO.java index 4ad7e17439..6f6c508f8c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/vo/InventoryinitRequestMainImportVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/vo/InventoryinitRequestMainImportVO.java @@ -45,8 +45,8 @@ public class InventoryinitRequestMainImportVO{ private String packingNumber; - @ExcelProperty("物品代码") - @NotBlank(message="物品代码不能为空") + @ExcelProperty("物料代码") + @NotBlank(message="物料代码不能为空") private String itemCode; @ExcelProperty("器具号") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobDetailBaseVO.java index 9a0d07d486..b532f7e990 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobDetailBaseVO.java @@ -20,16 +20,16 @@ public class InventorymoveJobDetailBaseVO { @Schema(description = "id", example = "id") private Long id; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobDetailExcelVO.java index 5a496b35b9..775a2b721b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobDetailExcelVO.java @@ -19,16 +19,16 @@ import com.win.framework.excel.core.convert.DictConvert; @Data public class InventorymoveJobDetailExcelVO { - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobDetailExportReqVO.java index 4828b81bfe..cc6e5de883 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobDetailExportReqVO.java @@ -15,16 +15,16 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY @Data public class InventorymoveJobDetailExportReqVO { - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobDetailPageReqVO.java index b17836b764..ca99608d78 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobDetailPageReqVO.java @@ -17,16 +17,16 @@ import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY @ToString(callSuper = true) public class InventorymoveJobDetailPageReqVO extends PageParam { - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobMainExcelVO.java index feb44fe72a..e008969c39 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobMainExcelVO.java @@ -156,16 +156,16 @@ public class InventorymoveJobMainExcelVO { private String allowModifyPackingNumber; //子表数据 - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailBaseVO.java index 21846d7947..5891458c8b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailBaseVO.java @@ -79,13 +79,13 @@ public class InventorymoveRecordDetailBaseVO { @NotNull(message = "到库存状态不能为空") private String toInventoryStatus; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -106,8 +106,8 @@ public class InventorymoveRecordDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "物品代码不能为空") + @Schema(description = "物料代码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "物料代码不能为空") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailExcelVO.java index b0d0fd94eb..31f2753564 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailExcelVO.java @@ -72,13 +72,13 @@ public class InventorymoveRecordDetailExcelVO { @DictFormat("inventory_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String toInventoryStatus; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") @@ -101,7 +101,7 @@ public class InventorymoveRecordDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailExportReqVO.java index 28f2a07143..30b534d5cc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailExportReqVO.java @@ -66,13 +66,13 @@ public class InventorymoveRecordDetailExportReqVO { @Schema(description = "到库存状态") private String toInventoryStatus; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -93,7 +93,7 @@ public class InventorymoveRecordDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailPageReqVO.java index 16c8c50343..ee9d32dfd1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordDetailPageReqVO.java @@ -68,13 +68,13 @@ public class InventorymoveRecordDetailPageReqVO extends PageParam { @Schema(description = "到库存状态") private String toInventoryStatus; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -95,7 +95,7 @@ public class InventorymoveRecordDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordMainExcelVO.java index 0a29b9e117..31d643380a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordMainExcelVO.java @@ -160,13 +160,13 @@ public class InventorymoveRecordMainExcelVO { @DictFormat("inventory_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String toInventoryStatus; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") @@ -186,7 +186,7 @@ public class InventorymoveRecordMainExcelVO { @DictFormat("interface_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String interfaceTypeDetail; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/vo/InventorymoveRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/vo/InventorymoveRequestDetailBaseVO.java index 36333f2ca6..eba254abe5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/vo/InventorymoveRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/vo/InventorymoveRequestDetailBaseVO.java @@ -75,13 +75,13 @@ public class InventorymoveRequestDetailBaseVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -100,8 +100,8 @@ public class InventorymoveRequestDetailBaseVO { @Schema(description = "最后更新者用户名") private String updater; - @Schema(description = "物品代码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "物品代码不能为空") + @Schema(description = "物料代码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "物料代码不能为空") private String itemCode; @Schema(description = "主表Id") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/vo/InventorymoveRequestDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/vo/InventorymoveRequestDetailExcelVO.java index ae6e36a67f..4e60d6fae0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/vo/InventorymoveRequestDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/vo/InventorymoveRequestDetailExcelVO.java @@ -70,13 +70,13 @@ public class InventorymoveRequestDetailExcelVO { @ExcelProperty("创建者用户名") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") @@ -95,7 +95,7 @@ public class InventorymoveRequestDetailExcelVO { @ExcelProperty("最后更新者用户名") private String updater; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/vo/InventorymoveRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/vo/InventorymoveRequestDetailExportReqVO.java index 09787cb413..9021645861 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/vo/InventorymoveRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/vo/InventorymoveRequestDetailExportReqVO.java @@ -64,13 +64,13 @@ public class InventorymoveRequestDetailExportReqVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -89,7 +89,7 @@ public class InventorymoveRequestDetailExportReqVO { @Schema(description = "最后更新者用户名") private String updater; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "主表id") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/vo/InventorymoveRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/vo/InventorymoveRequestDetailPageReqVO.java index 7d5d093927..f01866b425 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/vo/InventorymoveRequestDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/vo/InventorymoveRequestDetailPageReqVO.java @@ -66,13 +66,13 @@ public class InventorymoveRequestDetailPageReqVO extends PageParam { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -91,7 +91,7 @@ public class InventorymoveRequestDetailPageReqVO extends PageParam { @Schema(description = "最后更新者用户名") private String updater; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "主表id") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/vo/InventorymoveRequestMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/vo/InventorymoveRequestMainExcelVO.java index d542badda7..de31b64b56 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/vo/InventorymoveRequestMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/vo/InventorymoveRequestMainExcelVO.java @@ -146,13 +146,13 @@ public class InventorymoveRequestMainExcelVO { @ExcelProperty("创建者用户名") private String creatorDetail; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") @@ -172,6 +172,6 @@ public class InventorymoveRequestMainExcelVO { @ExcelProperty("最后更新者用户名") private String updaterDetail; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/vo/InventorymoveRequestMainImportVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/vo/InventorymoveRequestMainImportVO.java index 55da144909..ee3f5d44f9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/vo/InventorymoveRequestMainImportVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/vo/InventorymoveRequestMainImportVO.java @@ -30,7 +30,7 @@ public class InventorymoveRequestMainImportVO { private String number; //子表数据 - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("从包装号") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobDetailBaseVO.java index 38bbd51012..77101dec93 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobDetailBaseVO.java @@ -49,16 +49,16 @@ public class IssueJobDetailBaseVO { @Schema(description = "到库位代码") private String toLocationCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "标包数量") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobDetailExcelVO.java index a63ec7e98b..e631e3f25d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobDetailExcelVO.java @@ -49,16 +49,16 @@ public class IssueJobDetailExcelVO { @ExcelProperty("到库位代码") private String toLocationCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("标包数量") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobDetailExportReqVO.java index c034b02178..65760dc708 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobDetailExportReqVO.java @@ -42,16 +42,16 @@ public class IssueJobDetailExportReqVO { @Schema(description = "到库位代码") private String toLocationCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "标包数量") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobDetailPageReqVO.java index 2cca6d3825..1429959d66 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobDetailPageReqVO.java @@ -44,16 +44,16 @@ public class IssueJobDetailPageReqVO extends PageParam { @Schema(description = "到库位代码") private String toLocationCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "标包数量") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobMainExcelVO.java index 6a52e597b4..b9c7bac2c1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobMainExcelVO.java @@ -181,16 +181,16 @@ public class IssueJobMainExcelVO { @ExcelProperty("到库位代码") private String toLocationCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("标包数量") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordDetailBaseVO.java index 5e803b859d..89eb2dcf0c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordDetailBaseVO.java @@ -78,7 +78,7 @@ public class IssueRecordDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -93,13 +93,13 @@ public class IssueRecordDetailBaseVO { @NotNull(message = "创建者Id不能为空") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordDetailExcelVO.java index ed90bcd26f..f213bb2d61 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordDetailExcelVO.java @@ -77,7 +77,7 @@ public class IssueRecordDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -89,13 +89,13 @@ public class IssueRecordDetailExcelVO { @ExcelProperty("创建者Id") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordDetailExportReqVO.java index 3ebcc28a08..6bc50dccb1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordDetailExportReqVO.java @@ -72,7 +72,7 @@ public class IssueRecordDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -85,13 +85,13 @@ public class IssueRecordDetailExportReqVO { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordDetailPageReqVO.java index 5fd4024317..55a1d76921 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordDetailPageReqVO.java @@ -74,7 +74,7 @@ public class IssueRecordDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -87,13 +87,13 @@ public class IssueRecordDetailPageReqVO extends PageParam { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordMainExcelVO.java index 30334f84e9..f2f5433623 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/vo/IssueRecordMainExcelVO.java @@ -154,16 +154,16 @@ public class IssueRecordMainExcelVO { @ExcelProperty("到库区代码") private String toAreaCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestDetailBaseVO.java index 5c0a8d460d..6f7d6a5577 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestDetailBaseVO.java @@ -45,7 +45,7 @@ public class IssueRequestDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -58,13 +58,13 @@ public class IssueRequestDetailBaseVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestDetailExcelVO.java index b6118b92da..20fb9a049c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestDetailExcelVO.java @@ -45,7 +45,7 @@ public class IssueRequestDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -57,13 +57,13 @@ public class IssueRequestDetailExcelVO { @ExcelProperty("创建者用户名") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestDetailExportReqVO.java index 74c246bd47..f22db76d35 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestDetailExportReqVO.java @@ -39,7 +39,7 @@ public class IssueRequestDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -52,13 +52,13 @@ public class IssueRequestDetailExportReqVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestDetailPageReqVO.java index 1e38142f2e..4a08c4eb71 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestDetailPageReqVO.java @@ -41,7 +41,7 @@ public class IssueRequestDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -54,13 +54,13 @@ public class IssueRequestDetailPageReqVO extends PageParam { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestImportVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestImportVO.java index f55f16e225..9668bfadeb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestImportVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestImportVO.java @@ -51,7 +51,7 @@ public class IssueRequestImportVO { @ExcelProperty("工位代码") private String workStationCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("数量") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestMainExcelVO.java index 19111b7f26..df075caf2b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestMainExcelVO.java @@ -121,16 +121,16 @@ public class IssueRequestMainExcelVO { @ExcelProperty("到库位代码") private String toLocationCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java index 0212b2198c..23cb3eb35a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/ItembasicController.java @@ -42,7 +42,7 @@ import static com.win.framework.common.pojo.CommonResult.success; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; import static com.win.module.wms.enums.ErrorCodeConstants.*; -@Tag(name = "管理后台 - 物品基本信息") +@Tag(name = "管理后台 - 物料基本信息") @RestController @RequestMapping("/wms/itembasic") @Validated @@ -58,7 +58,7 @@ public class ItembasicController { private AdminUserApi userApi; @PostMapping("/create") - @Operation(summary = "创建物品基本信息") + @Operation(summary = "创建物料基本信息") @PreAuthorize("@ss.hasPermission('wms:itembasic:create')") public CommonResult createItembasic(@Valid @RequestBody ItembasicCreateReqVO createReqVO) { checkCodeOnly(createReqVO); @@ -66,7 +66,7 @@ public class ItembasicController { } @PutMapping("/update") - @Operation(summary = "更新物品基本信息") + @Operation(summary = "更新物料基本信息") @PreAuthorize("@ss.hasPermission('wms:itembasic:update')") public CommonResult updateItembasic(@Valid @RequestBody ItembasicUpdateReqVO updateReqVO) { checkCodeOnly(updateReqVO); @@ -75,7 +75,7 @@ public class ItembasicController { } @PutMapping("/updateStatus") - @Operation(summary = "更新物品状态") + @Operation(summary = "更新物料状态") @PreAuthorize("@ss.hasPermission('wms:itembasic:update')") public CommonResult updateItembasicStatus(@Valid @RequestBody ItembasicUpdateReqVO updateReqVO) { itembasicService.updateItembasicStatus(updateReqVO); @@ -95,7 +95,7 @@ public class ItembasicController { } @DeleteMapping("/delete") - @Operation(summary = "删除物品基本信息") + @Operation(summary = "删除物料基本信息") @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('wms:itembasic:delete')") public CommonResult deleteItembasic(@RequestParam("id") Long id) { @@ -104,7 +104,7 @@ public class ItembasicController { } @GetMapping("/get") - @Operation(summary = "获得物品基本信息") + @Operation(summary = "获得物料基本信息") @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('wms:itembasic:query')") public CommonResult getItembasic(@RequestParam("id") Long id) { @@ -112,14 +112,14 @@ public class ItembasicController { return success(ItembasicConvert.INSTANCE.convert(itembasic)); } @GetMapping("/list") - @Operation(summary = "获得物品基本信息列表") + @Operation(summary = "获得物料基本信息列表") @PreAuthorize("@ss.hasPermission('wms:itembasic:query')") public CommonResult> getItembasicList() { List list =itembasicService.getItembasicList(); return success(ItembasicConvert.INSTANCE.convertList(list)); } @GetMapping("/page") - @Operation(summary = "获得物品基本信息分页") + @Operation(summary = "获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:itembasic:query')") public CommonResult> getItembasicPage(@Valid ItembasicPageReqVO pageVO) { PageResult pageResult = itembasicService.getItembasicPage(pageVO); @@ -133,7 +133,7 @@ public class ItembasicController { } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:itembasic:query')") public CommonResult> getItembasicSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = itembasicService.getItembasicSenior(conditions); @@ -147,7 +147,7 @@ public class ItembasicController { } @GetMapping("/itembasicPageToFgAndSemi") - @Operation(summary = "获得物品基本信息分页(只展示成品与半成品)") + @Operation(summary = "获得物料基本信息分页(只展示成品与半成品)") @PreAuthorize("@ss.hasPermission('wms:itembasic:query')") public CommonResult> selecttembasicPageToFgAndSemi(@Valid ItembasicPageReqVO pageVO) { PageResult pageResult = itembasicService.selectItembasicPageToFgAndSemi(pageVO); @@ -161,7 +161,7 @@ public class ItembasicController { } @PostMapping("/itembasicPageToFgAndSemiSenior") - @Operation(summary = "高级搜索获取物品属性筛选出的供应商物品") + @Operation(summary = "高级搜索获取物料属性筛选出的供应商物料") @PreAuthorize("@ss.hasPermission('wms:itembasic:query')") public CommonResult selectItembasicPageToFgAndSemiSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = itembasicService.selectItembasicPageToFgAndSemiSenior(conditions); @@ -169,7 +169,7 @@ public class ItembasicController { } @GetMapping("/export-excel") - @Operation(summary = "导出物品基本信息 Excel") + @Operation(summary = "导出物料基本信息 Excel") @PreAuthorize("@ss.hasPermission('wms:itembasic:export')") @OperateLog(type = EXPORT) public void exportItembasicExcel(@Valid ItembasicExportReqVO exportReqVO, @@ -177,18 +177,18 @@ public class ItembasicController { List list = itembasicService.getItembasicList(exportReqVO); Map mapDropDown = new HashMap<>(); List resultList = this.getExcelVo(list, mapDropDown); - ExcelUtils.write(response, "物品基本信息.xlsx", "数据", ItembasicExcelVO.class, resultList, mapDropDown); + ExcelUtils.write(response, "物料基本信息.xlsx", "数据", ItembasicExcelVO.class, resultList, mapDropDown); } @PostMapping("/export-excel-senior") - @Operation(summary = "导出物品基本信息 Excel") + @Operation(summary = "导出物料基本信息 Excel") @PreAuthorize("@ss.hasPermission('wms:itembasic:export')") @OperateLog(type = EXPORT) public void exportItembasicExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { List list = itembasicService.getItembasicList(conditions); Map mapDropDown = new HashMap<>(); List resultList = this.getExcelVo(list, mapDropDown); - ExcelUtils.write(response, "物品基本信息.xlsx", "数据", ItembasicExcelVO.class, resultList, mapDropDown); + ExcelUtils.write(response, "物料基本信息.xlsx", "数据", ItembasicExcelVO.class, resultList, mapDropDown); } private List getExcelVo(List list, Map mapDropDown) { String[] status = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.ITEM_STATUS); @@ -236,7 +236,7 @@ public class ItembasicController { } @GetMapping("/get-import-template") - @Operation(summary = "获得导入物品基本信息模板") + @Operation(summary = "获得导入物料基本信息模板") public void importTemplate(HttpServletResponse response) throws IOException { // 手动创建导出 demo List list = Arrays.asList( @@ -279,12 +279,12 @@ public class ItembasicController { mapDropDown.put(22, available); // 输出 - ExcelUtils.write(response, "物品基本信息导入模板.xls", "物品基本信息列表", ItembasicImportExcelVo.class, list,mapDropDown); + ExcelUtils.write(response, "物料基本信息导入模板.xls", "物料基本信息列表", ItembasicImportExcelVo.class, list,mapDropDown); } @PostMapping("/import") - @Operation(summary = "导入物品基本信息") + @Operation(summary = "导入物料基本信息") @Parameters({ @Parameter(name = "file", description = "Excel 文件", required = true), @Parameter(name = "mode", description = "导入模式1更新2追加3覆盖", example = "1"), @@ -300,7 +300,7 @@ public class ItembasicController { Map returnMap = new HashMap<>(); returnMap.put("errorCount", errorList.size()); if(!errorList.isEmpty()) { - String url = ExcelUtils.writeLocalFile("物品基本信息导入错误数据" + LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")) + ".xls", "错误列表", errorList); + String url = ExcelUtils.writeLocalFile("物料基本信息导入错误数据" + LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")) + ".xls", "错误列表", errorList); returnMap.put("errorFile", url); } return success(returnMap); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicBaseVO.java index a517964978..11e888761d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicBaseVO.java @@ -10,7 +10,7 @@ import java.time.LocalDateTime; import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; /** - * 物品基本信息 Base VO，提供给添加、修改、详细的子 VO 使用 + * 物料基本信息 Base VO，提供给添加、修改、详细的子 VO 使用 * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 */ @Data diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicCreateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicCreateReqVO.java index 4ddeedbf1f..d7089d2644 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicCreateReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicCreateReqVO.java @@ -5,7 +5,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -@Schema(description = "管理后台 - 物品基本信息创建 Request VO") +@Schema(description = "管理后台 - 物料基本信息创建 Request VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicExcelVO.java index 959932ce01..27bea4d6c3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicExcelVO.java @@ -11,7 +11,7 @@ import java.time.LocalDateTime; /** - * 物品基本信息 Excel VO + * 物料基本信息 Excel VO * * @author 超级管理员 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicExportReqVO.java index c53c079257..d48a683b2d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicExportReqVO.java @@ -8,7 +8,7 @@ import java.time.LocalDateTime; import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; -@Schema(description = "管理后台 - 物品基本信息 Excel 导出 Request VO，参数和 ItembasicPageReqVO 是一致的") +@Schema(description = "管理后台 - 物料基本信息 Excel 导出 Request VO，参数和 ItembasicPageReqVO 是一致的") @Data public class ItembasicExportReqVO { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicPageReqVO.java index 3ed4ce1c82..d167b8f492 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicPageReqVO.java @@ -15,7 +15,7 @@ import java.time.LocalDateTime; import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; -@Schema(description = "管理后台 - 物品基本信息分页 Request VO") +@Schema(description = "管理后台 - 物料基本信息分页 Request VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicRespVO.java index 4d46348ae4..9cc7f4c98a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicRespVO.java @@ -7,7 +7,7 @@ import lombok.ToString; import java.time.LocalDateTime; -@Schema(description = "管理后台 - 物品基本信息 Response VO") +@Schema(description = "管理后台 - 物料基本信息 Response VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicUpdateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicUpdateReqVO.java index 584e349a3d..903389eeb8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicUpdateReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicUpdateReqVO.java @@ -5,7 +5,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -@Schema(description = "管理后台 - 物品基本信息更新 Request VO") +@Schema(description = "管理后台 - 物料基本信息更新 Request VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/ItempackagingController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/ItempackagingController.java index aef99b9836..5c823f58a9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/ItempackagingController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/ItempackagingController.java @@ -33,7 +33,7 @@ import java.util.*; import static com.win.framework.common.pojo.CommonResult.success; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; -@Tag(name = "管理后台 - 物品包装信息 ") +@Tag(name = "管理后台 - 物料包装信息 ") @RestController @RequestMapping("/wms/itempackaging") @Validated @@ -45,14 +45,14 @@ public class ItempackagingController { @Resource private AdminUserApi userApi; @PostMapping("/create") - @Operation(summary = "创建物品包装信息 ") + @Operation(summary = "创建物料包装信息 ") @PreAuthorize("@ss.hasPermission('wms:itempackaging:create')") public CommonResult createItempackaging(@Valid @RequestBody ItempackagingCreateReqVO createReqVO) { return success(itempackagingService.createItempackaging(createReqVO)); } @PutMapping("/update") - @Operation(summary = "更新物品包装信息 ") + @Operation(summary = "更新物料包装信息 ") @PreAuthorize("@ss.hasPermission('wms:itempackaging:update')") public CommonResult updateItempackaging(@Valid @RequestBody ItempackagingUpdateReqVO updateReqVO) { itempackagingService.updateItempackaging(updateReqVO); @@ -60,7 +60,7 @@ public class ItempackagingController { } @DeleteMapping("/delete") - @Operation(summary = "删除物品包装信息 ") + @Operation(summary = "删除物料包装信息 ") @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('wms:itempackaging:delete')") public CommonResult deleteItempackaging(@RequestParam("id") Long id) { @@ -69,7 +69,7 @@ public class ItempackagingController { } @GetMapping("/get") - @Operation(summary = "获得物品包装信息 ") + @Operation(summary = "获得物料包装信息 ") @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('wms:itempackaging:query')") public CommonResult getItempackaging(@RequestParam("id") Long id) { @@ -78,7 +78,7 @@ public class ItempackagingController { } // @GetMapping("/list") -// @Operation(summary = "获得物品包装信息 列表") +// @Operation(summary = "获得物料包装信息 列表") // @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") // @PreAuthorize("@ss.hasPermission('wms:itempackaging:query')") // public CommonResult> getItempackagingList(@RequestParam("ids") Collection ids) { @@ -87,7 +87,7 @@ public class ItempackagingController { // } @GetMapping("/page") - @Operation(summary = "获得物品包装信息分页") + @Operation(summary = "获得物料包装信息分页") @PreAuthorize("@ss.hasPermission('wms:itempackaging:query')") public CommonResult> getItempackagingPage(@Valid ItempackagingPageReqVO pageVO) { PageResult pageResult = itempackagingService.getItempackagingPage(pageVO); @@ -101,7 +101,7 @@ public class ItempackagingController { } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品包装信息分页") + @Operation(summary = "高级搜索获得物料包装信息分页") @PreAuthorize("@ss.hasPermission('wms:itempackaging:query')") public CommonResult> getItempackagingSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = itempackagingService.getItempackagingSenior(conditions); @@ -114,7 +114,7 @@ public class ItempackagingController { return success(result); } @GetMapping("/export-excel") - @Operation(summary = "导出物品包装信息 Excel") + @Operation(summary = "导出物料包装信息 Excel") @PreAuthorize("@ss.hasPermission('wms:itempackaging:export')") @OperateLog(type = EXPORT) public void exportItempackagingExcel(@Valid ItempackagingExportReqVO exportReqVO, @@ -122,17 +122,17 @@ public class ItempackagingController { List list = itempackagingService.getItempackagingList(exportReqVO); Map mapDropDown = new HashMap<>(); List resultList = this.getExcelVo(list, mapDropDown); - ExcelUtils.write(response, "物品基本信息.xlsx", "数据", ItempackagingExcelVO.class, resultList, mapDropDown); + ExcelUtils.write(response, "物料基本信息.xlsx", "数据", ItempackagingExcelVO.class, resultList, mapDropDown); } @PostMapping("/export-excel-senior") - @Operation(summary = "导出物品包装信息 Excel") + @Operation(summary = "导出物料包装信息 Excel") @PreAuthorize("@ss.hasPermission('wms:itembasic:export')") @OperateLog(type = EXPORT) public void exportItempackagingExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { List list = itempackagingService.getItempackagingList(conditions); Map mapDropDown = new HashMap<>(); List resultList = this.getExcelVo(list, mapDropDown); - ExcelUtils.write(response, "物品包装信息.xlsx", "数据", ItempackagingExcelVO.class, resultList, mapDropDown); + ExcelUtils.write(response, "物料包装信息.xlsx", "数据", ItempackagingExcelVO.class, resultList, mapDropDown); } private List getExcelVo(List list, Map mapDropDown) { String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM); @@ -161,7 +161,7 @@ public class ItempackagingController { @GetMapping("/get-import-template") - @Operation(summary = "获得导入物品包装信息模板") + @Operation(summary = "获得导入物料包装信息模板") public void importTemplate(HttpServletResponse response) throws IOException { // 手动创建导出 demo List list = Arrays.asList(); @@ -181,11 +181,11 @@ public class ItempackagingController { String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); mapDropDown.put(12, available); // 输出 - ExcelUtils.write(response, "物品包装信息导入模板.xls", "物品包装信息列表", ItempackagingImportExcelVO.class, list,mapDropDown); + ExcelUtils.write(response, "物料包装信息导入模板.xls", "物料包装信息列表", ItempackagingImportExcelVO.class, list,mapDropDown); } @PostMapping("/import") - @Operation(summary = "导入物品包装信息") + @Operation(summary = "导入物料包装信息") @Parameters({ @Parameter(name = "file", description = "Excel 文件", required = true), @Parameter(name = "mode", description = "导入模式1更新2追加3覆盖", example = "1"), @@ -201,7 +201,7 @@ public class ItempackagingController { Map returnMap = new HashMap<>(); returnMap.put("errorCount", errorList.size()); if(!errorList.isEmpty()) { - String url = ExcelUtils.writeLocalFile("物品包装信息导入错误数据" + LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")) + ".xls", "错误列表", errorList); + String url = ExcelUtils.writeLocalFile("物料包装信息导入错误数据" + LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")) + ".xls", "错误列表", errorList); returnMap.put("errorFile", url); } return success(returnMap); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingBaseVO.java index 3e33d5a43e..829ba1249d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingBaseVO.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; /** - * 物品包装信息 Base VO，提供给添加、修改、详细的子 VO 使用 + * 物料包装信息 Base VO，提供给添加、修改、详细的子 VO 使用 * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 */ @Data @@ -22,8 +22,8 @@ public class ItempackagingBaseVO { @OnlyOne private Long id; - @Schema(description = "物品代码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "物品代码不能为空") + @Schema(description = "物料代码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "物料代码不能为空") private String itemCode; @Schema(description = "计量单位", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingCreateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingCreateReqVO.java index 6835e02e21..36928b008b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingCreateReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingCreateReqVO.java @@ -5,7 +5,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -@Schema(description = "管理后台 - 物品包装信息 创建 Request VO") +@Schema(description = "管理后台 - 物料包装信息 创建 Request VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingExcelVO.java index 2e3fd054b2..aa599a259e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingExcelVO.java @@ -11,14 +11,14 @@ import java.time.LocalDateTime; /** - * 物品包装信息 Excel VO + * 物料包装信息 Excel VO * * @author 超级管理员 */ @Data public class ItempackagingExcelVO { - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty(value = "计量单位", converter = DictConvert.class) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingExportReqVO.java index f401d775b3..4c29d6a7de 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingExportReqVO.java @@ -9,11 +9,11 @@ import java.time.LocalDateTime; import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; -@Schema(description = "管理后台 - 物品包装信息 Excel 导出 Request VO，参数和 ItempackagingPageReqVO 是一致的") +@Schema(description = "管理后台 - 物料包装信息 Excel 导出 Request VO，参数和 ItempackagingPageReqVO 是一致的") @Data public class ItempackagingExportReqVO { - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "计量单位") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingImportErrorVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingImportErrorVO.java index 5c7a29285e..b591f8669a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingImportErrorVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingImportErrorVO.java @@ -23,7 +23,7 @@ import java.time.LocalDateTime; public class ItempackagingImportErrorVO { - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty(value = "计量单位", converter = DictConvert.class) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingImportExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingImportExcelVO.java index 54f1ec6e31..987599f343 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingImportExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingImportExcelVO.java @@ -21,7 +21,7 @@ import java.time.LocalDateTime; @Accessors(chain = false) // 设置 chain = false，避免用户导入有问题 public class ItempackagingImportExcelVO { - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty(value = "计量单位", converter = DictConvert.class) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingPageReqVO.java index 3e04a00e96..2fc7098875 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingPageReqVO.java @@ -12,13 +12,13 @@ import java.time.LocalDateTime; import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; -@Schema(description = "管理后台 - 物品包装信息 分页 Request VO") +@Schema(description = "管理后台 - 物料包装信息 分页 Request VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class ItempackagingPageReqVO extends PageParam { - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "计量单位") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingRespVO.java index ca342a8252..27fde48198 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingRespVO.java @@ -7,7 +7,7 @@ import lombok.ToString; import java.time.LocalDateTime; -@Schema(description = "管理后台 - 物品包装信息 Response VO") +@Schema(description = "管理后台 - 物料包装信息 Response VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingUpdateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingUpdateReqVO.java index a9c40b5cd6..309e02aa5f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingUpdateReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingUpdateReqVO.java @@ -5,7 +5,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -@Schema(description = "管理后台 - 物品包装信息 更新 Request VO") +@Schema(description = "管理后台 - 物料包装信息 更新 Request VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/BarbasicController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/BarbasicController.java index 5372078036..49604267f1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/BarbasicController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/labelBarbasic/BarbasicController.java @@ -126,14 +126,14 @@ public class BarbasicController { } @PostMapping("/export-excel-senior") - @Operation(summary = "导出物品基本信息 Excel") + @Operation(summary = "导出物料基本信息 Excel") @PreAuthorize("@ss.hasPermission('wms:itembasic:export')") @OperateLog(type = EXPORT) public void exportItembasicExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { List list = barbasicService.getBarbasicList(conditions); Map mapDropDown = new HashMap<>(); List resultList = this.getExcelVo(list, mapDropDown); - ExcelUtils.write(response, "物品基本信息.xlsx", "数据", BarbasicExcelVO.class, resultList, mapDropDown); + ExcelUtils.write(response, "物料基本信息.xlsx", "数据", BarbasicExcelVO.class, resultList, mapDropDown); } private List getExcelVo(List list, Map mapDropDown) { String[] labelType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.LABEL_TYPE); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java index 6c906f5ec9..b75e838e90 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java @@ -227,7 +227,7 @@ public class LocationController { } @PostMapping("/validate") - @Operation(summary = "校验库位和物品是否能上架") + @Operation(summary = "校验库位和物料是否能上架") @PreAuthorize("@ss.hasPermission('wms:location:validate')") public CommonResult>> validate(@Valid @RequestBody List locationValidateVOList) { return success(locationService.validateLocationAndItem(locationValidateVOList)); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/vo/LocationRecommendVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/vo/LocationRecommendVO.java index e1f21c3e5d..dbcff4ec34 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/vo/LocationRecommendVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/vo/LocationRecommendVO.java @@ -9,8 +9,8 @@ import javax.validation.constraints.NotBlank; @Data public class LocationRecommendVO { - @Schema(description = "物品代码") - @NotBlank(message = "物品代码不能为空") + @Schema(description = "物料代码") + @NotBlank(message = "物料代码不能为空") private String itemCode; @Schema(description = "供应商代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/vo/LocationValidateVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/vo/LocationValidateVO.java index 9c3e16ffe1..0b4c4af9a2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/vo/LocationValidateVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/vo/LocationValidateVO.java @@ -9,8 +9,8 @@ import javax.validation.constraints.NotBlank; @Data public class LocationValidateVO { - @Schema(description = "物品代码") - @NotBlank(message = "物品代码不能为空") + @Schema(description = "物料代码") + @NotBlank(message = "物料代码不能为空") private String itemCode; @Schema(description = "库位代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/vo/OfflinesettlementRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/vo/OfflinesettlementRecordDetailBaseVO.java index 7fea6454fe..eff95f1380 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/vo/OfflinesettlementRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/vo/OfflinesettlementRecordDetailBaseVO.java @@ -41,16 +41,16 @@ public class OfflinesettlementRecordDetailBaseVO { @Schema(description = "库区代码") private String areaCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/vo/OfflinesettlementRecordDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/vo/OfflinesettlementRecordDetailExcelVO.java index 9179240891..14c449aaf8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/vo/OfflinesettlementRecordDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/vo/OfflinesettlementRecordDetailExcelVO.java @@ -41,16 +41,16 @@ public class OfflinesettlementRecordDetailExcelVO { @ExcelProperty("库区代码") private String areaCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/vo/OfflinesettlementRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/vo/OfflinesettlementRecordDetailExportReqVO.java index 2a5368ce22..abf12d6a99 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/vo/OfflinesettlementRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/vo/OfflinesettlementRecordDetailExportReqVO.java @@ -36,16 +36,16 @@ public class OfflinesettlementRecordDetailExportReqVO { @Schema(description = "库区代码") private String areaCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/vo/OfflinesettlementRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/vo/OfflinesettlementRecordDetailPageReqVO.java index 6e09af1386..6e1c3d4bc0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/vo/OfflinesettlementRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/vo/OfflinesettlementRecordDetailPageReqVO.java @@ -38,16 +38,16 @@ public class OfflinesettlementRecordDetailPageReqVO extends PageParam { @Schema(description = "库区代码") private String areaCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/vo/OfflinesettlementRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/vo/OfflinesettlementRecordMainExcelVO.java index f053b5d5a3..06c9b83a4b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/vo/OfflinesettlementRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRecord/vo/OfflinesettlementRecordMainExcelVO.java @@ -101,16 +101,16 @@ public class OfflinesettlementRecordMainExcelVO { @ExcelProperty("库区代码") private String areaCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/vo/OfflinesettlementRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/vo/OfflinesettlementRequestDetailBaseVO.java index 867d81a852..c7d6f913db 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/vo/OfflinesettlementRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/vo/OfflinesettlementRequestDetailBaseVO.java @@ -40,13 +40,13 @@ public class OfflinesettlementRequestDetailBaseVO { @NotNull(message = "库位代码不能为空") private String locationCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -68,8 +68,8 @@ public class OfflinesettlementRequestDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "物品代码不能为空") + @Schema(description = "物料代码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "物料代码不能为空") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/vo/OfflinesettlementRequestDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/vo/OfflinesettlementRequestDetailExcelVO.java index 6e6ea4173a..7cd986f9a6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/vo/OfflinesettlementRequestDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/vo/OfflinesettlementRequestDetailExcelVO.java @@ -36,13 +36,13 @@ public class OfflinesettlementRequestDetailExcelVO { @ExcelProperty("库位代码") private String locationCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") @@ -64,7 +64,7 @@ public class OfflinesettlementRequestDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/vo/OfflinesettlementRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/vo/OfflinesettlementRequestDetailExportReqVO.java index 6aac649cfb..02176f1b7b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/vo/OfflinesettlementRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/vo/OfflinesettlementRequestDetailExportReqVO.java @@ -30,13 +30,13 @@ public class OfflinesettlementRequestDetailExportReqVO { @Schema(description = "库位代码") private String locationCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -58,7 +58,7 @@ public class OfflinesettlementRequestDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/vo/OfflinesettlementRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/vo/OfflinesettlementRequestDetailPageReqVO.java index b5665bf861..6f87c6b6df 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/vo/OfflinesettlementRequestDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/offlinesettlementRequest/vo/OfflinesettlementRequestDetailPageReqVO.java @@ -32,13 +32,13 @@ public class OfflinesettlementRequestDetailPageReqVO extends PageParam { @Schema(description = "库位代码") private String locationCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -60,7 +60,7 @@ public class OfflinesettlementRequestDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/vo/OnlinesettlementRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/vo/OnlinesettlementRecordDetailBaseVO.java index f4dcc98201..d2114e707f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/vo/OnlinesettlementRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/vo/OnlinesettlementRecordDetailBaseVO.java @@ -41,16 +41,16 @@ public class OnlinesettlementRecordDetailBaseVO { @Schema(description = "库区代码") private String areaCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/vo/OnlinesettlementRecordDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/vo/OnlinesettlementRecordDetailExcelVO.java index 951f127d60..717febfd6a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/vo/OnlinesettlementRecordDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/vo/OnlinesettlementRecordDetailExcelVO.java @@ -41,16 +41,16 @@ public class OnlinesettlementRecordDetailExcelVO { @ExcelProperty("库区代码") private String areaCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/vo/OnlinesettlementRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/vo/OnlinesettlementRecordDetailExportReqVO.java index a0d282d8a7..7b8d52e3ad 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/vo/OnlinesettlementRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/vo/OnlinesettlementRecordDetailExportReqVO.java @@ -36,16 +36,16 @@ public class OnlinesettlementRecordDetailExportReqVO { @Schema(description = "库区代码") private String areaCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/vo/OnlinesettlementRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/vo/OnlinesettlementRecordDetailPageReqVO.java index 947a19b4bf..4d512a672f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/vo/OnlinesettlementRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/vo/OnlinesettlementRecordDetailPageReqVO.java @@ -38,16 +38,16 @@ public class OnlinesettlementRecordDetailPageReqVO extends PageParam { @Schema(description = "库区代码") private String areaCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/vo/OnlinesettlementRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/vo/OnlinesettlementRecordMainExcelVO.java index 7ff18f47dc..7f14e001ff 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/vo/OnlinesettlementRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRecord/vo/OnlinesettlementRecordMainExcelVO.java @@ -96,16 +96,16 @@ public class OnlinesettlementRecordMainExcelVO { @ExcelProperty("库区代码") private String areaCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/vo/OnlinesettlementRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/vo/OnlinesettlementRequestDetailBaseVO.java index f5dc9aef3a..c19c683ea6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/vo/OnlinesettlementRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/vo/OnlinesettlementRequestDetailBaseVO.java @@ -40,13 +40,13 @@ public class OnlinesettlementRequestDetailBaseVO { @NotNull(message = "库位代码不能为空") private String locationCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -68,8 +68,8 @@ public class OnlinesettlementRequestDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "物品代码不能为空") + @Schema(description = "物料代码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "物料代码不能为空") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/vo/OnlinesettlementRequestDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/vo/OnlinesettlementRequestDetailExcelVO.java index d9dcc55d5e..bde5951670 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/vo/OnlinesettlementRequestDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/vo/OnlinesettlementRequestDetailExcelVO.java @@ -36,13 +36,13 @@ public class OnlinesettlementRequestDetailExcelVO { @ExcelProperty("库位代码") private String locationCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") @@ -64,7 +64,7 @@ public class OnlinesettlementRequestDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/vo/OnlinesettlementRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/vo/OnlinesettlementRequestDetailExportReqVO.java index 7ad8b42669..f87cfc1636 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/vo/OnlinesettlementRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/vo/OnlinesettlementRequestDetailExportReqVO.java @@ -30,13 +30,13 @@ public class OnlinesettlementRequestDetailExportReqVO { @Schema(description = "库位代码") private String locationCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -58,7 +58,7 @@ public class OnlinesettlementRequestDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/vo/OnlinesettlementRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/vo/OnlinesettlementRequestDetailPageReqVO.java index 564db101c3..4e297281a3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/vo/OnlinesettlementRequestDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/onlinesettlementRequest/vo/OnlinesettlementRequestDetailPageReqVO.java @@ -32,13 +32,13 @@ public class OnlinesettlementRequestDetailPageReqVO extends PageParam { @Schema(description = "库位代码") private String locationCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -60,7 +60,7 @@ public class OnlinesettlementRequestDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageBaseVO.java index 479dffa96f..daacf58be1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageBaseVO.java @@ -27,13 +27,13 @@ public class PackageBaseVO { @NotNull(message = "物料代码不能为空") private String itemCode; - @Schema(description = "物品名称", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "物料名称", requiredMode = Schema.RequiredMode.REQUIRED) private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "批次") @@ -86,7 +86,7 @@ public class PackageBaseVO { @Schema(description = "供应商代码") private String supplierCode; - @Schema(description = "供应商物品代码") + @Schema(description = "供应商物料代码") private String supplierItemCode; @Schema(description = "采购订单号") @@ -122,7 +122,7 @@ public class PackageBaseVO { @Schema(description = "客户月台代码") private String customerDockCode; - @Schema(description = "客户物品代码") + @Schema(description = "客户物料代码") private String customerItemCode; @Schema(description = "销售订单号") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageExcelVO.java index 7baa733c97..96dcc4e7a5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageExcelVO.java @@ -30,13 +30,13 @@ public class PackageExcelVO { @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("批次") @@ -93,7 +93,7 @@ public class PackageExcelVO { @ExcelProperty("供应商代码") private String supplierCode; - @ExcelProperty("供应商物品代码") + @ExcelProperty("供应商物料代码") private String supplierItemCode; @ExcelProperty("采购订单号") @@ -129,7 +129,7 @@ public class PackageExcelVO { @ExcelProperty("客户月台代码") private String customerDockCode; - @ExcelProperty("客户物品代码") + @ExcelProperty("客户物料代码") private String customerItemCode; @ExcelProperty("销售订单号") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageExportReqVO.java index 74b7ad1fa2..0280982ba3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageExportReqVO.java @@ -19,13 +19,13 @@ public class PackageExportReqVO { @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "批次") @@ -78,7 +78,7 @@ public class PackageExportReqVO { @Schema(description = "供应商代码") private String supplierCode; - @Schema(description = "供应商物品代码") + @Schema(description = "供应商物料代码") private String supplierItemCode; @Schema(description = "Demandforecasting号") @@ -114,7 +114,7 @@ public class PackageExportReqVO { @Schema(description = "客户月台代码") private String customerDockCode; - @Schema(description = "客户物品代码") + @Schema(description = "客户物料代码") private String customerItemCode; @Schema(description = "销售订单号") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackagePageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackagePageReqVO.java index 772c1838b3..57f23ab46f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackagePageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackagePageReqVO.java @@ -23,13 +23,13 @@ public class PackagePageReqVO extends PageParam { @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "批次") @@ -82,7 +82,7 @@ public class PackagePageReqVO extends PageParam { @Schema(description = "供应商代码") private String supplierCode; - @Schema(description = "供应商物品代码") + @Schema(description = "供应商物料代码") private String supplierItemCode; @Schema(description = "采购订单号") @@ -118,7 +118,7 @@ public class PackagePageReqVO extends PageParam { @Schema(description = "客户月台代码") private String customerDockCode; - @Schema(description = "客户物品代码") + @Schema(description = "客户物料代码") private String customerItemCode; @Schema(description = "销售订单号") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailBaseVO.java index 2e927a8e7f..9fcd7adec3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailBaseVO.java @@ -61,7 +61,7 @@ public class PackagemergeDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注", example = "你说的对") @@ -70,13 +70,13 @@ public class PackagemergeDetailBaseVO { @Schema(description = "地点ID", example = "29185") private String siteId; - @Schema(description = "物品名称", example = "芋艿") + @Schema(description = "物料名称", example = "芋艿") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailExcelVO.java index 58e7ea5fab..0b9180ed96 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailExcelVO.java @@ -66,7 +66,7 @@ public class PackagemergeDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -78,13 +78,13 @@ public class PackagemergeDetailExcelVO { @ExcelProperty("地点ID") private String siteId; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailExportReqVO.java index d58811d9d8..13d93e5e81 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailExportReqVO.java @@ -60,7 +60,7 @@ public class PackagemergeDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注", example = "你说的对") @@ -73,13 +73,13 @@ public class PackagemergeDetailExportReqVO { @Schema(description = "地点ID", example = "29185") private String siteId; - @Schema(description = "物品名称", example = "芋艿") + @Schema(description = "物料名称", example = "芋艿") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailPageReqVO.java index f74d45b56f..e3640ff10d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagemergemain/vo/PackagemergeDetailPageReqVO.java @@ -62,7 +62,7 @@ public class PackagemergeDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注", example = "你说的对") @@ -75,13 +75,13 @@ public class PackagemergeDetailPageReqVO extends PageParam { @Schema(description = "地点ID", example = "29185") private String siteId; - @Schema(description = "物品名称", example = "芋艿") + @Schema(description = "物料名称", example = "芋艿") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailBaseVO.java index 1abfa1959c..cd97d7b5d9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailBaseVO.java @@ -61,7 +61,7 @@ public class PackageoverDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注", example = "你说的对") @@ -70,13 +70,13 @@ public class PackageoverDetailBaseVO { @Schema(description = "地点ID", example = "14071") private String siteId; - @Schema(description = "物品名称", example = "王五") + @Schema(description = "物料名称", example = "王五") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailExcelVO.java index 8f80cab9e4..6721de1ed7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailExcelVO.java @@ -66,7 +66,7 @@ public class PackageoverDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -78,13 +78,13 @@ public class PackageoverDetailExcelVO { @ExcelProperty("地点ID") private String siteId; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailExportReqVO.java index d841f1bd39..54bbd8f95c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailExportReqVO.java @@ -60,7 +60,7 @@ public class PackageoverDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注", example = "你说的对") @@ -73,13 +73,13 @@ public class PackageoverDetailExportReqVO { @Schema(description = "地点ID", example = "14071") private String siteId; - @Schema(description = "物品名称", example = "王五") + @Schema(description = "物料名称", example = "王五") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailPageReqVO.java index db4e926f08..3be446e14f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageovermain/vo/PackageoverDetailPageReqVO.java @@ -62,7 +62,7 @@ public class PackageoverDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注", example = "你说的对") @@ -75,13 +75,13 @@ public class PackageoverDetailPageReqVO extends PageParam { @Schema(description = "地点ID", example = "14071") private String siteId; - @Schema(description = "物品名称", example = "王五") + @Schema(description = "物料名称", example = "王五") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailBaseVO.java index a20a673ced..96841a34f2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailBaseVO.java @@ -61,7 +61,7 @@ public class PackagesplitDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注", example = "你说的对") @@ -70,13 +70,13 @@ public class PackagesplitDetailBaseVO { @Schema(description = "地点ID", example = "11960") private String siteId; - @Schema(description = "物品名称", example = "芋艿") + @Schema(description = "物料名称", example = "芋艿") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailExcelVO.java index de784de9a2..3c359e8dc4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailExcelVO.java @@ -66,7 +66,7 @@ public class PackagesplitDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -78,13 +78,13 @@ public class PackagesplitDetailExcelVO { @ExcelProperty("地点ID") private String siteId; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailExportReqVO.java index cb2e941af8..56ca687fdb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailExportReqVO.java @@ -60,7 +60,7 @@ public class PackagesplitDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注", example = "你说的对") @@ -73,13 +73,13 @@ public class PackagesplitDetailExportReqVO { @Schema(description = "地点ID", example = "11960") private String siteId; - @Schema(description = "物品名称", example = "芋艿") + @Schema(description = "物料名称", example = "芋艿") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailPageReqVO.java index 64ade97c85..2b165b5d52 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packagesplitmain/vo/PackagesplitDetailPageReqVO.java @@ -62,7 +62,7 @@ public class PackagesplitDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注", example = "你说的对") @@ -75,13 +75,13 @@ public class PackagesplitDetailPageReqVO extends PageParam { @Schema(description = "地点ID", example = "11960") private String siteId; - @Schema(description = "物品名称", example = "芋艿") + @Schema(description = "物料名称", example = "芋艿") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobDetailBaseVO.java index fc8286f0e8..3695aaffab 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobDetailBaseVO.java @@ -43,16 +43,16 @@ public class PickJobDetailBaseVO { @NotNull(message = "到库位代码不能为空") private String toLocationCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobDetailExcelVO.java index f185363107..5d9d4293c3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobDetailExcelVO.java @@ -39,16 +39,16 @@ public class PickJobDetailExcelVO { @ExcelProperty("到库位代码") private String toLocationCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobDetailExportReqVO.java index 94364b17f8..8204d13a6c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobDetailExportReqVO.java @@ -33,16 +33,16 @@ public class PickJobDetailExportReqVO { @Schema(description = "到库位代码") private String toLocationCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobDetailPageReqVO.java index 9c0a35f4e1..3ced09dca9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickJob/vo/PickJobDetailPageReqVO.java @@ -35,16 +35,16 @@ public class PickJobDetailPageReqVO extends PageParam { @Schema(description = "到库位代码") private String toLocationCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/vo/PickRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/vo/PickRecordDetailBaseVO.java index 2500cd1181..0edbeb1c7b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/vo/PickRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/vo/PickRecordDetailBaseVO.java @@ -69,7 +69,7 @@ public class PickRecordDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -82,13 +82,13 @@ public class PickRecordDetailBaseVO { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/vo/PickRecordDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/vo/PickRecordDetailExcelVO.java index fee25203d4..538fbfb1c6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/vo/PickRecordDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/vo/PickRecordDetailExcelVO.java @@ -62,7 +62,7 @@ public class PickRecordDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -74,13 +74,13 @@ public class PickRecordDetailExcelVO { @ExcelProperty("创建者Id") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/vo/PickRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/vo/PickRecordDetailExportReqVO.java index bed5522286..bad7bcb637 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/vo/PickRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/vo/PickRecordDetailExportReqVO.java @@ -57,7 +57,7 @@ public class PickRecordDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -70,13 +70,13 @@ public class PickRecordDetailExportReqVO { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/vo/PickRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/vo/PickRecordDetailPageReqVO.java index 6df741696e..10206d5aa4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/vo/PickRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRecord/vo/PickRecordDetailPageReqVO.java @@ -59,7 +59,7 @@ public class PickRecordDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -72,13 +72,13 @@ public class PickRecordDetailPageReqVO extends PageParam { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/vo/PickRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/vo/PickRequestDetailBaseVO.java index 2a13964c8f..46281cbc4d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/vo/PickRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/vo/PickRequestDetailBaseVO.java @@ -33,7 +33,7 @@ public class PickRequestDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -46,13 +46,13 @@ public class PickRequestDetailBaseVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/vo/PickRequestDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/vo/PickRequestDetailExcelVO.java index 31ef223c51..ebe7d3e190 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/vo/PickRequestDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/vo/PickRequestDetailExcelVO.java @@ -29,7 +29,7 @@ public class PickRequestDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -41,13 +41,13 @@ public class PickRequestDetailExcelVO { @ExcelProperty("创建者用户名") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/vo/PickRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/vo/PickRequestDetailExportReqVO.java index ae12b950c3..d09998d4ce 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/vo/PickRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/vo/PickRequestDetailExportReqVO.java @@ -24,7 +24,7 @@ public class PickRequestDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -37,13 +37,13 @@ public class PickRequestDetailExportReqVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/vo/PickRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/vo/PickRequestDetailPageReqVO.java index aa495ff265..953100654d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/vo/PickRequestDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/pickRequest/vo/PickRequestDetailPageReqVO.java @@ -26,7 +26,7 @@ public class PickRequestDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -39,13 +39,13 @@ public class PickRequestDetailPageReqVO extends PageParam { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/vo/PreparetoissueDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/vo/PreparetoissueDetailBaseVO.java index 83eee2ca8d..6dcfb55685 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/vo/PreparetoissueDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/vo/PreparetoissueDetailBaseVO.java @@ -36,8 +36,8 @@ public class PreparetoissueDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "物品代码不能为空") + @Schema(description = "物料代码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "物料代码不能为空") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/vo/PreparetoissueDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/vo/PreparetoissueDetailExcelVO.java index 35084b8be4..44c062b576 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/vo/PreparetoissueDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/vo/PreparetoissueDetailExcelVO.java @@ -33,7 +33,7 @@ public class PreparetoissueDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/vo/PreparetoissueDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/vo/PreparetoissueDetailExportReqVO.java index 824869da79..052cb1e88d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/vo/PreparetoissueDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/vo/PreparetoissueDetailExportReqVO.java @@ -28,7 +28,7 @@ public class PreparetoissueDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/vo/PreparetoissueDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/vo/PreparetoissueDetailPageReqVO.java index 0a150f1adc..5236a12c5d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/vo/PreparetoissueDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/vo/PreparetoissueDetailPageReqVO.java @@ -30,7 +30,7 @@ public class PreparetoissueDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/vo/PreparetoissueMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/vo/PreparetoissueMainExcelVO.java index 5a0a483f23..342ec4eacf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/vo/PreparetoissueMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/vo/PreparetoissueMainExcelVO.java @@ -78,7 +78,7 @@ public class PreparetoissueMainExcelVO { @ExcelProperty("最后更新者用户名") private String updater; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("目标库位") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobDetailBaseVO.java index 0b33b3c9b4..1accac8212 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobDetailBaseVO.java @@ -58,16 +58,16 @@ public class ProductdismantleJobDetailBaseVO { @Schema(description = "标包单位") private String stdPackUnit; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobDetailExcelVO.java index efe9b5ee05..42769be3b7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobDetailExcelVO.java @@ -57,16 +57,16 @@ public class ProductdismantleJobDetailExcelVO { @DictFormat("pack_unit") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String stdPackUnit; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobDetailExportReqVO.java index 47a59a0c89..8c897cbfa0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobDetailExportReqVO.java @@ -50,16 +50,16 @@ public class ProductdismantleJobDetailExportReqVO { @Schema(description = "标包单位") private String stdPackUnit; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobDetailPageReqVO.java index c76f35ce1f..5523341bf2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobDetailPageReqVO.java @@ -52,16 +52,16 @@ public class ProductdismantleJobDetailPageReqVO extends PageParam { @Schema(description = "标包单位") private String stdPackUnit; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailaBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailaBaseVO.java index d970aa559e..e7ae39ae20 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailaBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailaBaseVO.java @@ -66,7 +66,7 @@ public class ProductdismantleRecordDetailaBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -79,13 +79,13 @@ public class ProductdismantleRecordDetailaBaseVO { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailaExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailaExcelVO.java index e1a4a841de..f4fb864464 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailaExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailaExcelVO.java @@ -64,7 +64,7 @@ public class ProductdismantleRecordDetailaExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -76,13 +76,13 @@ public class ProductdismantleRecordDetailaExcelVO { @ExcelProperty("创建者Id") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailaExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailaExportReqVO.java index 363f6de401..1c5023edf0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailaExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailaExportReqVO.java @@ -59,7 +59,7 @@ public class ProductdismantleRecordDetailaExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -72,13 +72,13 @@ public class ProductdismantleRecordDetailaExportReqVO { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailaPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailaPageReqVO.java index f065091c1d..eec7adb600 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailaPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailaPageReqVO.java @@ -61,7 +61,7 @@ public class ProductdismantleRecordDetailaPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -74,13 +74,13 @@ public class ProductdismantleRecordDetailaPageReqVO extends PageParam { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbBaseVO.java index 4137c0cfb2..9a4653ace8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbBaseVO.java @@ -46,7 +46,7 @@ public class ProductdismantleRecordDetailbBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -59,13 +59,13 @@ public class ProductdismantleRecordDetailbBaseVO { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbExcelVO.java index e0eb2a3f7e..70fd8a24c8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbExcelVO.java @@ -44,7 +44,7 @@ public class ProductdismantleRecordDetailbExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -56,13 +56,13 @@ public class ProductdismantleRecordDetailbExcelVO { @ExcelProperty("创建者Id") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbExportReqVO.java index f93f49bfdf..4dd9eb2c17 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbExportReqVO.java @@ -39,7 +39,7 @@ public class ProductdismantleRecordDetailbExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -52,13 +52,13 @@ public class ProductdismantleRecordDetailbExportReqVO { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbPageReqVO.java index ae2677e4f9..cb6d0f7dce 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordDetailbPageReqVO.java @@ -44,7 +44,7 @@ public class ProductdismantleRecordDetailbPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -57,13 +57,13 @@ public class ProductdismantleRecordDetailbPageReqVO extends PageParam { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordMainExcelVO.java index 267f11c85a..f4b2bf64f3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRecord/vo/ProductdismantleRecordMainExcelVO.java @@ -127,16 +127,16 @@ public class ProductdismantleRecordMainExcelVO { @ExcelProperty("BOM版本") private String bomVersion; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailaBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailaBaseVO.java index e111548764..d559182b3d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailaBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailaBaseVO.java @@ -61,7 +61,7 @@ public class ProductdismantleRequestDetailaBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -74,13 +74,13 @@ public class ProductdismantleRequestDetailaBaseVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailaExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailaExcelVO.java index 79e8d11271..323ab28d82 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailaExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailaExcelVO.java @@ -60,7 +60,7 @@ public class ProductdismantleRequestDetailaExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -72,13 +72,13 @@ public class ProductdismantleRequestDetailaExcelVO { @ExcelProperty("创建者用户名") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailaExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailaExportReqVO.java index 03135a248b..d7aa36bc62 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailaExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailaExportReqVO.java @@ -54,7 +54,7 @@ public class ProductdismantleRequestDetailaExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -67,13 +67,13 @@ public class ProductdismantleRequestDetailaExportReqVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailaPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailaPageReqVO.java index b0f274168d..01eff842f4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailaPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailaPageReqVO.java @@ -55,7 +55,7 @@ public class ProductdismantleRequestDetailaPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -68,13 +68,13 @@ public class ProductdismantleRequestDetailaPageReqVO extends PageParam { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbBaseVO.java index fea445adf6..acfeec8daf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbBaseVO.java @@ -26,8 +26,8 @@ public class ProductdismantleRequestDetailbBaseVO { @Schema(description = "BOM版本") private String bomVersion; - @Schema(description = "物品代码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "物品代码不能为空") + @Schema(description = "物料代码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "物料代码不能为空") private String itemCode; @Schema(description = "单据号") @@ -41,13 +41,13 @@ public class ProductdismantleRequestDetailbBaseVO { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime createTime; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbExcelVO.java index 587a37f7a6..825b28e5e4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbExcelVO.java @@ -24,7 +24,7 @@ public class ProductdismantleRequestDetailbExcelVO { @ExcelProperty("BOM版本") private String bomVersion; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("单据号") @@ -36,13 +36,13 @@ public class ProductdismantleRequestDetailbExcelVO { @ExcelProperty("创建时间") private LocalDateTime createTime; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbExportReqVO.java index 6fa62730c6..42ee077164 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbExportReqVO.java @@ -19,7 +19,7 @@ public class ProductdismantleRequestDetailbExportReqVO { @Schema(description = "BOM版本") private String bomVersion; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "单据号") @@ -32,13 +32,13 @@ public class ProductdismantleRequestDetailbExportReqVO { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbPageReqVO.java index 05bc9c287e..3489e4942c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbPageReqVO.java @@ -24,7 +24,7 @@ public class ProductdismantleRequestDetailbPageReqVO extends PageParam { @Schema(description = "BOM版本") private String bomVersion; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "单据号") @@ -37,13 +37,13 @@ public class ProductdismantleRequestDetailbPageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbRespVO.java index a4ebaeb48c..595bfd5d2c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailbRespVO.java @@ -13,10 +13,10 @@ import java.math.BigDecimal; @ToString(callSuper = true) public class ProductdismantleRequestDetailbRespVO extends ProductdismantleRequestDetailbBaseVO { - @Schema(description = "物品编码") + @Schema(description = "物料编码") private String itemCode; - @Schema(description = "物品单位") + @Schema(description = "物料单位") private String uom; @Schema(description = "bom数量") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestMainExcelVO.java index c9dfa3d022..42f83453fd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestMainExcelVO.java @@ -130,16 +130,16 @@ public class ProductdismantleRequestMainExcelVO { @DictFormat(DictTypeConstants.INVENTORY_STATUS) private String inventoryStatus; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailBaseVO.java index 410c16d67e..a0d71819d6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailBaseVO.java @@ -35,7 +35,7 @@ public class ProductionDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailExcelVO.java index 005fe74665..dedb05baed 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailExcelVO.java @@ -34,7 +34,7 @@ public class ProductionDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailExportReqVO.java index cac5ce7d1c..d20e327759 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailExportReqVO.java @@ -27,7 +27,7 @@ public class ProductionDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailPageReqVO.java index d94afbfaea..cb63566855 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailPageReqVO.java @@ -29,7 +29,7 @@ public class ProductionDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainExcelVO.java index dc2f0bda65..71756b4912 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainExcelVO.java @@ -86,7 +86,7 @@ public class ProductionMainExcelVO { @ExcelProperty("不合格数量") private BigDecimal notGoodQty; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("计划数量") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainImportVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainImportVO.java index 6881dffddf..ed0808fbce 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainImportVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainImportVO.java @@ -66,7 +66,7 @@ public class ProductionMainImportVO { @ExcelProperty("Bom版本") @NotNull private String bomVersion; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") @NotNull private String itemCode; @ExcelProperty("计划数量") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineItemImportErrorVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineItemImportErrorVO.java index 710059ad20..7f9601d115 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineItemImportErrorVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineItemImportErrorVO.java @@ -26,7 +26,7 @@ public class ProductionlineItemImportErrorVO { @ExcelProperty("产线代码") private String productionLineCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty(value = "是否可用", converter = DictConvert.class) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineItemImportExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineItemImportExcelVO.java index 0a46b7272c..b35783561d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineItemImportExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineItemImportExcelVO.java @@ -29,7 +29,7 @@ public class ProductionlineItemImportExcelVO { @ExcelProperty("产线代码") private String productionLineCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty(value = "是否可用", converter = DictConvert.class) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemBaseVO.java index 4ac4efe834..6232f8ce59 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemBaseVO.java @@ -25,8 +25,8 @@ public class ProductionlineitemBaseVO { @Schema(description = "产线代码", requiredMode = Schema.RequiredMode.REQUIRED) private String productionLineCode; - @Schema(description = "物品代码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "物品代码不能为空") + @Schema(description = "物料代码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "物料代码不能为空") private String itemCode; @Schema(description = "原料库位", requiredMode = Schema.RequiredMode.REQUIRED) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemExcelVO.java index abff5450b3..468ff852ec 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemExcelVO.java @@ -26,7 +26,7 @@ public class ProductionlineitemExcelVO { @ExcelProperty("产线代码") private String productionLineCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty(value = "是否可用", converter = DictConvert.class) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemExportReqVO.java index 6931fc5851..488fcfc023 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemExportReqVO.java @@ -18,7 +18,7 @@ public class ProductionlineitemExportReqVO { @Schema(description = "产线代码") private String productionLineCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "原料库位") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemPageReqVO.java index eda3c3cff3..9ebfd7a70a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemPageReqVO.java @@ -23,7 +23,7 @@ public class ProductionlineitemPageReqVO extends PageParam { @Schema(description = "产线代码") private String productionLineCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "原料库位") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobDetailBaseVO.java index 9fd235ad14..ce03cb7e00 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobDetailBaseVO.java @@ -47,16 +47,16 @@ public class ProductionreceiptJobDetailBaseVO { @Schema(description = "到库位代码") private String toLocationCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobDetailExcelVO.java index 8844736b05..0da039d56a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobDetailExcelVO.java @@ -47,16 +47,16 @@ public class ProductionreceiptJobDetailExcelVO { @ExcelProperty("到库位代码") private String toLocationCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobDetailExportReqVO.java index e16c486e79..28c5a733cc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobDetailExportReqVO.java @@ -42,16 +42,16 @@ public class ProductionreceiptJobDetailExportReqVO { @Schema(description = "到库位代码") private String toLocationCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobDetailPageReqVO.java index 50272c6774..5476a6bf26 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobDetailPageReqVO.java @@ -44,16 +44,16 @@ public class ProductionreceiptJobDetailPageReqVO extends PageParam { @Schema(description = "到库位代码") private String toLocationCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobMainExcelVO.java index b6b7dba0a9..a8d9d8bce3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobMainExcelVO.java @@ -180,16 +180,16 @@ public class ProductionreceiptJobMainExcelVO { @ExcelProperty("到库位代码") private String toLocationCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordDetailBaseVO.java index ea6ef24f42..2771d1ae46 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordDetailBaseVO.java @@ -65,8 +65,8 @@ public class ProductionreceiptRecordDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "物品代码不能为空") + @Schema(description = "物料代码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "物料代码不能为空") private String itemCode; @Schema(description = "备注") @@ -81,13 +81,13 @@ public class ProductionreceiptRecordDetailBaseVO { @NotNull(message = "创建者Id不能为空") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordDetailExcelVO.java index 183a912c38..19e86113db 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordDetailExcelVO.java @@ -65,7 +65,7 @@ public class ProductionreceiptRecordDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -77,13 +77,13 @@ public class ProductionreceiptRecordDetailExcelVO { @ExcelProperty("创建者Id") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordDetailExportReqVO.java index fc916e1f87..006cd2acc9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordDetailExportReqVO.java @@ -60,7 +60,7 @@ public class ProductionreceiptRecordDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -73,13 +73,13 @@ public class ProductionreceiptRecordDetailExportReqVO { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordDetailPageReqVO.java index 0582256b59..1dfd301a3c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordDetailPageReqVO.java @@ -62,7 +62,7 @@ public class ProductionreceiptRecordDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -75,13 +75,13 @@ public class ProductionreceiptRecordDetailPageReqVO extends PageParam { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordMainExcelVO.java index 213d953be5..2b9a009eb8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptRecord/vo/ProductionreceiptRecordMainExcelVO.java @@ -162,16 +162,16 @@ public class ProductionreceiptRecordMainExcelVO { @ExcelProperty("到货主代码") private String toOwnerCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/vo/ProductionreturnJobDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/vo/ProductionreturnJobDetailBaseVO.java index 6c5e32417d..cb18718432 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/vo/ProductionreturnJobDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/vo/ProductionreturnJobDetailBaseVO.java @@ -44,16 +44,16 @@ public class ProductionreturnJobDetailBaseVO { @Schema(description = "到库位代码") private String toLocationCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/vo/ProductionreturnJobDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/vo/ProductionreturnJobDetailExcelVO.java index 63d88a1218..5729e3adfc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/vo/ProductionreturnJobDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/vo/ProductionreturnJobDetailExcelVO.java @@ -44,16 +44,16 @@ public class ProductionreturnJobDetailExcelVO { @ExcelProperty("到库位代码") private String toLocationCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/vo/ProductionreturnJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/vo/ProductionreturnJobDetailExportReqVO.java index b407c5e73c..5a6dc978d9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/vo/ProductionreturnJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/vo/ProductionreturnJobDetailExportReqVO.java @@ -39,16 +39,16 @@ public class ProductionreturnJobDetailExportReqVO { @Schema(description = "到库位代码") private String toLocationCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/vo/ProductionreturnJobDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/vo/ProductionreturnJobDetailPageReqVO.java index 4ffe50f037..3f24b8f5f4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/vo/ProductionreturnJobDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/vo/ProductionreturnJobDetailPageReqVO.java @@ -41,16 +41,16 @@ public class ProductionreturnJobDetailPageReqVO extends PageParam { @Schema(description = "到库位代码") private String toLocationCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/vo/ProductionreturnJobMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/vo/ProductionreturnJobMainExcelVO.java index 60285b8310..c2296a32c4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/vo/ProductionreturnJobMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/vo/ProductionreturnJobMainExcelVO.java @@ -175,16 +175,16 @@ public class ProductionreturnJobMainExcelVO { @ExcelProperty("到库位代码") private String toLocationCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/vo/ProductionreturnRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/vo/ProductionreturnRecordDetailBaseVO.java index d0e63358f5..ca2db45ebf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/vo/ProductionreturnRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/vo/ProductionreturnRecordDetailBaseVO.java @@ -75,7 +75,7 @@ public class ProductionreturnRecordDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -88,13 +88,13 @@ public class ProductionreturnRecordDetailBaseVO { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/vo/ProductionreturnRecordDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/vo/ProductionreturnRecordDetailExcelVO.java index cc1ebe7957..4b3e49171e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/vo/ProductionreturnRecordDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/vo/ProductionreturnRecordDetailExcelVO.java @@ -74,7 +74,7 @@ public class ProductionreturnRecordDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -86,13 +86,13 @@ public class ProductionreturnRecordDetailExcelVO { @ExcelProperty("创建者Id") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/vo/ProductionreturnRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/vo/ProductionreturnRecordDetailExportReqVO.java index ee7ca3338f..e8a6033149 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/vo/ProductionreturnRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/vo/ProductionreturnRecordDetailExportReqVO.java @@ -69,7 +69,7 @@ public class ProductionreturnRecordDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -82,13 +82,13 @@ public class ProductionreturnRecordDetailExportReqVO { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/vo/ProductionreturnRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/vo/ProductionreturnRecordDetailPageReqVO.java index 8a3ef8b3c7..bd4c0cd567 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/vo/ProductionreturnRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/vo/ProductionreturnRecordDetailPageReqVO.java @@ -71,7 +71,7 @@ public class ProductionreturnRecordDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -84,13 +84,13 @@ public class ProductionreturnRecordDetailPageReqVO extends PageParam { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/vo/ProductionreturnRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/vo/ProductionreturnRecordMainExcelVO.java index db397ecd1d..c05a8767b0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/vo/ProductionreturnRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/vo/ProductionreturnRecordMainExcelVO.java @@ -141,16 +141,16 @@ public class ProductionreturnRecordMainExcelVO { @ExcelProperty("到库区代码") private String toAreaCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/vo/ProductionreturnRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/vo/ProductionreturnRequestDetailBaseVO.java index c4f8ca81e7..5841f687d7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/vo/ProductionreturnRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/vo/ProductionreturnRequestDetailBaseVO.java @@ -48,7 +48,7 @@ public class ProductionreturnRequestDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -61,13 +61,13 @@ public class ProductionreturnRequestDetailBaseVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/vo/ProductionreturnRequestDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/vo/ProductionreturnRequestDetailExcelVO.java index 7d8f91850f..517cbb4c7c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/vo/ProductionreturnRequestDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/vo/ProductionreturnRequestDetailExcelVO.java @@ -48,7 +48,7 @@ public class ProductionreturnRequestDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -60,13 +60,13 @@ public class ProductionreturnRequestDetailExcelVO { @ExcelProperty("创建者用户名") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/vo/ProductionreturnRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/vo/ProductionreturnRequestDetailExportReqVO.java index ff6b879710..61bf421ab7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/vo/ProductionreturnRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/vo/ProductionreturnRequestDetailExportReqVO.java @@ -42,7 +42,7 @@ public class ProductionreturnRequestDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -55,13 +55,13 @@ public class ProductionreturnRequestDetailExportReqVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/vo/ProductionreturnRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/vo/ProductionreturnRequestDetailPageReqVO.java index 1e7a1b0468..5692cda8e7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/vo/ProductionreturnRequestDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/vo/ProductionreturnRequestDetailPageReqVO.java @@ -44,7 +44,7 @@ public class ProductionreturnRequestDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -57,13 +57,13 @@ public class ProductionreturnRequestDetailPageReqVO extends PageParam { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/vo/ProductionreturnRequestImportVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/vo/ProductionreturnRequestImportVO.java index d7889b97da..88240dcfde 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/vo/ProductionreturnRequestImportVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/vo/ProductionreturnRequestImportVO.java @@ -36,7 +36,7 @@ public class ProductionreturnRequestImportVO { @ExcelProperty("工位代码") private String workStationCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("数量") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/vo/ProductionreturnRequestMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/vo/ProductionreturnRequestMainExcelVO.java index 187dffcb2a..b6dd4fae5e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/vo/ProductionreturnRequestMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/vo/ProductionreturnRequestMainExcelVO.java @@ -114,16 +114,16 @@ public class ProductionreturnRequestMainExcelVO { @ExcelProperty("从库位代码") private String fromLocationCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/vo/ProductputawayJobDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/vo/ProductputawayJobDetailBaseVO.java index 1c17239385..4905e95810 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/vo/ProductputawayJobDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/vo/ProductputawayJobDetailBaseVO.java @@ -44,16 +44,16 @@ public class ProductputawayJobDetailBaseVO { @Schema(description = "到库位代码") private String toLocationCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/vo/ProductputawayJobDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/vo/ProductputawayJobDetailExcelVO.java index 0e923ce227..331e02c099 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/vo/ProductputawayJobDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/vo/ProductputawayJobDetailExcelVO.java @@ -44,16 +44,16 @@ public class ProductputawayJobDetailExcelVO { @ExcelProperty("到库位代码") private String toLocationCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/vo/ProductputawayJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/vo/ProductputawayJobDetailExportReqVO.java index 33ac97872d..1f8e6bef83 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/vo/ProductputawayJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/vo/ProductputawayJobDetailExportReqVO.java @@ -39,16 +39,16 @@ public class ProductputawayJobDetailExportReqVO { @Schema(description = "到库位代码") private String toLocationCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/vo/ProductputawayJobDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/vo/ProductputawayJobDetailPageReqVO.java index 4d9d687601..f2b033bd52 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/vo/ProductputawayJobDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/vo/ProductputawayJobDetailPageReqVO.java @@ -41,16 +41,16 @@ public class ProductputawayJobDetailPageReqVO extends PageParam { @Schema(description = "到库位代码") private String toLocationCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/vo/ProductputawayJobMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/vo/ProductputawayJobMainExcelVO.java index 1adce7b032..ffe98a85dc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/vo/ProductputawayJobMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/vo/ProductputawayJobMainExcelVO.java @@ -172,16 +172,16 @@ public class ProductputawayJobMainExcelVO { @ExcelProperty("到库位代码") private String toLocationCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/vo/ProductputawayRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/vo/ProductputawayRecordDetailBaseVO.java index ae8a41cf46..e5ec1ef1d2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/vo/ProductputawayRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/vo/ProductputawayRecordDetailBaseVO.java @@ -74,7 +74,7 @@ public class ProductputawayRecordDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -87,13 +87,13 @@ public class ProductputawayRecordDetailBaseVO { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/vo/ProductputawayRecordDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/vo/ProductputawayRecordDetailExcelVO.java index 9eb1bbde14..e4e99fd113 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/vo/ProductputawayRecordDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/vo/ProductputawayRecordDetailExcelVO.java @@ -74,7 +74,7 @@ public class ProductputawayRecordDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -86,13 +86,13 @@ public class ProductputawayRecordDetailExcelVO { @ExcelProperty("创建者Id") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/vo/ProductputawayRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/vo/ProductputawayRecordDetailExportReqVO.java index f2e424e4b2..59b9037f38 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/vo/ProductputawayRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/vo/ProductputawayRecordDetailExportReqVO.java @@ -69,7 +69,7 @@ public class ProductputawayRecordDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -82,13 +82,13 @@ public class ProductputawayRecordDetailExportReqVO { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/vo/ProductputawayRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/vo/ProductputawayRecordDetailPageReqVO.java index 7e788faaa4..e5f95dde37 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/vo/ProductputawayRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/vo/ProductputawayRecordDetailPageReqVO.java @@ -71,7 +71,7 @@ public class ProductputawayRecordDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -84,13 +84,13 @@ public class ProductputawayRecordDetailPageReqVO extends PageParam { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/vo/ProductputawayRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/vo/ProductputawayRecordMainExcelVO.java index 6421e688b7..fdee63ef9e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/vo/ProductputawayRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRecord/vo/ProductputawayRecordMainExcelVO.java @@ -147,16 +147,16 @@ public class ProductputawayRecordMainExcelVO { @ExcelProperty("到库区代码") private String toAreaCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayImportExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayImportExcelVO.java index 60b0849ab0..a9fb9ca16b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayImportExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayImportExcelVO.java @@ -38,7 +38,7 @@ public class ProductputawayImportExcelVO { @ExcelProperty("从库位代码") private String fromLocationCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayImportVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayImportVO.java index a6d8a6b865..f35d511e18 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayImportVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayImportVO.java @@ -45,7 +45,7 @@ public class ProductputawayImportVO { @ExcelProperty("从库位代码") private String fromLocationCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestDetailBaseVO.java index 003a8b13a3..0b72b4d733 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestDetailBaseVO.java @@ -45,7 +45,7 @@ public class ProductputawayRequestDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -58,13 +58,13 @@ public class ProductputawayRequestDetailBaseVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestDetailExcelVO.java index f7fa26da5c..e7ae81df1f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestDetailExcelVO.java @@ -45,7 +45,7 @@ public class ProductputawayRequestDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -57,13 +57,13 @@ public class ProductputawayRequestDetailExcelVO { @ExcelProperty("创建者用户名") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestDetailExportReqVO.java index 42724934de..4c630b30d9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestDetailExportReqVO.java @@ -39,7 +39,7 @@ public class ProductputawayRequestDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -52,13 +52,13 @@ public class ProductputawayRequestDetailExportReqVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestDetailPageReqVO.java index 9cbf0627a2..1a1d087e94 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestDetailPageReqVO.java @@ -41,7 +41,7 @@ public class ProductputawayRequestDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -54,13 +54,13 @@ public class ProductputawayRequestDetailPageReqVO extends PageParam { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestImportVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestImportVO.java index 4ba2bc914d..a10d4f047c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestImportVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestImportVO.java @@ -21,7 +21,7 @@ public class ProductputawayRequestImportVO { private String dueTime; // 子表数据 - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("包装号") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestMainExcelVO.java index 81d79239da..574d9dfab1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestMainExcelVO.java @@ -120,16 +120,16 @@ public class ProductputawayRequestMainExcelVO { @ExcelProperty("从库位代码") private String fromLocationCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/vo/ProductreceiptJobDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/vo/ProductreceiptJobDetailBaseVO.java index 52496f3cca..7f70ea2631 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/vo/ProductreceiptJobDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/vo/ProductreceiptJobDetailBaseVO.java @@ -67,16 +67,16 @@ public class ProductreceiptJobDetailBaseVO { @Schema(description = "标包单位") private String stdPackUnit; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/vo/ProductreceiptJobDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/vo/ProductreceiptJobDetailExcelVO.java index ef3942e159..528ef21b78 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/vo/ProductreceiptJobDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/vo/ProductreceiptJobDetailExcelVO.java @@ -66,16 +66,16 @@ public class ProductreceiptJobDetailExcelVO { @DictFormat("pack_unit") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String stdPackUnit; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/vo/ProductreceiptJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/vo/ProductreceiptJobDetailExportReqVO.java index 7c89754f6e..d3b026381f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/vo/ProductreceiptJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/vo/ProductreceiptJobDetailExportReqVO.java @@ -59,16 +59,16 @@ public class ProductreceiptJobDetailExportReqVO { @Schema(description = "标包单位") private String stdPackUnit; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/vo/ProductreceiptJobDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/vo/ProductreceiptJobDetailPageReqVO.java index eae0489317..456e26283f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/vo/ProductreceiptJobDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/vo/ProductreceiptJobDetailPageReqVO.java @@ -61,16 +61,16 @@ public class ProductreceiptJobDetailPageReqVO extends PageParam { @Schema(description = "标包单位") private String stdPackUnit; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/vo/ProductreceiptJobMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/vo/ProductreceiptJobMainExcelVO.java index cf63906809..36265ac88c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/vo/ProductreceiptJobMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/vo/ProductreceiptJobMainExcelVO.java @@ -194,16 +194,16 @@ public class ProductreceiptJobMainExcelVO { @DictFormat(DictTypeConstants.UOM) private String stdPackUnit; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/BackflushRecordDetailbBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/BackflushRecordDetailbBaseVO.java index ba4a498f1a..1655d86fb8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/BackflushRecordDetailbBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/BackflushRecordDetailbBaseVO.java @@ -43,13 +43,13 @@ public class BackflushRecordDetailbBaseVO { @Schema(description = "从库区代码") private String fromAreaCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -64,8 +64,8 @@ public class BackflushRecordDetailbBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "物品代码不能为空") + @Schema(description = "物料代码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "物料代码不能为空") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/BackflushRecordDetailbExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/BackflushRecordDetailbExcelVO.java index 7eedaa2e76..5fc6966d5a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/BackflushRecordDetailbExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/BackflushRecordDetailbExcelVO.java @@ -43,13 +43,13 @@ public class BackflushRecordDetailbExcelVO { @ExcelProperty("从库区代码") private String fromAreaCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") @@ -65,7 +65,7 @@ public class BackflushRecordDetailbExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/BackflushRecordDetailbExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/BackflushRecordDetailbExportReqVO.java index 96448c8039..37464c0847 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/BackflushRecordDetailbExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/BackflushRecordDetailbExportReqVO.java @@ -37,13 +37,13 @@ public class BackflushRecordDetailbExportReqVO { @Schema(description = "从库区代码") private String fromAreaCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -58,7 +58,7 @@ public class BackflushRecordDetailbExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/BackflushRecordDetailbPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/BackflushRecordDetailbPageReqVO.java index 7e99ac3577..5319f386d4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/BackflushRecordDetailbPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/BackflushRecordDetailbPageReqVO.java @@ -42,13 +42,13 @@ public class BackflushRecordDetailbPageReqVO extends PageParam { @Schema(description = "从库区代码") private String fromAreaCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -63,7 +63,7 @@ public class BackflushRecordDetailbPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/ProductreceiptRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/ProductreceiptRecordDetailBaseVO.java index ee71f68674..92401e3a5b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/ProductreceiptRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/ProductreceiptRecordDetailBaseVO.java @@ -80,7 +80,7 @@ public class ProductreceiptRecordDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -95,13 +95,13 @@ public class ProductreceiptRecordDetailBaseVO { @NotNull(message = "创建者Id不能为空") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/ProductreceiptRecordDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/ProductreceiptRecordDetailExcelVO.java index 8e081a2335..2632f50d72 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/ProductreceiptRecordDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/ProductreceiptRecordDetailExcelVO.java @@ -78,7 +78,7 @@ public class ProductreceiptRecordDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -90,13 +90,13 @@ public class ProductreceiptRecordDetailExcelVO { @ExcelProperty("创建者Id") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/ProductreceiptRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/ProductreceiptRecordDetailExportReqVO.java index 2a856a9d9e..9304720685 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/ProductreceiptRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/ProductreceiptRecordDetailExportReqVO.java @@ -71,7 +71,7 @@ public class ProductreceiptRecordDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -84,13 +84,13 @@ public class ProductreceiptRecordDetailExportReqVO { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/ProductreceiptRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/ProductreceiptRecordDetailPageReqVO.java index b705ecb7df..b269b3ac95 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/ProductreceiptRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/ProductreceiptRecordDetailPageReqVO.java @@ -73,7 +73,7 @@ public class ProductreceiptRecordDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -86,13 +86,13 @@ public class ProductreceiptRecordDetailPageReqVO extends PageParam { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/ProductreceiptRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/ProductreceiptRecordMainExcelVO.java index 3c55de5108..ba1cbd5b04 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/ProductreceiptRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRecord/vo/ProductreceiptRecordMainExcelVO.java @@ -151,16 +151,16 @@ public class ProductreceiptRecordMainExcelVO { @DictFormat(DictTypeConstants.UOM) private String stdPackUnit; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestDetailBaseVO.java index 26f633315c..d901f5bab5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestDetailBaseVO.java @@ -70,7 +70,7 @@ public class ProductreceiptRequestDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "来源库位") @@ -86,13 +86,13 @@ public class ProductreceiptRequestDetailBaseVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestDetailExcelVO.java index 586d923b1b..53652a5af6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestDetailExcelVO.java @@ -66,7 +66,7 @@ public class ProductreceiptRequestDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("到库位代码") @@ -81,13 +81,13 @@ public class ProductreceiptRequestDetailExcelVO { @ExcelProperty("创建者用户名") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestDetailExportReqVO.java index 5c00930456..74bb480439 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestDetailExportReqVO.java @@ -60,7 +60,7 @@ public class ProductreceiptRequestDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "到库位代码") @@ -76,13 +76,13 @@ public class ProductreceiptRequestDetailExportReqVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestDetailPageReqVO.java index 2c0bf0c11e..47f784c709 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestDetailPageReqVO.java @@ -61,7 +61,7 @@ public class ProductreceiptRequestDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "到库位代码") @@ -77,13 +77,13 @@ public class ProductreceiptRequestDetailPageReqVO extends PageParam { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestImportVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestImportVO.java index 74263a4615..aeab8c3d25 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestImportVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestImportVO.java @@ -41,7 +41,7 @@ public class ProductreceiptRequestImportVO { @ExcelProperty("bom版本") private String bomVersion; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("批次") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestMainExcelVO.java index ceee6c0033..e73d8ae4ec 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestMainExcelVO.java @@ -139,16 +139,16 @@ public class ProductreceiptRequestMainExcelVO { @DictFormat(DictTypeConstants.UOM) private String stdPackUnit; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ConsumeRecordDetailbBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ConsumeRecordDetailbBaseVO.java index cba023eeae..c98b88c33c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ConsumeRecordDetailbBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ConsumeRecordDetailbBaseVO.java @@ -40,7 +40,7 @@ public class ConsumeRecordDetailbBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -53,13 +53,13 @@ public class ConsumeRecordDetailbBaseVO { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ConsumeRecordDetailbExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ConsumeRecordDetailbExcelVO.java index 4f1f540639..ada5e77f37 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ConsumeRecordDetailbExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ConsumeRecordDetailbExcelVO.java @@ -38,7 +38,7 @@ public class ConsumeRecordDetailbExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -50,13 +50,13 @@ public class ConsumeRecordDetailbExcelVO { @ExcelProperty("创建者Id") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ConsumeRecordDetailbExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ConsumeRecordDetailbExportReqVO.java index 5f87af75e2..586c437924 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ConsumeRecordDetailbExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ConsumeRecordDetailbExportReqVO.java @@ -33,7 +33,7 @@ public class ConsumeRecordDetailbExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -46,13 +46,13 @@ public class ConsumeRecordDetailbExportReqVO { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ConsumeRecordDetailbPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ConsumeRecordDetailbPageReqVO.java index a5ecd314dd..13542b08ce 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ConsumeRecordDetailbPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ConsumeRecordDetailbPageReqVO.java @@ -38,7 +38,7 @@ public class ConsumeRecordDetailbPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -51,13 +51,13 @@ public class ConsumeRecordDetailbPageReqVO extends PageParam { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ProductrepairRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ProductrepairRecordDetailBaseVO.java index 178d9cbe3d..01ddb51bc5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ProductrepairRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ProductrepairRecordDetailBaseVO.java @@ -66,7 +66,7 @@ public class ProductrepairRecordDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -79,13 +79,13 @@ public class ProductrepairRecordDetailBaseVO { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ProductrepairRecordDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ProductrepairRecordDetailExcelVO.java index af467ff131..f777f95e51 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ProductrepairRecordDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ProductrepairRecordDetailExcelVO.java @@ -64,7 +64,7 @@ public class ProductrepairRecordDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -76,13 +76,13 @@ public class ProductrepairRecordDetailExcelVO { @ExcelProperty("创建者Id") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ProductrepairRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ProductrepairRecordDetailExportReqVO.java index 56880c9b06..2f363567f5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ProductrepairRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ProductrepairRecordDetailExportReqVO.java @@ -59,7 +59,7 @@ public class ProductrepairRecordDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -72,13 +72,13 @@ public class ProductrepairRecordDetailExportReqVO { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ProductrepairRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ProductrepairRecordDetailPageReqVO.java index 469f680d5c..5d8b3b40f1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ProductrepairRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRecord/vo/ProductrepairRecordDetailPageReqVO.java @@ -61,7 +61,7 @@ public class ProductrepairRecordDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -74,13 +74,13 @@ public class ProductrepairRecordDetailPageReqVO extends PageParam { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestBomRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestBomRespVO.java index cc95951123..de94e5c03a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestBomRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestBomRespVO.java @@ -11,7 +11,7 @@ import java.math.BigDecimal; @ToString(callSuper = true) public class ProductrepairRequestBomRespVO extends ProductrepairRequestDetailbBaseVO{ - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "单位") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailaBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailaBaseVO.java index be8f6daa20..1bcd4f0ada 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailaBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailaBaseVO.java @@ -55,8 +55,8 @@ public class ProductrepairRequestDetailaBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "物品代码不能为空") + @Schema(description = "物料代码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "物料代码不能为空") private String itemCode; @Schema(description = "备注") @@ -69,13 +69,13 @@ public class ProductrepairRequestDetailaBaseVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailaExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailaExcelVO.java index 94a4e6d574..04d222081d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailaExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailaExcelVO.java @@ -51,7 +51,7 @@ public class ProductrepairRequestDetailaExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -63,13 +63,13 @@ public class ProductrepairRequestDetailaExcelVO { @ExcelProperty("创建者用户名") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailaExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailaExportReqVO.java index 56827a1329..fb077c32e8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailaExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailaExportReqVO.java @@ -45,7 +45,7 @@ public class ProductrepairRequestDetailaExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -58,13 +58,13 @@ public class ProductrepairRequestDetailaExportReqVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailaPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailaPageReqVO.java index 08ef06cd37..16363915a2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailaPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailaPageReqVO.java @@ -47,7 +47,7 @@ public class ProductrepairRequestDetailaPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -60,13 +60,13 @@ public class ProductrepairRequestDetailaPageReqVO extends PageParam { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailbBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailbBaseVO.java index 22c7b8173b..fa0ce24bd4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailbBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailbBaseVO.java @@ -39,8 +39,8 @@ public class ProductrepairRequestDetailbBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "物品代码不能为空") + @Schema(description = "物料代码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "物料代码不能为空") private String itemCode; @Schema(description = "备注") @@ -54,13 +54,13 @@ public class ProductrepairRequestDetailbBaseVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailbExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailbExcelVO.java index 0411e271b5..80ffa89373 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailbExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailbExcelVO.java @@ -31,7 +31,7 @@ public class ProductrepairRequestDetailbExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -43,13 +43,13 @@ public class ProductrepairRequestDetailbExcelVO { @ExcelProperty("创建者用户名") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailbExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailbExportReqVO.java index e9267370ce..e34a995cad 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailbExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailbExportReqVO.java @@ -27,7 +27,7 @@ public class ProductrepairRequestDetailbExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -40,13 +40,13 @@ public class ProductrepairRequestDetailbExportReqVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailbPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailbPageReqVO.java index 64eea1c1a6..c67aaed2a1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailbPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailbPageReqVO.java @@ -32,7 +32,7 @@ public class ProductrepairRequestDetailbPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -45,13 +45,13 @@ public class ProductrepairRequestDetailbPageReqVO extends PageParam { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestMainImportVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestMainImportVO.java index b8221810f4..598be1b52d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestMainImportVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestMainImportVO.java @@ -58,7 +58,7 @@ public class ProductrepairRequestMainImportVO { @DictFormat(DictTypeConstants.INVENTORY_STATUS) private String inventoryStatus; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("数量") @@ -69,7 +69,7 @@ public class ProductrepairRequestMainImportVO { private String uom; //二级子表 - @ExcelProperty("BOM子物品代码") + @ExcelProperty("BOM子物料代码") private String childItemCode; @ExcelProperty(value = "BOM子计量单位", converter = DictConvert.class) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/ProductscrapJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/ProductscrapJobDetailController.java index 9fc7cf7444..5685757877 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/ProductscrapJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/ProductscrapJobDetailController.java @@ -93,7 +93,7 @@ public class ProductscrapJobDetailController { return success(ProductscrapJobDetailConvert.INSTANCE.convertPage(pageResult)); } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:productscrap-job-detail:query')") public CommonResult> getProductscrapJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = productscrapJobDetailService.getProductscrapJobDetailSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/ProductscrapJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/ProductscrapJobMainController.java index c4a62a718f..cb2fe2766a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/ProductscrapJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/ProductscrapJobMainController.java @@ -37,7 +37,7 @@ public class ProductscrapJobMainController { @Resource private AdminUserApi userApi; @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:productscrap-job-main:query')") public CommonResult> getProductscrapJobMainSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = productscrapJobMainService.getProductscrapJobMainSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/vo/ProductscrapJobDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/vo/ProductscrapJobDetailBaseVO.java index 8fb2a210a1..a62c32b281 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/vo/ProductscrapJobDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/vo/ProductscrapJobDetailBaseVO.java @@ -41,16 +41,16 @@ public class ProductscrapJobDetailBaseVO { @Schema(description = "原因") private String reason; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/vo/ProductscrapJobDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/vo/ProductscrapJobDetailExcelVO.java index 7e062311a7..5d91f9984b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/vo/ProductscrapJobDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/vo/ProductscrapJobDetailExcelVO.java @@ -42,16 +42,16 @@ public class ProductscrapJobDetailExcelVO { @DictFormat("scrap_reason") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String reason; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/vo/ProductscrapJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/vo/ProductscrapJobDetailExportReqVO.java index 3ac017cf32..dce53eb497 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/vo/ProductscrapJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/vo/ProductscrapJobDetailExportReqVO.java @@ -36,16 +36,16 @@ public class ProductscrapJobDetailExportReqVO { @Schema(description = "原因") private String reason; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/vo/ProductscrapJobDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/vo/ProductscrapJobDetailPageReqVO.java index ad28b19159..972da18e56 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/vo/ProductscrapJobDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapJob/vo/ProductscrapJobDetailPageReqVO.java @@ -38,16 +38,16 @@ public class ProductscrapJobDetailPageReqVO extends PageParam { @Schema(description = "原因") private String reason; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/ProductscrapRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/ProductscrapRecordMainController.java index 5cb4bd04b6..0099c9cd83 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/ProductscrapRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/ProductscrapRecordMainController.java @@ -53,7 +53,7 @@ public class ProductscrapRecordMainController { } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:ProductscrapRecordMain:query')") public CommonResult> getProductscrapRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = productscrapRecordMainService.getProductscrapRecordMainSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/ProductscrapRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/ProductscrapRecordDetailBaseVO.java index 86bdc04cb0..0d66fb12ea 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/ProductscrapRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/ProductscrapRecordDetailBaseVO.java @@ -52,13 +52,13 @@ public class ProductscrapRecordDetailBaseVO { @Schema(description = "金额") private BigDecimal amount; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -79,7 +79,7 @@ public class ProductscrapRecordDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/ProductscrapRecordDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/ProductscrapRecordDetailExcelVO.java index 7c48974d75..93ed37671f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/ProductscrapRecordDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/ProductscrapRecordDetailExcelVO.java @@ -56,13 +56,13 @@ public class ProductscrapRecordDetailExcelVO { @ExcelProperty("金额") private BigDecimal amount; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") @@ -85,7 +85,7 @@ public class ProductscrapRecordDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/ProductscrapRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/ProductscrapRecordDetailExportReqVO.java index 9859a38927..d425cd3e48 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/ProductscrapRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/ProductscrapRecordDetailExportReqVO.java @@ -48,13 +48,13 @@ public class ProductscrapRecordDetailExportReqVO { @Schema(description = "金额") private BigDecimal amount; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -75,7 +75,7 @@ public class ProductscrapRecordDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/ProductscrapRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/ProductscrapRecordDetailPageReqVO.java index 0ab66b9fd0..f2778effe2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/ProductscrapRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/ProductscrapRecordDetailPageReqVO.java @@ -50,13 +50,13 @@ public class ProductscrapRecordDetailPageReqVO extends PageParam { @Schema(description = "金额") private BigDecimal amount; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -77,7 +77,7 @@ public class ProductscrapRecordDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/RawscrapRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/RawscrapRecordDetailBaseVO.java index 858825e569..d73e5bd9c1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/RawscrapRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/RawscrapRecordDetailBaseVO.java @@ -36,7 +36,7 @@ public class RawscrapRecordDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注", example = "你猜") @@ -45,13 +45,13 @@ public class RawscrapRecordDetailBaseVO { @Schema(description = "地点ID", example = "25447") private String siteId; - @Schema(description = "物品名称", example = "赵六") + @Schema(description = "物料名称", example = "赵六") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/RawscrapRecordDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/RawscrapRecordDetailExcelVO.java index f7c5d0e718..0d643b306b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/RawscrapRecordDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/RawscrapRecordDetailExcelVO.java @@ -41,7 +41,7 @@ public class RawscrapRecordDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -53,13 +53,13 @@ public class RawscrapRecordDetailExcelVO { @ExcelProperty("地点ID") private String siteId; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/RawscrapRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/RawscrapRecordDetailExportReqVO.java index b25e413e82..37cf84fff4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/RawscrapRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/RawscrapRecordDetailExportReqVO.java @@ -37,7 +37,7 @@ public class RawscrapRecordDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注", example = "你猜") @@ -50,13 +50,13 @@ public class RawscrapRecordDetailExportReqVO { @Schema(description = "地点ID", example = "25447") private String siteId; - @Schema(description = "物品名称", example = "赵六") + @Schema(description = "物料名称", example = "赵六") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/RawscrapRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/RawscrapRecordDetailPageReqVO.java index 31a2d6d553..c5cc54c1a9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/RawscrapRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRecord/vo/RawscrapRecordDetailPageReqVO.java @@ -42,7 +42,7 @@ public class RawscrapRecordDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注", example = "你猜") @@ -55,13 +55,13 @@ public class RawscrapRecordDetailPageReqVO extends PageParam { @Schema(description = "地点ID", example = "25447") private String siteId; - @Schema(description = "物品名称", example = "赵六") + @Schema(description = "物料名称", example = "赵六") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/ProductscrapRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/ProductscrapRequestDetailController.java index 4078e0542f..0e63aea90b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/ProductscrapRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/ProductscrapRequestDetailController.java @@ -91,7 +91,7 @@ public class ProductscrapRequestDetailController { } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:productscrap-request-detail:query')") public CommonResult> getProductscrapRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = productscrapRequestDetailService.getProductscrapRequestDetailSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/ProductscrapRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/ProductscrapRequestMainController.java index 3851f7dcd0..3cca5db0f3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/ProductscrapRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/ProductscrapRequestMainController.java @@ -71,7 +71,7 @@ public class ProductscrapRequestMainController { return success(true); } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:productscrap-request-main:query')") public CommonResult> getProductscrapRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = productscrapRequestMainService.getProductscrapRequestMainSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestBomRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestBomRespVO.java index dca36a175d..b2473f5ce1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestBomRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestBomRespVO.java @@ -11,7 +11,7 @@ import java.math.BigDecimal; @ToString(callSuper = true) public class ProductscrapRequestBomRespVO extends RawscrapRequestDetailBaseVO { - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "单位") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestDetailBaseVO.java index a0dae22d39..746ad0986d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestDetailBaseVO.java @@ -45,8 +45,8 @@ public class ProductscrapRequestDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "物品代码不能为空") + @Schema(description = "物料代码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "物料代码不能为空") private String itemCode; @Schema(description = "备注") @@ -59,13 +59,13 @@ public class ProductscrapRequestDetailBaseVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestDetailExcelVO.java index 7b7f6e62dd..d0ed7576db 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestDetailExcelVO.java @@ -46,7 +46,7 @@ public class ProductscrapRequestDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -58,13 +58,13 @@ public class ProductscrapRequestDetailExcelVO { @ExcelProperty("创建者用户名") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestDetailExportReqVO.java index eac7875167..5ed3de9f6f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestDetailExportReqVO.java @@ -39,7 +39,7 @@ public class ProductscrapRequestDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -52,13 +52,13 @@ public class ProductscrapRequestDetailExportReqVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestDetailPageReqVO.java index 170b1c3ef3..1e862cdf4b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestDetailPageReqVO.java @@ -41,7 +41,7 @@ public class ProductscrapRequestDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -54,13 +54,13 @@ public class ProductscrapRequestDetailPageReqVO extends PageParam { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestImportVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestImportVO.java index 7a9b007f6f..c8c44d2bdf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestImportVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestImportVO.java @@ -47,8 +47,8 @@ public class ProductscrapRequestImportVO { @DictFormat(DictTypeConstants.INVENTORY_STATUS) private String inventoryStatus; - @ExcelProperty("物品代码") - @NotBlank(message = "物品代码不能为空") + @ExcelProperty("物料代码") + @NotBlank(message = "物料代码不能为空") private String itemCode; @ExcelProperty("数量") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/RawscrapRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/RawscrapRequestDetailBaseVO.java index 714b0c0b24..cc01f7c224 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/RawscrapRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/RawscrapRequestDetailBaseVO.java @@ -34,8 +34,8 @@ public class RawscrapRequestDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "物品代码不能为空") + @Schema(description = "物料代码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "物料代码不能为空") private String itemCode; @Schema(description = "备注", example = "随便") @@ -44,13 +44,13 @@ public class RawscrapRequestDetailBaseVO { @Schema(description = "地点ID", example = "8586") private Long siteId; - @Schema(description = "物品名称", example = "芋艿") + @Schema(description = "物料名称", example = "芋艿") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/RawscrapRequestDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/RawscrapRequestDetailExcelVO.java index 32c7ab01bd..24b18679b8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/RawscrapRequestDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/RawscrapRequestDetailExcelVO.java @@ -35,7 +35,7 @@ public class RawscrapRequestDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -47,13 +47,13 @@ public class RawscrapRequestDetailExcelVO { @ExcelProperty("地点ID") private Long siteId; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/RawscrapRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/RawscrapRequestDetailExportReqVO.java index 0c55927714..0d2976f894 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/RawscrapRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/RawscrapRequestDetailExportReqVO.java @@ -31,7 +31,7 @@ public class RawscrapRequestDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注", example = "随便") @@ -44,13 +44,13 @@ public class RawscrapRequestDetailExportReqVO { @Schema(description = "地点ID", example = "8586") private Long siteId; - @Schema(description = "物品名称", example = "芋艿") + @Schema(description = "物料名称", example = "芋艿") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/RawscrapRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/RawscrapRequestDetailPageReqVO.java index 135d65699d..42494ba5cf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/RawscrapRequestDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/RawscrapRequestDetailPageReqVO.java @@ -36,7 +36,7 @@ public class RawscrapRequestDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注", example = "随便") @@ -49,13 +49,13 @@ public class RawscrapRequestDetailPageReqVO extends PageParam { @Schema(description = "地点ID", example = "8586") private Long siteId; - @Schema(description = "物品名称", example = "芋艿") + @Schema(description = "物料名称", example = "芋艿") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/project/ProjectController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/project/ProjectController.java index d501aa1d29..98c7afa469 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/project/ProjectController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/project/ProjectController.java @@ -78,7 +78,7 @@ public class ProjectController { return success(ProjectConvert.INSTANCE.convert(project)); } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:project:query')") public CommonResult> getProjectSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = projectService.getProjectSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/PurchaseMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/PurchaseMainController.java index 314d4fa2bc..31591b99b6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/PurchaseMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/PurchaseMainController.java @@ -62,7 +62,7 @@ public class PurchaseMainController { } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:purchase-main:query')") public CommonResult> getPurchaseMainSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = purchaseMainService.getPurchaseMainSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailBaseVO.java index 180d61e282..635040212f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailBaseVO.java @@ -82,8 +82,8 @@ public class PurchaseDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码", requiredMode = Schema.RequiredMode.REQUIRED) - // @NotNull(message = "物品代码不能为空") + @Schema(description = "物料代码", requiredMode = Schema.RequiredMode.REQUIRED) + // @NotNull(message = "物料代码不能为空") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailExcelVO.java index 81bd6fc433..5ca1561826 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailExcelVO.java @@ -83,7 +83,7 @@ public class PurchaseDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailExportReqVO.java index 5f6a688229..ce7b84d0cd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailExportReqVO.java @@ -63,7 +63,7 @@ public class PurchaseDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailPageReqVO.java index 6e34c5bea4..dc96906752 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailPageReqVO.java @@ -66,7 +66,7 @@ public class PurchaseDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseMainImportVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseMainImportVO.java index c483e8059e..71ad43b05a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseMainImportVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseMainImportVO.java @@ -50,7 +50,7 @@ public class PurchaseMainImportVO { //子表数据 @ExcelProperty("行号") private String lineNumber; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("数量") private BigDecimal orderQty; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/PurchasePlanMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/PurchasePlanMainController.java index a3523e029a..789c35cc4b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/PurchasePlanMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/PurchasePlanMainController.java @@ -101,7 +101,7 @@ public class PurchasePlanMainController { return success(PurchasePlanMainConvert.INSTANCE.convertPage(pageResult)); } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:purchase-plan-main:query')") public CommonResult> getPurchasePlanMainSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = purchasePlanMainService.getPurchasePlanMainSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/vo/PurchasePlanDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/vo/PurchasePlanDetailBaseVO.java index 3bfee81b0b..a51dd5cd92 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/vo/PurchasePlanDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/vo/PurchasePlanDetailBaseVO.java @@ -32,8 +32,8 @@ public class PurchasePlanDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "物品代码不能为空") + @Schema(description = "物料代码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "物料代码不能为空") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/vo/PurchasePlanDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/vo/PurchasePlanDetailExcelVO.java index f364bb751b..cb2d3e85c8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/vo/PurchasePlanDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/vo/PurchasePlanDetailExcelVO.java @@ -30,7 +30,7 @@ public class PurchasePlanDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/vo/PurchasePlanDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/vo/PurchasePlanDetailExportReqVO.java index bc429527cc..d4a8aadf3a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/vo/PurchasePlanDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/vo/PurchasePlanDetailExportReqVO.java @@ -24,7 +24,7 @@ public class PurchasePlanDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/vo/PurchasePlanDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/vo/PurchasePlanDetailPageReqVO.java index bd1e24bc9d..7533c62791 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/vo/PurchasePlanDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/vo/PurchasePlanDetailPageReqVO.java @@ -26,7 +26,7 @@ public class PurchasePlanDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/vo/PurchasePlanMainImportVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/vo/PurchasePlanMainImportVO.java index 222a08b82b..ec648cee7b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/vo/PurchasePlanMainImportVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/vo/PurchasePlanMainImportVO.java @@ -34,7 +34,7 @@ public class PurchasePlanMainImportVO { @ExcelProperty("订单行") private BigDecimal poLine; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("计划数量") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/PurchaseclaimRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/PurchaseclaimRecordDetailController.java index 85c3ca3885..1c6b7d1c8c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/PurchaseclaimRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/PurchaseclaimRecordDetailController.java @@ -50,7 +50,7 @@ public class PurchaseclaimRecordDetailController { return success(purchaseclaimRecordDetailService.createPurchaseclaimRecordDetail(createReqVO)); } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:PurchaseclaimRecordDetail:query')") public CommonResult> getPurchaseclaimRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = purchaseclaimRecordDetailService.getPurchaseclaimRecordDetailSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/PurchaseclaimRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/PurchaseclaimRecordMainController.java index be2b389a2c..a773f65839 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/PurchaseclaimRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/PurchaseclaimRecordMainController.java @@ -91,7 +91,7 @@ public class PurchaseclaimRecordMainController { return success(PurchaseclaimRecordMainConvert.INSTANCE.convertPage(pageResult)); } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:purchaseclaim-record-main:query')") public CommonResult> getPurchaseclaimRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = purchaseclaimRecordMainService.getPurchaseclaimRecordMainSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/vo/PurchaseclaimRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/vo/PurchaseclaimRecordDetailBaseVO.java index e968185bf2..17bfb431af 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/vo/PurchaseclaimRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/vo/PurchaseclaimRecordDetailBaseVO.java @@ -50,7 +50,7 @@ public class PurchaseclaimRecordDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -63,13 +63,13 @@ public class PurchaseclaimRecordDetailBaseVO { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/vo/PurchaseclaimRecordDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/vo/PurchaseclaimRecordDetailExcelVO.java index e1dfc8cc4b..f3e49f41a0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/vo/PurchaseclaimRecordDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/vo/PurchaseclaimRecordDetailExcelVO.java @@ -46,7 +46,7 @@ public class PurchaseclaimRecordDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -58,13 +58,13 @@ public class PurchaseclaimRecordDetailExcelVO { @ExcelProperty("创建者Id") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/vo/PurchaseclaimRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/vo/PurchaseclaimRecordDetailExportReqVO.java index 0c09cfed37..5c3a68acb4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/vo/PurchaseclaimRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/vo/PurchaseclaimRecordDetailExportReqVO.java @@ -39,7 +39,7 @@ public class PurchaseclaimRecordDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -52,13 +52,13 @@ public class PurchaseclaimRecordDetailExportReqVO { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/vo/PurchaseclaimRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/vo/PurchaseclaimRecordDetailPageReqVO.java index 8cca8547ff..c62af2f232 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/vo/PurchaseclaimRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRecord/vo/PurchaseclaimRecordDetailPageReqVO.java @@ -41,7 +41,7 @@ public class PurchaseclaimRecordDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -54,13 +54,13 @@ public class PurchaseclaimRecordDetailPageReqVO extends PageParam { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestDetailBaseVO.java index 45beed51fa..745ce80769 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestDetailBaseVO.java @@ -54,7 +54,7 @@ public class PurchaseclaimRequestDetailBaseVO { @NotNull(message = "单据号不能为空") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -67,13 +67,13 @@ public class PurchaseclaimRequestDetailBaseVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestDetailExcelVO.java index 23ec78a5ed..ead43de4dd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestDetailExcelVO.java @@ -88,16 +88,16 @@ public class PurchaseclaimRequestDetailExcelVO { @ExcelProperty("金额") private BigDecimal amount; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestDetailExportReqVO.java index c624b892d7..9ca277355a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestDetailExportReqVO.java @@ -39,7 +39,7 @@ public class PurchaseclaimRequestDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -52,13 +52,13 @@ public class PurchaseclaimRequestDetailExportReqVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestDetailPageReqVO.java index 66a13e5954..917a7c5226 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestDetailPageReqVO.java @@ -44,7 +44,7 @@ public class PurchaseclaimRequestDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -57,13 +57,13 @@ public class PurchaseclaimRequestDetailPageReqVO extends PageParam { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestImportVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestImportVO.java index a4fd6c0801..b39e7227b0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestImportVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseclaimRequest/vo/PurchaseclaimRequestImportVO.java @@ -50,7 +50,7 @@ public class PurchaseclaimRequestImportVO { @ExcelProperty("单价") private BigDecimal singlePrice; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("数量") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobDetailBaseVO.java index 29952825ca..ab453ed39b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobDetailBaseVO.java @@ -73,16 +73,16 @@ public class PurchasereceiptJobDetailBaseVO { @Schema(description = "转换率") private BigDecimal convertRate; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobDetailExcelVO.java index 1ba5d82b4d..a81ab02340 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobDetailExcelVO.java @@ -79,16 +79,16 @@ public class PurchasereceiptJobDetailExcelVO { @ExcelProperty("转换率") private BigDecimal convertRate; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobDetailExportReqVO.java index d0fbcc4faa..f6b16dc7c8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobDetailExportReqVO.java @@ -69,16 +69,16 @@ public class PurchasereceiptJobDetailExportReqVO { @Schema(description = "转换率") private BigDecimal convertRate; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobDetailPageReqVO.java index 91bbae1999..f319beda24 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobDetailPageReqVO.java @@ -75,16 +75,16 @@ public class PurchasereceiptJobDetailPageReqVO extends PageParam { @Schema(description = "转换率") private BigDecimal convertRate; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainExcelVO.java index 5b966c4e23..058107419c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainExcelVO.java @@ -206,16 +206,16 @@ public class PurchasereceiptJobMainExcelVO { @ExcelProperty("转换率") private BigDecimal convertRate; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordDetailBaseVO.java index 14f8713521..68e0091a8c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordDetailBaseVO.java @@ -125,17 +125,17 @@ public class PurchasereceiptRecordDetailBaseVO { @Schema(description = "任务明细ID") private String jobDetailId; - @Schema(description = "物品代码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "物品代码不能为空") + @Schema(description = "物料代码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "物料代码不能为空") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "主表ID") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordDetailExcelVO.java index 9fab3e02f8..e191858715 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordDetailExcelVO.java @@ -114,16 +114,16 @@ public class PurchasereceiptRecordDetailExcelVO { @ExcelProperty("任务明细ID") private String jobDetailId; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("单据号") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordDetailExportReqVO.java index d56096542d..9932f8d31b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordDetailExportReqVO.java @@ -112,16 +112,16 @@ public class PurchasereceiptRecordDetailExportReqVO { @Schema(description = "任务明细ID") private String jobDetailId; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "单据号") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordDetailPageReqVO.java index ca807dbd69..066a8a3c1d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordDetailPageReqVO.java @@ -117,16 +117,16 @@ public class PurchasereceiptRecordDetailPageReqVO extends PageParam { @Schema(description = "任务明细ID") private String jobDetailId; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "单据号") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordMainExcelVO.java index f81eed7d34..4a002f9ff0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchasereceiptRecordMainExcelVO.java @@ -193,16 +193,16 @@ public class PurchasereceiptRecordMainExcelVO { @ExcelProperty("任务明细ID") private String jobDetailId; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("明细备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchaseshortageDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchaseshortageDetailBaseVO.java index 648a3e771c..272da0ba04 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchaseshortageDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchaseshortageDetailBaseVO.java @@ -124,17 +124,17 @@ public class PurchaseshortageDetailBaseVO { @Schema(description = "任务明细ID", example = "20190") private String jobDetailId; - @Schema(description = "物品代码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "物品代码不能为空") + @Schema(description = "物料代码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "物料代码不能为空") private String itemCode; - @Schema(description = "物品名称", example = "赵六") + @Schema(description = "物料名称", example = "赵六") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "主表ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "30925") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchaseshortageDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchaseshortageDetailExcelVO.java index 75f0a8d629..b1adbf8f9d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchaseshortageDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchaseshortageDetailExcelVO.java @@ -110,16 +110,16 @@ public class PurchaseshortageDetailExcelVO { @ExcelProperty("任务明细ID") private String jobDetailId; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("主表ID") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchaseshortageDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchaseshortageDetailExportReqVO.java index 9509bc9523..e9f104a3ae 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchaseshortageDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchaseshortageDetailExportReqVO.java @@ -109,16 +109,16 @@ public class PurchaseshortageDetailExportReqVO { @Schema(description = "任务明细ID", example = "20190") private String jobDetailId; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称", example = "赵六") + @Schema(description = "物料名称", example = "赵六") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "主表ID", example = "30925") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchaseshortageDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchaseshortageDetailPageReqVO.java index 8463a4d268..b844ba26af 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchaseshortageDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRecord/vo/PurchaseshortageDetailPageReqVO.java @@ -114,16 +114,16 @@ public class PurchaseshortageDetailPageReqVO extends PageParam { @Schema(description = "任务明细ID", example = "20190") private String jobDetailId; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称", example = "赵六") + @Schema(description = "物料名称", example = "赵六") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "主表ID", example = "30925") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestDetailController.java index 2a6174700d..ea2223a639 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestDetailController.java @@ -83,7 +83,7 @@ public class PurchasereceiptRequestDetailController { } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:PurchasereceiptRequestDetail:query')") public CommonResult> getPurchasereceiptRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = purchasereceiptRequestDetailService.getPurchasereceiptRequestDetailSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java index 3c34813610..94ded82c5f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/PurchasereceiptRequestMainController.java @@ -67,7 +67,7 @@ public class PurchasereceiptRequestMainController { } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:purchasereceipt-request-main:query')") public CommonResult> getPurchasereceiptRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = purchasereceiptRequestMainService.getPurchasereceiptRequestMainSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestDetailBaseVO.java index ee0e3516b2..ba8953abd2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestDetailBaseVO.java @@ -80,20 +80,20 @@ public class PurchasereceiptRequestDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "物品代码不能为空") + @Schema(description = "物料代码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotBlank(message = "物料代码不能为空") private String itemCode; @Schema(description = "备注") private String remark; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestDetailExcelVO.java index 7a35e1235a..ea433df6de 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestDetailExcelVO.java @@ -74,19 +74,19 @@ public class PurchasereceiptRequestDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") private String remark; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestDetailExportReqVO.java index 006e727397..4c74c7e3a5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestDetailExportReqVO.java @@ -70,19 +70,19 @@ public class PurchasereceiptRequestDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") private String remark; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestDetailPageReqVO.java index 910af5872e..5ab5806237 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestDetailPageReqVO.java @@ -75,19 +75,19 @@ public class PurchasereceiptRequestDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") private String remark; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestMainExcelVO.java index e43be53ee1..16533b205b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestMainExcelVO.java @@ -146,19 +146,19 @@ public class PurchasereceiptRequestMainExcelVO { @ExcelProperty("转换率") private BigDecimal convertRate; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注2") private String remarkDetail; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestMainImportVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestMainImportVO.java index 3c7d088fb4..6f901e4250 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestMainImportVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestMainImportVO.java @@ -42,8 +42,8 @@ public class PurchasereceiptRequestMainImportVO { @ExcelProperty("订单行") private String poLine; - @NotBlank(message="物品代码不能为空") - @ExcelProperty("物品代码") + @NotBlank(message="物料代码不能为空") + @ExcelProperty("物料代码") private String itemCode; @NotBlank(message="批次不能为空") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobDetailController.java index 87cb63a165..b06e3e181b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobDetailController.java @@ -46,7 +46,7 @@ public class PurchasereturnJobDetailController { } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:PurchasereturnJobDetail:query')") public CommonResult> getPurchasereturnJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = purchasereturnJobDetailService.getPurchasereturnJobDetailSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobMainController.java index 50d43ff1ec..445db00a62 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/PurchasereturnJobMainController.java @@ -63,7 +63,7 @@ public class PurchasereturnJobMainController { } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:PurchasereturnJobMain:query')") public CommonResult> getPurchasereturnJobMainSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = purchasereturnJobMainService.getPurchasereturnJobMainSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailBaseVO.java index 7460613ab6..de520a3435 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailBaseVO.java @@ -57,16 +57,16 @@ public class PurchasereturnJobDetailBaseVO { @Schema(description = "原因") private String reason; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailExcelVO.java index 08b6af3dfe..0b1aeac1fd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailExcelVO.java @@ -54,16 +54,16 @@ public class PurchasereturnJobDetailExcelVO { @DictFormat("purchase_return_reason") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String reason; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailExportReqVO.java index e25cd5dfe2..2740c7f52f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailExportReqVO.java @@ -48,16 +48,16 @@ public class PurchasereturnJobDetailExportReqVO { @Schema(description = "原因") private String reason; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailPageReqVO.java index e9fb0a7a66..b41e4f245f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobDetailPageReqVO.java @@ -51,16 +51,16 @@ public class PurchasereturnJobDetailPageReqVO extends PageParam { @Schema(description = "原因") private String reason; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobMainExcelVO.java index 30a673e3c5..86fa1edda3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobMainExcelVO.java @@ -187,16 +187,16 @@ public class PurchasereturnJobMainExcelVO { @DictFormat(DictTypeConstants.PURCHASE_RETURN_REASON) private String reason; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/PurchasereturnRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/PurchasereturnRecordMainController.java index aaa8a06998..aa9ec7a918 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/PurchasereturnRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/PurchasereturnRecordMainController.java @@ -67,7 +67,7 @@ public class PurchasereturnRecordMainController { } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:PurchasereturnRecordMain:query')") public CommonResult> getPurchasereturnRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = purchasereturnRecordMainService.getPurchasereturnRecordMainSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/vo/PurchasereturnRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/vo/PurchasereturnRecordDetailBaseVO.java index 5d90f1fba3..c80d9ff81d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/vo/PurchasereturnRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/vo/PurchasereturnRecordDetailBaseVO.java @@ -78,8 +78,8 @@ public class PurchasereturnRecordDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "物品代码不能为空") + @Schema(description = "物料代码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "物料代码不能为空") private String itemCode; @Schema(description = "备注") @@ -92,13 +92,13 @@ public class PurchasereturnRecordDetailBaseVO { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/vo/PurchasereturnRecordDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/vo/PurchasereturnRecordDetailExcelVO.java index cfda3558b7..e3e681b68c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/vo/PurchasereturnRecordDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/vo/PurchasereturnRecordDetailExcelVO.java @@ -77,7 +77,7 @@ public class PurchasereturnRecordDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -89,13 +89,13 @@ public class PurchasereturnRecordDetailExcelVO { @ExcelProperty("创建者Id") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/vo/PurchasereturnRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/vo/PurchasereturnRecordDetailExportReqVO.java index 427c7a40f3..997aef704d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/vo/PurchasereturnRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/vo/PurchasereturnRecordDetailExportReqVO.java @@ -69,7 +69,7 @@ public class PurchasereturnRecordDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -82,13 +82,13 @@ public class PurchasereturnRecordDetailExportReqVO { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/vo/PurchasereturnRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/vo/PurchasereturnRecordDetailPageReqVO.java index 70e0b470be..011a4b092e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/vo/PurchasereturnRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/vo/PurchasereturnRecordDetailPageReqVO.java @@ -72,7 +72,7 @@ public class PurchasereturnRecordDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -85,13 +85,13 @@ public class PurchasereturnRecordDetailPageReqVO extends PageParam { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/vo/PurchasereturnRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/vo/PurchasereturnRecordMainExcelVO.java index e8c3937a48..5bebc710d0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/vo/PurchasereturnRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/vo/PurchasereturnRecordMainExcelVO.java @@ -162,19 +162,19 @@ public class PurchasereturnRecordMainExcelVO { @ExcelProperty("金额") private BigDecimal amount; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("子备注") private String remarkDetail; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestMainController.java index b209567d89..82f849c415 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/PurchasereturnRequestMainController.java @@ -83,7 +83,7 @@ public class PurchasereturnRequestMainController { } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:PurchasereturnRequestMain:query')") public CommonResult> getPurchasereturnRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = purchasereturnRequestMainService.getPurchasereturnRequestMainSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestDetailBaseVO.java index c63f259128..4aed7fd9d2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestDetailBaseVO.java @@ -56,7 +56,7 @@ public class PurchasereturnRequestDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -69,13 +69,13 @@ public class PurchasereturnRequestDetailBaseVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestDetailExcelVO.java index b319880bdd..a8cccd7e1f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestDetailExcelVO.java @@ -55,7 +55,7 @@ public class PurchasereturnRequestDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -67,13 +67,13 @@ public class PurchasereturnRequestDetailExcelVO { @ExcelProperty("创建者用户名") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestDetailExportReqVO.java index 98a5d76603..5785e41515 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestDetailExportReqVO.java @@ -48,7 +48,7 @@ public class PurchasereturnRequestDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -61,13 +61,13 @@ public class PurchasereturnRequestDetailExportReqVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestDetailPageReqVO.java index 12892ccda5..8fdfcf702e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestDetailPageReqVO.java @@ -51,7 +51,7 @@ public class PurchasereturnRequestDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -64,13 +64,13 @@ public class PurchasereturnRequestDetailPageReqVO extends PageParam { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestImportVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestImportVO.java index 16f5efabc2..6b1e6baf36 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestImportVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestImportVO.java @@ -39,7 +39,7 @@ public class PurchasereturnRequestImportVO { @ExcelProperty("订单行") private String poLine; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("包装号") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestMainExcelVO.java index 89934e1cac..5e294030ca 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestMainExcelVO.java @@ -129,7 +129,7 @@ public class PurchasereturnRequestMainExcelVO { @DictFormat(DictTypeConstants.PURCHASE_RETURN_REASON) private String reason; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("子备注") @@ -141,13 +141,13 @@ public class PurchasereturnRequestMainExcelVO { @ExcelProperty("创建者用户名") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobDetailController.java index ca4daa058c..c954f8672e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobDetailController.java @@ -46,7 +46,7 @@ public class PutawayJobDetailController { } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:putaway-job-detail:query')") public CommonResult> getPutawayJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = putawayJobDetailService.getPutawayJobDetailSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobMainController.java index bedade02a7..fbdbbec356 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/PutawayJobMainController.java @@ -63,7 +63,7 @@ public class PutawayJobMainController { } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:PutawayJobMain:query')") public CommonResult> getPutawayJobMainSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = putawayJobMainService.getPutawayJobMainSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobDetailBaseVO.java index 533dbf3922..6f05299f43 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobDetailBaseVO.java @@ -45,16 +45,16 @@ public class PutawayJobDetailBaseVO { @Schema(description = "到库位代码") private String toLocationCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemdesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobDetailExcelVO.java index 4b800c2f87..6777db88a7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobDetailExcelVO.java @@ -44,16 +44,16 @@ public class PutawayJobDetailExcelVO { @ExcelProperty("到库位代码") private String toLocationCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemdesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobDetailExportReqVO.java index fc596e663a..d4aba73cf0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobDetailExportReqVO.java @@ -39,16 +39,16 @@ public class PutawayJobDetailExportReqVO { @Schema(description = "到库位代码") private String toLocationCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemdesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobDetailPageReqVO.java index b5734bb49c..bcef761635 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobDetailPageReqVO.java @@ -42,16 +42,16 @@ public class PutawayJobDetailPageReqVO extends PageParam { @Schema(description = "到库位代码") private String toLocationCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemdesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobMainExcelVO.java index 97cc0f4ac2..002733ad8d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayJob/vo/PutawayJobMainExcelVO.java @@ -150,16 +150,16 @@ public class PutawayJobMainExcelVO { @ExcelProperty("到库位代码") private String toLocationCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemdesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordDetailController.java index 56f52750b9..25dd89d841 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordDetailController.java @@ -46,7 +46,7 @@ public class PutawayRecordDetailController { } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:putaway-record-detail:query')") public CommonResult> getPutawayRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = putawayRecordDetailService.getPutawayRecordDetailSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordMainController.java index 01039c18b6..5140d2b567 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/PutawayRecordMainController.java @@ -66,7 +66,7 @@ public class PutawayRecordMainController { } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:PutawayRecordMain:query')") public CommonResult> getPutawayRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = putawayRecordMainService.getPutawayRecordMainSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/vo/PutawayRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/vo/PutawayRecordDetailBaseVO.java index b8a187b33e..0417401e2b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/vo/PutawayRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/vo/PutawayRecordDetailBaseVO.java @@ -69,8 +69,8 @@ public class PutawayRecordDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "物品代码不能为空") + @Schema(description = "物料代码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "物料代码不能为空") private String itemCode; @Schema(description = "备注") @@ -83,13 +83,13 @@ public class PutawayRecordDetailBaseVO { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/vo/PutawayRecordDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/vo/PutawayRecordDetailExcelVO.java index 98fc9a5c30..f835010f2c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/vo/PutawayRecordDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/vo/PutawayRecordDetailExcelVO.java @@ -65,7 +65,7 @@ public class PutawayRecordDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -77,13 +77,13 @@ public class PutawayRecordDetailExcelVO { @ExcelProperty("创建者Id") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/vo/PutawayRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/vo/PutawayRecordDetailExportReqVO.java index df8d7e55ae..923fa9c69f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/vo/PutawayRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/vo/PutawayRecordDetailExportReqVO.java @@ -60,7 +60,7 @@ public class PutawayRecordDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -73,13 +73,13 @@ public class PutawayRecordDetailExportReqVO { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/vo/PutawayRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/vo/PutawayRecordDetailPageReqVO.java index 634355d626..b4a9636904 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/vo/PutawayRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/vo/PutawayRecordDetailPageReqVO.java @@ -63,7 +63,7 @@ public class PutawayRecordDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -76,13 +76,13 @@ public class PutawayRecordDetailPageReqVO extends PageParam { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/vo/PutawayRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/vo/PutawayRecordMainExcelVO.java index 5f45c0acb7..95108ef209 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/vo/PutawayRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRecord/vo/PutawayRecordMainExcelVO.java @@ -128,16 +128,16 @@ public class PutawayRecordMainExcelVO { @ExcelProperty("到库区代码") private String toAreaCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/PutawayRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/PutawayRequestMainController.java index bd5ba59ca9..6411ef25c7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/PutawayRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/PutawayRequestMainController.java @@ -87,7 +87,7 @@ public class PutawayRequestMainController { return success(PutawayRequestMainConvert.INSTANCE.convert(putawayRequestMain)); } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:PutawayRequestMain:query')") public CommonResult> getPutawayRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = putawayRequestMainService.getPutawayRequestMainSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestDetailBaseVO.java index 5a88e34407..5d55c2d0ab 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestDetailBaseVO.java @@ -47,7 +47,7 @@ public class PutawayRequestDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -60,13 +60,13 @@ public class PutawayRequestDetailBaseVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestDetailExcelVO.java index d90bcd5483..72c71bad22 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestDetailExcelVO.java @@ -45,7 +45,7 @@ public class PutawayRequestDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -57,13 +57,13 @@ public class PutawayRequestDetailExcelVO { @ExcelProperty("创建者用户名") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestDetailExportReqVO.java index 76a9c04f50..bcbd5e808d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestDetailExportReqVO.java @@ -39,7 +39,7 @@ public class PutawayRequestDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -52,13 +52,13 @@ public class PutawayRequestDetailExportReqVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestDetailPageReqVO.java index f3e626dece..c685fafadc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestDetailPageReqVO.java @@ -42,7 +42,7 @@ public class PutawayRequestDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -55,13 +55,13 @@ public class PutawayRequestDetailPageReqVO extends PageParam { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestImportVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestImportVO.java index b7d368157e..ac38ba28ed 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestImportVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestImportVO.java @@ -35,7 +35,7 @@ public class PutawayRequestImportVO { @ExcelProperty("订单行") private String poLine; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("包装号") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestMainExcelVO.java index 72c6205073..6c92cc3c5b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestMainExcelVO.java @@ -97,16 +97,16 @@ public class PutawayRequestMainExcelVO { @ExcelProperty("从库位代码") private String fromLocationCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/recordsetting/RecordsettingController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/recordsetting/RecordsettingController.java index 4a9fa4cfb5..fe39271c9c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/recordsetting/RecordsettingController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/recordsetting/RecordsettingController.java @@ -60,7 +60,7 @@ public class RecordsettingController { return success(true); } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:recordsetting:query')") public CommonResult> getRecordsettingSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = recordsettingService.getRecordsettingSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobDetailController.java index 42ca7cd19b..249a3182f7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/RepleinshJobDetailController.java @@ -79,7 +79,7 @@ public class RepleinshJobDetailController { } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:RepleinshJobDetail:query')") public CommonResult> getRepleinshJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = repleinshJobDetailService.getRepleinshJobDetailSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobDetailBaseVO.java index f9769f7860..7cd02bc399 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobDetailBaseVO.java @@ -38,16 +38,16 @@ public class RepleinshJobDetailBaseVO { @Schema(description = "到库位代码") private String toLocationCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobDetailExcelVO.java index 52ebae976d..9b2eccadbc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobDetailExcelVO.java @@ -38,16 +38,16 @@ public class RepleinshJobDetailExcelVO { @ExcelProperty("到库位代码") private String toLocationCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobDetailExportReqVO.java index c187101a03..0f6e0734bb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobDetailExportReqVO.java @@ -33,16 +33,16 @@ public class RepleinshJobDetailExportReqVO { @Schema(description = "到库位代码") private String toLocationCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobDetailPageReqVO.java index bda108c8ff..4c12c76e44 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobDetailPageReqVO.java @@ -35,16 +35,16 @@ public class RepleinshJobDetailPageReqVO extends PageParam { @Schema(description = "到库位代码") private String toLocationCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobMainExcelVO.java index 3c16704882..25c178eda1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobMainExcelVO.java @@ -164,16 +164,16 @@ public class RepleinshJobMainExcelVO { @ExcelProperty("到库位代码") private String toLocationCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/RepleinshRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/RepleinshRecordDetailController.java index 823d2e8c53..3002a725d3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/RepleinshRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/RepleinshRecordDetailController.java @@ -65,7 +65,7 @@ public class RepleinshRecordDetailController { return success(true); } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:repleinsh-record-detail:query')") public CommonResult> getRepleinshRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = repleinshRecordDetailService.getRepleinshRecordDetailSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/vo/RepleinshRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/vo/RepleinshRecordDetailBaseVO.java index b05521c568..35d3149abc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/vo/RepleinshRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/vo/RepleinshRecordDetailBaseVO.java @@ -58,7 +58,7 @@ public class RepleinshRecordDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -71,13 +71,13 @@ public class RepleinshRecordDetailBaseVO { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/vo/RepleinshRecordDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/vo/RepleinshRecordDetailExcelVO.java index f3e7f007a7..e227d637fa 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/vo/RepleinshRecordDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/vo/RepleinshRecordDetailExcelVO.java @@ -59,7 +59,7 @@ public class RepleinshRecordDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -71,13 +71,13 @@ public class RepleinshRecordDetailExcelVO { @ExcelProperty("创建者Id") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/vo/RepleinshRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/vo/RepleinshRecordDetailExportReqVO.java index 0a1acad29b..0a7c78aba9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/vo/RepleinshRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/vo/RepleinshRecordDetailExportReqVO.java @@ -54,7 +54,7 @@ public class RepleinshRecordDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -67,13 +67,13 @@ public class RepleinshRecordDetailExportReqVO { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/vo/RepleinshRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/vo/RepleinshRecordDetailPageReqVO.java index 987f7f7715..72d335f2b6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/vo/RepleinshRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/vo/RepleinshRecordDetailPageReqVO.java @@ -56,7 +56,7 @@ public class RepleinshRecordDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -69,13 +69,13 @@ public class RepleinshRecordDetailPageReqVO extends PageParam { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/vo/RepleinshRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/vo/RepleinshRecordMainExcelVO.java index 61b213be40..2dc6a5fa6b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/vo/RepleinshRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRecord/vo/RepleinshRecordMainExcelVO.java @@ -134,16 +134,16 @@ public class RepleinshRecordMainExcelVO { @ExcelProperty("到库区代码") private String toAreaCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/RepleinshRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/RepleinshRequestDetailController.java index a514bca3ee..afe94d2d14 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/RepleinshRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/RepleinshRequestDetailController.java @@ -66,7 +66,7 @@ public class RepleinshRequestDetailController { return success(true); } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:repleinsh-request-detail:query')") public CommonResult> getRepleinshRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = repleinshRequestDetailService.getRepleinshRequestDetailSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/RepleinshRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/RepleinshRequestMainController.java index 314da0e56f..5edb9e72af 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/RepleinshRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/RepleinshRequestMainController.java @@ -78,7 +78,7 @@ public class RepleinshRequestMainController { return success(true); } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:repleinsh-request-main:query')") public CommonResult> getRepleinshRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = repleinshRequestMainService.getRepleinshRequestMainSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/vo/RepleinshRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/vo/RepleinshRequestDetailBaseVO.java index f0aa6d60a0..49568f7f0b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/vo/RepleinshRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/vo/RepleinshRequestDetailBaseVO.java @@ -30,7 +30,7 @@ public class RepleinshRequestDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -43,13 +43,13 @@ public class RepleinshRequestDetailBaseVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/vo/RepleinshRequestDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/vo/RepleinshRequestDetailExcelVO.java index 329b95fb77..4137a8d025 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/vo/RepleinshRequestDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/vo/RepleinshRequestDetailExcelVO.java @@ -29,7 +29,7 @@ public class RepleinshRequestDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -41,13 +41,13 @@ public class RepleinshRequestDetailExcelVO { @ExcelProperty("创建者用户名") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/vo/RepleinshRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/vo/RepleinshRequestDetailExportReqVO.java index 6e43bff0f8..689a08cf77 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/vo/RepleinshRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/vo/RepleinshRequestDetailExportReqVO.java @@ -24,7 +24,7 @@ public class RepleinshRequestDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -37,13 +37,13 @@ public class RepleinshRequestDetailExportReqVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/vo/RepleinshRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/vo/RepleinshRequestDetailPageReqVO.java index 5f1d45a159..23c43d0664 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/vo/RepleinshRequestDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/vo/RepleinshRequestDetailPageReqVO.java @@ -26,7 +26,7 @@ public class RepleinshRequestDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -39,13 +39,13 @@ public class RepleinshRequestDetailPageReqVO extends PageParam { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/vo/RepleinshRequestMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/vo/RepleinshRequestMainExcelVO.java index 79c24d33f9..208ebc239c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/vo/RepleinshRequestMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/vo/RepleinshRequestMainExcelVO.java @@ -99,16 +99,16 @@ public class RepleinshRequestMainExcelVO { @ExcelProperty("到库位代码") private String toLocationCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/vo/RepleinshRequestMainImportVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/vo/RepleinshRequestMainImportVO.java index 18cadfbf29..973adefee3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/vo/RepleinshRequestMainImportVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/vo/RepleinshRequestMainImportVO.java @@ -41,7 +41,7 @@ public class RepleinshRequestMainImportVO { @ExcelProperty("到库位代码") private String toLocationCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("数量") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/requestsetting/RequestsettingController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/requestsetting/RequestsettingController.java index 21b8c7ef23..179334e253 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/requestsetting/RequestsettingController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/requestsetting/RequestsettingController.java @@ -80,7 +80,7 @@ public class RequestsettingController { return success(RequestsettingConvert.INSTANCE.convert(requestsetting)); } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:Requestsetting:query')") public CommonResult> getRequestsettingSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = requestsettingService.getRequestsettingSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/RuleController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/RuleController.java index 058282c49e..4590a78983 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/RuleController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/RuleController.java @@ -75,7 +75,7 @@ public class RuleController { } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:rule:query')") public CommonResult> getRuleSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = ruleService.getRuleSenior(conditions); @@ -120,7 +120,7 @@ public class RuleController { List list =ruleService.getRuleList(exportReqVO); Map mapDropDown = new HashMap<>(); List resultList = this.getExcelVo(list, mapDropDown); - ExcelUtils.write(response, "物品基本信息.xlsx", "数据", RuleExcelVO.class, resultList, mapDropDown); + ExcelUtils.write(response, "物料基本信息.xlsx", "数据", RuleExcelVO.class, resultList, mapDropDown); } @PostMapping("/export-excel-senior") @@ -131,7 +131,7 @@ public class RuleController { List list = ruleService.getRuleList(conditions); Map mapDropDown = new HashMap<>(); List resultList = this.getExcelVo(list, mapDropDown); - ExcelUtils.write(response, "物品基本信息.xlsx", "数据", RuleExcelVO.class, resultList, mapDropDown); + ExcelUtils.write(response, "物料基本信息.xlsx", "数据", RuleExcelVO.class, resultList, mapDropDown); } private List getExcelVo(List list, Map mapDropDown) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/PrecisionStrategyReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/PrecisionStrategyReqVO.java index de104894d6..3346cba5a3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/PrecisionStrategyReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/PrecisionStrategyReqVO.java @@ -10,8 +10,8 @@ import java.util.List; @Data public class PrecisionStrategyReqVO { - @Schema(description = "物品代码") - @NotEmpty(message = "物品代码不能为空") + @Schema(description = "物料代码") + @NotEmpty(message = "物料代码不能为空") private List itemCodes; @Schema(description = "库位代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/PrecisionStrategyReqVO2.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/PrecisionStrategyReqVO2.java index fc7a27b102..f532be43c5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/PrecisionStrategyReqVO2.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/PrecisionStrategyReqVO2.java @@ -9,8 +9,8 @@ import javax.validation.constraints.NotBlank; @Data public class PrecisionStrategyReqVO2 { - @Schema(description = "物品代码") - @NotBlank(message = "物品代码不能为空") + @Schema(description = "物料代码") + @NotBlank(message = "物料代码不能为空") private String itemCode; @Schema(description = "库位代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RuleExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RuleExcelVO.java index c40803bb6a..c4a769958b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RuleExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RuleExcelVO.java @@ -11,7 +11,7 @@ import java.time.LocalDateTime; /** - * 物品基本信息 Excel VO + * 物料基本信息 Excel VO * * @author 超级管理员 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/SaleDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/SaleDetailController.java index 86dd8624af..c67906525d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/SaleDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/SaleDetailController.java @@ -92,7 +92,7 @@ public class SaleDetailController { return success(SaleDetailConvert.INSTANCE.convertPage(pageResult)); } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:sale-detail:query')") public CommonResult> getSaleDetailSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = saleDetailService.getSaleDetailSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/vo/SaleDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/vo/SaleDetailBaseVO.java index 8dd531ccb2..93929afad0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/vo/SaleDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/vo/SaleDetailBaseVO.java @@ -72,8 +72,8 @@ public class SaleDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "物品代码不能为空") + @Schema(description = "物料代码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "物料代码不能为空") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/vo/SaleDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/vo/SaleDetailExcelVO.java index b98ffd7967..a03b954b7e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/vo/SaleDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/vo/SaleDetailExcelVO.java @@ -68,7 +68,7 @@ public class SaleDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/vo/SaleDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/vo/SaleDetailExportReqVO.java index 32830b771b..d240196055 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/vo/SaleDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/vo/SaleDetailExportReqVO.java @@ -54,7 +54,7 @@ public class SaleDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/vo/SaleDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/vo/SaleDetailPageReqVO.java index c4d440a377..fa63e4e869 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/vo/SaleDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/vo/SaleDetailPageReqVO.java @@ -56,7 +56,7 @@ public class SaleDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/vo/SaleMainImportVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/vo/SaleMainImportVO.java index 19e7f59285..cd3e93d804 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/vo/SaleMainImportVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/sale/vo/SaleMainImportVO.java @@ -50,7 +50,7 @@ public class SaleMainImportVO { private String itemCode; @ExcelProperty("行号") private BigDecimal orderQty; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String uom; @ExcelProperty("订单数量") private BigDecimal overRecPercent; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobDetailController.java index c527a05e18..e226a16ce1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobDetailController.java @@ -64,7 +64,7 @@ public class ScrapJobDetailController { } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:ScrapJobDetail:query')") public CommonResult> getScrapJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = scrapJobDetailService.getScrapJobDetailSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobMainController.java index 5e3fe6b0cf..7ec27c7020 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/ScrapJobMainController.java @@ -56,7 +56,7 @@ public class ScrapJobMainController { return success(scrapJobMainService.createScrapJobMain(createReqVO)); } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:ScrapJobMain:query')") public CommonResult> getScrapJobMainSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = scrapJobMainService.getScrapJobMainSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/vo/ScrapJobDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/vo/ScrapJobDetailBaseVO.java index 741f351768..9aaf4d466c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/vo/ScrapJobDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/vo/ScrapJobDetailBaseVO.java @@ -41,16 +41,16 @@ public class ScrapJobDetailBaseVO { @Schema(description = "原因") private String reason; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/vo/ScrapJobDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/vo/ScrapJobDetailExcelVO.java index 72431c0b78..8d2a1c4966 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/vo/ScrapJobDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/vo/ScrapJobDetailExcelVO.java @@ -42,16 +42,16 @@ public class ScrapJobDetailExcelVO { @DictFormat("scrap_reason") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String reason; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/vo/ScrapJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/vo/ScrapJobDetailExportReqVO.java index 46261165ca..637737911c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/vo/ScrapJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/vo/ScrapJobDetailExportReqVO.java @@ -36,16 +36,16 @@ public class ScrapJobDetailExportReqVO { @Schema(description = "原因") private String reason; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/vo/ScrapJobDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/vo/ScrapJobDetailPageReqVO.java index 99205099d7..5118522c4a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/vo/ScrapJobDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/vo/ScrapJobDetailPageReqVO.java @@ -38,16 +38,16 @@ public class ScrapJobDetailPageReqVO extends PageParam { @Schema(description = "原因") private String reason; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/ScrapRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/ScrapRecordDetailController.java index 774eb238ea..9b98d46fc8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/ScrapRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/ScrapRecordDetailController.java @@ -73,7 +73,7 @@ public class ScrapRecordDetailController { return success(ScrapRecordDetailConvert.INSTANCE.convert(scrapRecordDetail)); } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:ScrapRecordDetail:query')") public CommonResult> getScrapRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = scrapRecordDetailService.getScrapRecordDetailSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/vo/ScrapRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/vo/ScrapRecordDetailBaseVO.java index c36569c138..0e9fed7819 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/vo/ScrapRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/vo/ScrapRecordDetailBaseVO.java @@ -55,13 +55,13 @@ public class ScrapRecordDetailBaseVO { @Schema(description = "金额") private BigDecimal amount; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -82,7 +82,7 @@ public class ScrapRecordDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/vo/ScrapRecordDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/vo/ScrapRecordDetailExcelVO.java index 0192524a84..d6489c7f10 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/vo/ScrapRecordDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/vo/ScrapRecordDetailExcelVO.java @@ -56,13 +56,13 @@ public class ScrapRecordDetailExcelVO { @ExcelProperty("金额") private BigDecimal amount; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") @@ -85,7 +85,7 @@ public class ScrapRecordDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/vo/ScrapRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/vo/ScrapRecordDetailExportReqVO.java index bda79c5bb1..c486fe1876 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/vo/ScrapRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/vo/ScrapRecordDetailExportReqVO.java @@ -48,13 +48,13 @@ public class ScrapRecordDetailExportReqVO { @Schema(description = "金额") private BigDecimal amount; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -75,7 +75,7 @@ public class ScrapRecordDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/vo/ScrapRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/vo/ScrapRecordDetailPageReqVO.java index 8dd62a804e..7c8c61a88e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/vo/ScrapRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRecord/vo/ScrapRecordDetailPageReqVO.java @@ -50,13 +50,13 @@ public class ScrapRecordDetailPageReqVO extends PageParam { @Schema(description = "金额") private BigDecimal amount; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -77,7 +77,7 @@ public class ScrapRecordDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/ScrapRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/ScrapRequestDetailController.java index df7d7a1964..be0e276b0f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/ScrapRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/ScrapRequestDetailController.java @@ -55,7 +55,7 @@ public class ScrapRequestDetailController { return success(true); } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:ScrapRequestDetail:query')") public CommonResult> getScrapRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = scrapRequestDetailService.getScrapRequestDetailSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/vo/ScrapRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/vo/ScrapRequestDetailBaseVO.java index a41e5bd586..e0ca1dd3df 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/vo/ScrapRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/vo/ScrapRequestDetailBaseVO.java @@ -45,7 +45,7 @@ public class ScrapRequestDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -58,13 +58,13 @@ public class ScrapRequestDetailBaseVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/vo/ScrapRequestDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/vo/ScrapRequestDetailExcelVO.java index 4c4e9ea5dc..c4817e8bce 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/vo/ScrapRequestDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/vo/ScrapRequestDetailExcelVO.java @@ -46,7 +46,7 @@ public class ScrapRequestDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -58,13 +58,13 @@ public class ScrapRequestDetailExcelVO { @ExcelProperty("创建者用户名") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/vo/ScrapRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/vo/ScrapRequestDetailExportReqVO.java index 2e8fda99d8..52cfcab89f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/vo/ScrapRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/vo/ScrapRequestDetailExportReqVO.java @@ -39,7 +39,7 @@ public class ScrapRequestDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -52,13 +52,13 @@ public class ScrapRequestDetailExportReqVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/vo/ScrapRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/vo/ScrapRequestDetailPageReqVO.java index a67bbdadd2..51feb40c99 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/vo/ScrapRequestDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/vo/ScrapRequestDetailPageReqVO.java @@ -41,7 +41,7 @@ public class ScrapRequestDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -54,13 +54,13 @@ public class ScrapRequestDetailPageReqVO extends PageParam { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/vo/ScrapRequestImportVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/vo/ScrapRequestImportVO.java index 9b4c296dbe..eab640179c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/vo/ScrapRequestImportVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/vo/ScrapRequestImportVO.java @@ -32,7 +32,7 @@ public class ScrapRequestImportVO { private LocalDateTime dueTime; @ExcelProperty("零件号") - @NotBlank(message = "物品代码不能为空") + @NotBlank(message = "物料代码不能为空") private String itemCode; @ExcelProperty("包装号") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/vo/ScrapRequestMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/vo/ScrapRequestMainExcelVO.java index f113fdca6c..e412c26722 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/vo/ScrapRequestMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/vo/ScrapRequestMainExcelVO.java @@ -101,16 +101,16 @@ public class ScrapRequestMainExcelVO { @ExcelProperty("原因") private String reason; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplier/SupplierController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplier/SupplierController.java index c7814f9493..d15d757aac 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplier/SupplierController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplier/SupplierController.java @@ -57,7 +57,7 @@ public class SupplierController { return success(supplierService.createSupplier(createReqVO)); } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:Supplier:query')") public CommonResult> getSupplierSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = supplierService.getSupplierSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordDetailController.java index b7a6738492..d39d310c4c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordDetailController.java @@ -73,7 +73,7 @@ public class SupplierdeliverRecordDetailController { return success(SupplierdeliverRecordDetailConvert.INSTANCE.convert(supplierdeliverRecordDetail)); } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:SupplierdeliverRecordDetail:query')") public CommonResult> getSupplierdeliverRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = supplierdeliverRecordDetailService.getSupplierdeliverRecordDetailSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordMainController.java index 8b70c84f66..bf5b3ee956 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/SupplierdeliverRecordMainController.java @@ -78,7 +78,7 @@ public class SupplierdeliverRecordMainController { } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:supplierdeliver-record-main:query')") public CommonResult> getSupplierdeliverRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = supplierdeliverRecordMainService.getSupplierdeliverRecordMainSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordDetailBaseVO.java index 56bfed6b25..108d3e5031 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordDetailBaseVO.java @@ -117,16 +117,16 @@ public class SupplierdeliverRecordDetailBaseVO { @Schema(description = "项目代码") private String projectCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "数量") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordDetailExcelVO.java index 4021feb35c..95a848b541 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordDetailExcelVO.java @@ -102,16 +102,16 @@ public class SupplierdeliverRecordDetailExcelVO { @ExcelProperty("项目代码") private String projectCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("数量") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordDetailExportReqVO.java index 83af28a2b2..b0c10fec5a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordDetailExportReqVO.java @@ -93,16 +93,16 @@ public class SupplierdeliverRecordDetailExportReqVO { @Schema(description = "项目代码") private String projectCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "数量") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordDetailPageReqVO.java index e676f67d51..a5c2166391 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordDetailPageReqVO.java @@ -95,16 +95,16 @@ public class SupplierdeliverRecordDetailPageReqVO extends PageParam { @Schema(description = "项目代码") private String projectCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "数量") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordMainExcelVO.java index 4e1c48c651..9958f215fb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRecord/vo/SupplierdeliverRecordMainExcelVO.java @@ -207,16 +207,16 @@ public class SupplierdeliverRecordMainExcelVO { @ExcelProperty("项目代码") private String projectCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("数量") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestDetailController.java index 834d139da0..c4f5f22be7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestDetailController.java @@ -59,7 +59,7 @@ public class SupplierdeliverRequestDetailController { } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:SupplierdeliverRequestDetail:query')") public CommonResult> getSupplierdeliverRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = supplierdeliverRequestDetailService.getSupplierdeliverRequestDetailSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestMainController.java index 9b9e0c8f5e..83e4162a7e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/SupplierdeliverRequestMainController.java @@ -88,7 +88,7 @@ public class SupplierdeliverRequestMainController { } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:SupplierdeliverRequestMain:query')") public CommonResult> getSupplierdeliverRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = supplierdeliverRequestMainService.getSupplierdeliverRequestMainSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailBaseVO.java index 5e9ce4d922..02ee0188cd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailBaseVO.java @@ -78,8 +78,8 @@ public class SupplierdeliverRequestDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码", requiredMode = Schema.RequiredMode.REQUIRED) -// @NotNull(message = "物品代码不能为空") + @Schema(description = "物料代码", requiredMode = Schema.RequiredMode.REQUIRED) +// @NotNull(message = "物料代码不能为空") private String itemCode; @Schema(description = "备注") @@ -92,13 +92,13 @@ public class SupplierdeliverRequestDetailBaseVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailExcelVO.java index 60a070392e..9834ce4b45 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailExcelVO.java @@ -67,7 +67,7 @@ public class SupplierdeliverRequestDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -79,13 +79,13 @@ public class SupplierdeliverRequestDetailExcelVO { @ExcelProperty("创建者用户名") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailExportReqVO.java index a5ad473e32..56d1612625 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailExportReqVO.java @@ -57,7 +57,7 @@ public class SupplierdeliverRequestDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -70,13 +70,13 @@ public class SupplierdeliverRequestDetailExportReqVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailPageReqVO.java index 7249eb6699..65e542bd36 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestDetailPageReqVO.java @@ -59,7 +59,7 @@ public class SupplierdeliverRequestDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -72,13 +72,13 @@ public class SupplierdeliverRequestDetailPageReqVO extends PageParam { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestMainImportVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestMainImportVO.java index 2a6e3c2402..bb4687de8c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestMainImportVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierdeliverRequest/vo/SupplierdeliverRequestMainImportVO.java @@ -58,7 +58,7 @@ public class SupplierdeliverRequestMainImportVO { private LocalDateTime dueTime; //子表数据 - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("批次") private String batch; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/SupplierinvoiceRecordDeatilController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/SupplierinvoiceRecordDeatilController.java index 1655e78ff8..2066e87870 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/SupplierinvoiceRecordDeatilController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/SupplierinvoiceRecordDeatilController.java @@ -92,7 +92,7 @@ public class SupplierinvoiceRecordDeatilController { return success(SupplierinvoiceRecordDeatilConvert.INSTANCE.convertPage(pageResult)); } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:supplierinvoice-record-deatil:query')") public CommonResult> getSupplierinvoiceRecordDeatilSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = supplierinvoiceRecordDeatilService.getSupplierinvoiceRecordDeatilSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/SupplierinvoiceRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/SupplierinvoiceRecordMainController.java index cdb628dc59..f9d3ad9f71 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/SupplierinvoiceRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/SupplierinvoiceRecordMainController.java @@ -61,7 +61,7 @@ public class SupplierinvoiceRecordMainController { return success(true); } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:SupplierinvoiceRecordMain:query')") public CommonResult> getSupplierinvoiceRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = supplierinvoiceRecordMainService.getSupplierinvoiceRecordMainSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/vo/SupplierinvoiceRecordDeatilBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/vo/SupplierinvoiceRecordDeatilBaseVO.java index c8385c4539..d17e672362 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/vo/SupplierinvoiceRecordDeatilBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/vo/SupplierinvoiceRecordDeatilBaseVO.java @@ -77,7 +77,7 @@ public class SupplierinvoiceRecordDeatilBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -90,13 +90,13 @@ public class SupplierinvoiceRecordDeatilBaseVO { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/vo/SupplierinvoiceRecordDeatilExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/vo/SupplierinvoiceRecordDeatilExcelVO.java index 13b4c53790..aa43fdc0d9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/vo/SupplierinvoiceRecordDeatilExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/vo/SupplierinvoiceRecordDeatilExcelVO.java @@ -71,7 +71,7 @@ public class SupplierinvoiceRecordDeatilExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -83,13 +83,13 @@ public class SupplierinvoiceRecordDeatilExcelVO { @ExcelProperty("创建者Id") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/vo/SupplierinvoiceRecordDeatilExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/vo/SupplierinvoiceRecordDeatilExportReqVO.java index 5a649d50fa..7517fb291b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/vo/SupplierinvoiceRecordDeatilExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/vo/SupplierinvoiceRecordDeatilExportReqVO.java @@ -60,7 +60,7 @@ public class SupplierinvoiceRecordDeatilExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -73,13 +73,13 @@ public class SupplierinvoiceRecordDeatilExportReqVO { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/vo/SupplierinvoiceRecordDeatilPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/vo/SupplierinvoiceRecordDeatilPageReqVO.java index b979e9d77d..4af8014305 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/vo/SupplierinvoiceRecordDeatilPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRecord/vo/SupplierinvoiceRecordDeatilPageReqVO.java @@ -62,7 +62,7 @@ public class SupplierinvoiceRecordDeatilPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -75,13 +75,13 @@ public class SupplierinvoiceRecordDeatilPageReqVO extends PageParam { @Schema(description = "创建者Id") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestDetailController.java index 7f52df56ae..24533f87ec 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestDetailController.java @@ -77,7 +77,7 @@ public class SupplierinvoiceRequestDetailController { return success(SupplierinvoiceRequestDetailConvert.INSTANCE.convert(supplierinvoiceRequestDetail)); } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:supplierinvoice-request-detail:query')") public CommonResult> getSupplierinvoiceRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = supplierinvoiceRequestDetailService.getSupplierinvoiceRequestDetailSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestDetailBaseVO.java index 3e7e6b6a1b..168ce9b7c6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestDetailBaseVO.java @@ -65,7 +65,7 @@ public class SupplierinvoiceRequestDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestDetailExcelVO.java index d90dd17098..3d4b29fbfd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestDetailExcelVO.java @@ -61,7 +61,7 @@ public class SupplierinvoiceRequestDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestDetailExportReqVO.java index 024abca4fb..87db4f0f82 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestDetailExportReqVO.java @@ -51,7 +51,7 @@ public class SupplierinvoiceRequestDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestDetailPageReqVO.java index 539eb74df6..b90ef89509 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestDetailPageReqVO.java @@ -53,7 +53,7 @@ public class SupplierinvoiceRequestDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestMainExcelVO.java index 8610664f6f..a10e5021e1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestMainExcelVO.java @@ -106,7 +106,7 @@ public class SupplierinvoiceRequestMainExcelVO { @ExcelProperty("金额") private BigDecimal amount; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/SupplieritemController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/SupplieritemController.java index fdbb3f5577..36e789d47a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/SupplieritemController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/SupplieritemController.java @@ -44,7 +44,7 @@ import java.util.*; import static com.win.framework.common.pojo.CommonResult.success; import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; -@Tag(name = "管理后台 - 供应商物品") +@Tag(name = "管理后台 - 供应商物料") @RestController @RequestMapping("/wms/supplieritem") @Validated @@ -59,14 +59,14 @@ public class SupplieritemController { private JobUtils jobUtils; @PostMapping("/create") - @Operation(summary = "创建供应商物品") + @Operation(summary = "创建供应商物料") @PreAuthorize("@ss.hasPermission('wms:supplieritem:create')") public CommonResult createSupplieritem(@Valid @RequestBody SupplieritemCreateReqVO createReqVO) { return success(supplieritemService.createSupplieritem(createReqVO)); } @PutMapping("/update") - @Operation(summary = "更新供应商物品") + @Operation(summary = "更新供应商物料") @PreAuthorize("@ss.hasPermission('wms:supplieritem:update')") public CommonResult updateSupplieritem(@Valid @RequestBody SupplieritemUpdateReqVO updateReqVO) { supplieritemService.updateSupplieritem(updateReqVO); @@ -74,7 +74,7 @@ public class SupplieritemController { } @DeleteMapping("/delete") - @Operation(summary = "删除供应商物品") + @Operation(summary = "删除供应商物料") @Parameter(name = "id", description = "编号", required = true) @PreAuthorize("@ss.hasPermission('wms:supplieritem:delete')") public CommonResult deleteSupplieritem(@RequestParam("id") Long id) { @@ -83,7 +83,7 @@ public class SupplieritemController { } @GetMapping("/get") - @Operation(summary = "获得供应商物品") + @Operation(summary = "获得供应商物料") @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('wms:supplieritem:query')") public CommonResult getSupplieritem(@RequestParam("id") Long id) { @@ -93,7 +93,7 @@ public class SupplieritemController { @GetMapping("/page") - @Operation(summary = "获得供应商物品分页") + @Operation(summary = "获得供应商物料分页") @PreAuthorize("@ss.hasPermission('wms:supplieritem:query')") public CommonResult> getSupplieritemPage(@Valid SupplieritemPageReqVO pageVO) { PageResult pageResult = supplieritemService.getSupplieritemPage(pageVO); @@ -107,7 +107,7 @@ public class SupplieritemController { } @GetMapping("/pageItembasicTypeToSupplieritem") - @Operation(summary = "获取物品属性筛选出的供应商物品") + @Operation(summary = "获取物料属性筛选出的供应商物料") @PreAuthorize("@ss.hasPermission('wms:supplieritem:query')") public CommonResult> selectItembasicTypeToSupplieritem( @Valid SupplieritemPageReqVO pageVO) { PageResult supplieritem = supplieritemService.selectItembasicTypeToSupplieritem(pageVO); @@ -116,7 +116,7 @@ public class SupplieritemController { } @PostMapping("/pageItembasicTypeToSupplieritemSenior") - @Operation(summary = "高级搜索获取物品属性筛选出的供应商物品") + @Operation(summary = "高级搜索获取物料属性筛选出的供应商物料") @PreAuthorize("@ss.hasPermission('wms:supplieritem:query')") public CommonResult selectItembasicTypeToSupplieritemSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = supplieritemService.selectItembasicTypeToSupplieritemSenior(conditions); @@ -124,7 +124,7 @@ public class SupplieritemController { } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:supplieritem:query')") public CommonResult> getSupplieritemSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = supplieritemService.getSupplieritemSenior(conditions); @@ -138,7 +138,7 @@ public class SupplieritemController { } @GetMapping("/export-excel") - @Operation(summary = "导出供应商物品 Excel") + @Operation(summary = "导出供应商物料 Excel") @PreAuthorize("@ss.hasPermission('wms:supplieritem:export')") @OperateLog(type = EXPORT) public void exportSupplieritemExcel(@Valid SupplieritemExportReqVO exportReqVO, @@ -146,17 +146,17 @@ public class SupplieritemController { List list = supplieritemService.getSupplieritemList(exportReqVO); Map mapDropDown = new HashMap<>(); List resultList = this.getExcelVo(list, mapDropDown); - ExcelUtils.write(response, "供应商物品.xlsx", "数据", SupplieritemExcelVO.class, resultList, mapDropDown); + ExcelUtils.write(response, "供应商物料.xlsx", "数据", SupplieritemExcelVO.class, resultList, mapDropDown); } @PostMapping("/export-excel-senior") - @Operation(summary = "导出供应商物品 Excel") + @Operation(summary = "导出供应商物料 Excel") @PreAuthorize("@ss.hasPermission('wms:supplieritem:export')") @OperateLog(type = EXPORT) public void exportSupplieritemExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException { List list = supplieritemService.getSupplieritemList(conditions); Map mapDropDown = new HashMap<>(); List resultList = this.getExcelVo(list, mapDropDown); - ExcelUtils.write(response, "供应商物品.xlsx", "数据", SupplieritemExcelVO.class, resultList, mapDropDown); + ExcelUtils.write(response, "供应商物料.xlsx", "数据", SupplieritemExcelVO.class, resultList, mapDropDown); } private List getExcelVo(List list, Map mapDropDown) { String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE); @@ -179,7 +179,7 @@ public class SupplieritemController { return resultList; } @GetMapping("/get-import-template") - @Operation(summary = "获得导入供应商物品信息模板") + @Operation(summary = "获得导入供应商物料信息模板") public void importTemplate(HttpServletResponse response) throws IOException { // 手动创建导出 demo List list = Arrays.asList( @@ -200,12 +200,12 @@ public class SupplieritemController { // 输出 // 输出 - ExcelUtils.write(response, "供应商物品导入模板.xls", "供应商物品列表", SupplieriteamImportExcelVo.class, list,mapDropDown); + ExcelUtils.write(response, "供应商物料导入模板.xls", "供应商物料列表", SupplieriteamImportExcelVo.class, list,mapDropDown); } @PostMapping("/import") - @Operation(summary = "导入供应商物品信息") + @Operation(summary = "导入供应商物料信息") @Parameters({ @Parameter(name = "file", description = "Excel 文件", required = true), @Parameter(name = "mode", description = "导入模式1更新2追加3覆盖", example = "1"), @@ -221,7 +221,7 @@ public class SupplieritemController { Map returnMap = new HashMap<>(); returnMap.put("errorCount", errorList.size()); if(!errorList.isEmpty()) { - String url = ExcelUtils.writeLocalFile("供应商物品导入错误数据" + LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")) + ".xls", "错误列表", errorList); + String url = ExcelUtils.writeLocalFile("供应商物料导入错误数据" + LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")) + ".xls", "错误列表", errorList); returnMap.put("errorFile", url); } return success(returnMap); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/vo/SupplieritemBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/vo/SupplieritemBaseVO.java index e34efe601b..d2f9d35734 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/vo/SupplieritemBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/vo/SupplieritemBaseVO.java @@ -11,7 +11,7 @@ import java.time.LocalDateTime; import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; /** - * 供应商物品 Base VO，提供给添加、修改、详细的子 VO 使用 + * 供应商物料 Base VO，提供给添加、修改、详细的子 VO 使用 * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 */ @Data diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/vo/SupplieritemCreateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/vo/SupplieritemCreateReqVO.java index 2c700ada5d..6ad30b1ed3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/vo/SupplieritemCreateReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/vo/SupplieritemCreateReqVO.java @@ -5,7 +5,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -@Schema(description = "管理后台 - 供应商物品创建 Request VO") +@Schema(description = "管理后台 - 供应商物料创建 Request VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/vo/SupplieritemExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/vo/SupplieritemExcelVO.java index 3c800c2fbe..4e8496abd1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/vo/SupplieritemExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/vo/SupplieritemExcelVO.java @@ -11,7 +11,7 @@ import java.time.LocalDateTime; /** - * 供应商物品 Excel VO + * 供应商物料 Excel VO * * @author 超级管理员 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/vo/SupplieritemExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/vo/SupplieritemExportReqVO.java index 02945edef7..b9b6fce834 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/vo/SupplieritemExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/vo/SupplieritemExportReqVO.java @@ -9,7 +9,7 @@ import java.time.LocalDateTime; import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; -@Schema(description = "管理后台 - 供应商物品 Excel 导出 Request VO，参数和 SupplieritemPageReqVO 是一致的") +@Schema(description = "管理后台 - 供应商物料 Excel 导出 Request VO，参数和 SupplieritemPageReqVO 是一致的") @Data public class SupplieritemExportReqVO { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/vo/SupplieritemPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/vo/SupplieritemPageReqVO.java index 1ebcd14e8d..dd2f659056 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/vo/SupplieritemPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/vo/SupplieritemPageReqVO.java @@ -12,7 +12,7 @@ import java.time.LocalDateTime; import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; -@Schema(description = "管理后台 - 供应商物品分页 Request VO") +@Schema(description = "管理后台 - 供应商物料分页 Request VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/vo/SupplieritemRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/vo/SupplieritemRespVO.java index 6bf59851b0..b15797e6b7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/vo/SupplieritemRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/vo/SupplieritemRespVO.java @@ -7,7 +7,7 @@ import lombok.ToString; import java.time.LocalDateTime; -@Schema(description = "管理后台 - 供应商物品 Response VO") +@Schema(description = "管理后台 - 供应商物料 Response VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/vo/SupplieritemUpdateReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/vo/SupplieritemUpdateReqVO.java index d3b6dfd24d..ada0fce9b5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/vo/SupplieritemUpdateReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/vo/SupplieritemUpdateReqVO.java @@ -5,7 +5,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -@Schema(description = "管理后台 - 供应商物品更新 Request VO") +@Schema(description = "管理后台 - 供应商物料更新 Request VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/systemcalendar/SystemcalendarController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/systemcalendar/SystemcalendarController.java index e53d47803b..ae421ac122 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/systemcalendar/SystemcalendarController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/systemcalendar/SystemcalendarController.java @@ -98,7 +98,7 @@ public class SystemcalendarController { return success(result); } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:Systemcalendar:query')") public CommonResult> getSystemcalendarSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = systemcalendarService.getSystemcalendarSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/team/TeamController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/team/TeamController.java index c54cd1bbac..609d779428 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/team/TeamController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/team/TeamController.java @@ -102,7 +102,7 @@ public class TeamController { return success(result); } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:team:query')") public CommonResult> getTeamSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = teamService.getTeamSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/TransactionController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/TransactionController.java index e529d7007b..c0c82621c4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/TransactionController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/TransactionController.java @@ -53,7 +53,7 @@ public class TransactionController { } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:Transaction:query')") public CommonResult> getTransactionSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = transactionService.getTransactionSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transactiontype/TransactiontypeController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transactiontype/TransactiontypeController.java index b52e7d2fc0..7d9e839eed 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transactiontype/TransactiontypeController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transactiontype/TransactiontypeController.java @@ -72,7 +72,7 @@ public class TransactiontypeController { return success(true); } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:Transactiontype:query')") public CommonResult> getTransactiontypeSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = transactiontypeService.getTransactiontypeSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobDetailController.java index 9bb6a98c7a..34ac7a1ae2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobDetailController.java @@ -50,7 +50,7 @@ public class TransferissueJobDetailController { return success(transferissueJobDetailService.createTransferissueJobDetail(createReqVO)); } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:transferissue-job-detail:query')") public CommonResult> getTransferissueJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = transferissueJobDetailService.getTransferissueJobDetailSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobMainController.java index 0ee9885cc4..56cd25ff20 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/TransferissueJobMainController.java @@ -99,7 +99,7 @@ public class TransferissueJobMainController { } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:transferissue-job-main:query')") public CommonResult> getTransferissueJobMainSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = transferissueJobMainService.getTransferissueJobMainSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/vo/TransferissueJobDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/vo/TransferissueJobDetailBaseVO.java index fa98f5fea7..6e13435c12 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/vo/TransferissueJobDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/vo/TransferissueJobDetailBaseVO.java @@ -43,16 +43,16 @@ public class TransferissueJobDetailBaseVO { @NotNull(message = "到库位代码不能为空") private String toLocationCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/vo/TransferissueJobDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/vo/TransferissueJobDetailExcelVO.java index 89b4429eda..e9c0353921 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/vo/TransferissueJobDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/vo/TransferissueJobDetailExcelVO.java @@ -37,16 +37,16 @@ public class TransferissueJobDetailExcelVO { @ExcelProperty("到库位代码") private String toLocationCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/vo/TransferissueJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/vo/TransferissueJobDetailExportReqVO.java index 13c7a8845d..9cf852a029 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/vo/TransferissueJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/vo/TransferissueJobDetailExportReqVO.java @@ -33,16 +33,16 @@ public class TransferissueJobDetailExportReqVO { @Schema(description = "到库位代码") private String toLocationCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/vo/TransferissueJobDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/vo/TransferissueJobDetailPageReqVO.java index a898d57818..4e69090b7d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/vo/TransferissueJobDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueJob/vo/TransferissueJobDetailPageReqVO.java @@ -35,16 +35,16 @@ public class TransferissueJobDetailPageReqVO extends PageParam { @Schema(description = "到库位代码") private String toLocationCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/TransferissueRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/TransferissueRecordDetailController.java index c62652e2fa..d665b33aa8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/TransferissueRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/TransferissueRecordDetailController.java @@ -78,7 +78,7 @@ public class TransferissueRecordDetailController { return success(TransferissueRecordDetailConvert.INSTANCE.convertList(list)); } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:transferissue-record-detail:query')") public CommonResult> getTransferissueRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = transferissueRecordDetailService.getTransferissueRequestDetailSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/TransferissueRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/TransferissueRecordMainController.java index 27d16d83ba..6f1f33c931 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/TransferissueRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/TransferissueRecordMainController.java @@ -58,7 +58,7 @@ public class TransferissueRecordMainController { return success(true); } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:TransferissueRecordMain:query')") public CommonResult> getTransferissueRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = transferissueRecordMainService.getTransferissueRecordMainSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/vo/TransferissueRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/vo/TransferissueRecordDetailBaseVO.java index 1840ab36db..de22adcc5c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/vo/TransferissueRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/vo/TransferissueRecordDetailBaseVO.java @@ -59,13 +59,13 @@ public class TransferissueRecordDetailBaseVO { @Schema(description = "接口类型") private String interfaceType; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -83,8 +83,8 @@ public class TransferissueRecordDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "物品代码不能为空") + @Schema(description = "物料代码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "物料代码不能为空") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/vo/TransferissueRecordDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/vo/TransferissueRecordDetailExcelVO.java index 8e795d349f..e3762cce5f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/vo/TransferissueRecordDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/vo/TransferissueRecordDetailExcelVO.java @@ -57,13 +57,13 @@ public class TransferissueRecordDetailExcelVO { @DictFormat("interface_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String interfaceType; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") @@ -79,7 +79,7 @@ public class TransferissueRecordDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/vo/TransferissueRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/vo/TransferissueRecordDetailExportReqVO.java index e4a661ff60..034a77446f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/vo/TransferissueRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/vo/TransferissueRecordDetailExportReqVO.java @@ -51,13 +51,13 @@ public class TransferissueRecordDetailExportReqVO { @Schema(description = "接口类型") private String interfaceType; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -72,7 +72,7 @@ public class TransferissueRecordDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/vo/TransferissueRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/vo/TransferissueRecordDetailPageReqVO.java index dc7e2ee5bc..591d220d87 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/vo/TransferissueRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRecord/vo/TransferissueRecordDetailPageReqVO.java @@ -53,13 +53,13 @@ public class TransferissueRecordDetailPageReqVO extends PageParam { @Schema(description = "接口类型") private String interfaceType; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -74,7 +74,7 @@ public class TransferissueRecordDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/TransferissueRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/TransferissueRequestDetailController.java index 3bf9e4f171..2a8a7444c0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/TransferissueRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/TransferissueRequestDetailController.java @@ -49,7 +49,7 @@ public class TransferissueRequestDetailController { } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:itembasic:query')") public CommonResult> getTransferissueRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = transferissueRequestDetailService.getTransferissueRequestDetailSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/TransferissueRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/TransferissueRequestMainController.java index 17c061aead..1d139323d9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/TransferissueRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/TransferissueRequestMainController.java @@ -61,7 +61,7 @@ public class TransferissueRequestMainController { } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:itembasic:query')") public CommonResult> getTransferissueRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = transferissueRequestMainService.getTransferissueRequestMainSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/vo/TransferissueRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/vo/TransferissueRequestDetailBaseVO.java index f63013d139..9067d7811d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/vo/TransferissueRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/vo/TransferissueRequestDetailBaseVO.java @@ -43,8 +43,8 @@ public class TransferissueRequestDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "物品代码不能为空") + @Schema(description = "物料代码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "物料代码不能为空") private String itemCode; @Schema(description = "备注") @@ -57,13 +57,13 @@ public class TransferissueRequestDetailBaseVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/vo/TransferissueRequestDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/vo/TransferissueRequestDetailExcelVO.java index 3c854ea78c..81d6241d88 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/vo/TransferissueRequestDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/vo/TransferissueRequestDetailExcelVO.java @@ -42,7 +42,7 @@ public class TransferissueRequestDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -54,13 +54,13 @@ public class TransferissueRequestDetailExcelVO { @ExcelProperty("创建者用户名") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/vo/TransferissueRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/vo/TransferissueRequestDetailExportReqVO.java index a3a93b4142..d84172a836 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/vo/TransferissueRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/vo/TransferissueRequestDetailExportReqVO.java @@ -36,7 +36,7 @@ public class TransferissueRequestDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -49,13 +49,13 @@ public class TransferissueRequestDetailExportReqVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/vo/TransferissueRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/vo/TransferissueRequestDetailPageReqVO.java index 7a4f88ee0c..3759d4edea 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/vo/TransferissueRequestDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/vo/TransferissueRequestDetailPageReqVO.java @@ -38,7 +38,7 @@ public class TransferissueRequestDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -51,13 +51,13 @@ public class TransferissueRequestDetailPageReqVO extends PageParam { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferlog/TransferlogController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferlog/TransferlogController.java index 8079f5c5c8..772c28ade0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferlog/TransferlogController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferlog/TransferlogController.java @@ -44,7 +44,7 @@ public class TransferlogController { private AdminUserApi userApi; @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:itembasic:query')") public CommonResult> getTransferlogSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = transferlogService.getTransferlogSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobDetailController.java index 6184f8b2a2..7374911c00 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobDetailController.java @@ -45,7 +45,7 @@ public class TransferreceiptJobDetailController { return success(transferreceiptJobDetailService.createTransferreceiptJobDetail(createReqVO)); } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:itembasic:query')") public CommonResult> getTransferreceiptJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = transferreceiptJobDetailService.getTransferreceiptJobDetailSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobMainController.java index 7a1780166b..904e8d3cab 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/TransferreceiptJobMainController.java @@ -96,7 +96,7 @@ public class TransferreceiptJobMainController { } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:itembasic:query')") public CommonResult> getTransferreceiptJobMainSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = transferreceiptJobMainService.getTransferreceiptJobMainSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/vo/TransferreceiptJobDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/vo/TransferreceiptJobDetailBaseVO.java index 3bc79a929c..4c20e4186f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/vo/TransferreceiptJobDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/vo/TransferreceiptJobDetailBaseVO.java @@ -39,16 +39,16 @@ public class TransferreceiptJobDetailBaseVO { @Schema(description = "到库位代码") private String toLocationCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称", example = "张三") + @Schema(description = "物料名称", example = "张三") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/vo/TransferreceiptJobDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/vo/TransferreceiptJobDetailExcelVO.java index 789748dd69..54d4349153 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/vo/TransferreceiptJobDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/vo/TransferreceiptJobDetailExcelVO.java @@ -38,16 +38,16 @@ public class TransferreceiptJobDetailExcelVO { @ExcelProperty("到库位代码") private String toLocationCode; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/vo/TransferreceiptJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/vo/TransferreceiptJobDetailExportReqVO.java index 2ad61ee5e1..54c62671dc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/vo/TransferreceiptJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/vo/TransferreceiptJobDetailExportReqVO.java @@ -33,16 +33,16 @@ public class TransferreceiptJobDetailExportReqVO { @Schema(description = "到库位代码") private String toLocationCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称", example = "张三") + @Schema(description = "物料名称", example = "张三") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/vo/TransferreceiptJobDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/vo/TransferreceiptJobDetailPageReqVO.java index 3ac1b69961..b774ff88dd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/vo/TransferreceiptJobDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptJob/vo/TransferreceiptJobDetailPageReqVO.java @@ -35,16 +35,16 @@ public class TransferreceiptJobDetailPageReqVO extends PageParam { @Schema(description = "到库位代码") private String toLocationCode; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称", example = "张三") + @Schema(description = "物料名称", example = "张三") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/TransferreceiptRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/TransferreceiptRecordDetailController.java index d19460d9ca..ad926dfcb6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/TransferreceiptRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/TransferreceiptRecordDetailController.java @@ -88,7 +88,7 @@ public class TransferreceiptRecordDetailController { } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:itembasic:query')") public CommonResult> getTransferreceiptRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = transferreceiptRecordDetailService.getTransferreceiptRecordDetailSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/TransferreceiptRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/TransferreceiptRecordMainController.java index bcbfc6e72f..de0942fa2f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/TransferreceiptRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/TransferreceiptRecordMainController.java @@ -66,7 +66,7 @@ public class TransferreceiptRecordMainController { @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:TransferreceiptRecordMain:query')") public CommonResult> getTransferreceiptRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = transferreceiptRecordMainService.getTransferreceiptRecordMainSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/vo/TransferreceiptRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/vo/TransferreceiptRecordDetailBaseVO.java index 437f890fca..6d43cd03b3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/vo/TransferreceiptRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/vo/TransferreceiptRecordDetailBaseVO.java @@ -50,13 +50,13 @@ public class TransferreceiptRecordDetailBaseVO { @Schema(description = "到库区代码") private String toAreaCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -77,7 +77,7 @@ public class TransferreceiptRecordDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "物料代码", requiredMode = Schema.RequiredMode.REQUIRED) private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/vo/TransferreceiptRecordDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/vo/TransferreceiptRecordDetailExcelVO.java index bb5e343f91..fa6b36abaa 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/vo/TransferreceiptRecordDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/vo/TransferreceiptRecordDetailExcelVO.java @@ -50,13 +50,13 @@ public class TransferreceiptRecordDetailExcelVO { @ExcelProperty("到库区代码") private String toAreaCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") @@ -79,7 +79,7 @@ public class TransferreceiptRecordDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/vo/TransferreceiptRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/vo/TransferreceiptRecordDetailExportReqVO.java index dd660356f8..17c6df7188 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/vo/TransferreceiptRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/vo/TransferreceiptRecordDetailExportReqVO.java @@ -45,13 +45,13 @@ public class TransferreceiptRecordDetailExportReqVO { @Schema(description = "到库区代码") private String toAreaCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -72,7 +72,7 @@ public class TransferreceiptRecordDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/vo/TransferreceiptRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/vo/TransferreceiptRecordDetailPageReqVO.java index 55a888e3e9..86759e1e76 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/vo/TransferreceiptRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRecord/vo/TransferreceiptRecordDetailPageReqVO.java @@ -47,13 +47,13 @@ public class TransferreceiptRecordDetailPageReqVO extends PageParam { @Schema(description = "到库区代码") private String toAreaCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -74,7 +74,7 @@ public class TransferreceiptRecordDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/TransferreceiptRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/TransferreceiptRequestDetailController.java index 251b05b2e4..0d247f7d8d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/TransferreceiptRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/TransferreceiptRequestDetailController.java @@ -50,7 +50,7 @@ public class TransferreceiptRequestDetailController { return success(transferreceiptRequestDetailService.createTransferreceiptRequestDetail(createReqVO)); } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:itembasic:query')") public CommonResult> getTransferreceiptRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = transferreceiptRequestDetailService.getTransferreceiptRequestDetailSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/TransferreceiptRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/TransferreceiptRequestMainController.java index 838d152297..a01f8a8125 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/TransferreceiptRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/TransferreceiptRequestMainController.java @@ -88,7 +88,7 @@ public class TransferreceiptRequestMainController { } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:transferreceipt-request-main:query')") public CommonResult> getTransferreceiptRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = transferreceiptRequestMainService.getTransferreceiptRequestMainSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/vo/TransferreceiptRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/vo/TransferreceiptRequestDetailBaseVO.java index 863985636b..c9e35f8fb4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/vo/TransferreceiptRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/vo/TransferreceiptRequestDetailBaseVO.java @@ -44,8 +44,8 @@ public class TransferreceiptRequestDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "物品代码不能为空") + @Schema(description = "物料代码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "物料代码不能为空") private String itemCode; @Schema(description = "备注") @@ -59,13 +59,13 @@ public class TransferreceiptRequestDetailBaseVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/vo/TransferreceiptRequestDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/vo/TransferreceiptRequestDetailExcelVO.java index fdd2f86d3d..1b3d0fcc13 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/vo/TransferreceiptRequestDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/vo/TransferreceiptRequestDetailExcelVO.java @@ -42,7 +42,7 @@ public class TransferreceiptRequestDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -54,13 +54,13 @@ public class TransferreceiptRequestDetailExcelVO { @ExcelProperty("创建者用户名") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/vo/TransferreceiptRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/vo/TransferreceiptRequestDetailExportReqVO.java index 2a4c2e295e..4380dd0697 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/vo/TransferreceiptRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/vo/TransferreceiptRequestDetailExportReqVO.java @@ -36,7 +36,7 @@ public class TransferreceiptRequestDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -49,13 +49,13 @@ public class TransferreceiptRequestDetailExportReqVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/vo/TransferreceiptRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/vo/TransferreceiptRequestDetailPageReqVO.java index 3b926f57a6..9f4b8d1e87 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/vo/TransferreceiptRequestDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/vo/TransferreceiptRequestDetailPageReqVO.java @@ -38,7 +38,7 @@ public class TransferreceiptRequestDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -51,13 +51,13 @@ public class TransferreceiptRequestDetailPageReqVO extends PageParam { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/UnplannedissueJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/UnplannedissueJobMainController.java index 302f43427c..05d325343e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/UnplannedissueJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/UnplannedissueJobMainController.java @@ -66,7 +66,7 @@ public class UnplannedissueJobMainController { } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:itembasic:query')") public CommonResult> getUnplannedissueJobMainSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = unplannedissueJobMainService.getUnplannedissueJobMainSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/vo/UnplannedissueJobDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/vo/UnplannedissueJobDetailBaseVO.java index 4232b9824c..495089ee4b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/vo/UnplannedissueJobDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/vo/UnplannedissueJobDetailBaseVO.java @@ -45,16 +45,16 @@ public class UnplannedissueJobDetailBaseVO { @Schema(description = "原因") private String reason; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/vo/UnplannedissueJobDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/vo/UnplannedissueJobDetailExcelVO.java index 526d8bb622..046bdd8dca 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/vo/UnplannedissueJobDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/vo/UnplannedissueJobDetailExcelVO.java @@ -42,16 +42,16 @@ public class UnplannedissueJobDetailExcelVO { @DictFormat("unplanned_issue_reason") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String reason; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/vo/UnplannedissueJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/vo/UnplannedissueJobDetailExportReqVO.java index c71b953d8b..3819ff7e00 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/vo/UnplannedissueJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/vo/UnplannedissueJobDetailExportReqVO.java @@ -36,16 +36,16 @@ public class UnplannedissueJobDetailExportReqVO { @Schema(description = "原因") private String reason; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/vo/UnplannedissueJobDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/vo/UnplannedissueJobDetailPageReqVO.java index 4469f511c6..87f72cb5b7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/vo/UnplannedissueJobDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueJob/vo/UnplannedissueJobDetailPageReqVO.java @@ -38,16 +38,16 @@ public class UnplannedissueJobDetailPageReqVO extends PageParam { @Schema(description = "原因") private String reason; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/UnplannedissueRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/UnplannedissueRecordDetailController.java index fab1d61bac..7f87894078 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/UnplannedissueRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/UnplannedissueRecordDetailController.java @@ -47,7 +47,7 @@ public class UnplannedissueRecordDetailController { } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:itembasic:query')") public CommonResult> getUnplannedissueRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = unplannedissueRecordDetailService.getUnplannedissueRecordDetailSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/UnplannedissueRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/UnplannedissueRecordMainController.java index 004453f626..c31f74b90c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/UnplannedissueRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/UnplannedissueRecordMainController.java @@ -91,7 +91,7 @@ public class UnplannedissueRecordMainController { } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:unplannedissue-record-main:query')") public CommonResult> getUnplannedissueRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = unplannedissueRecordMainService.getUnplannedissueRecordMainSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordDetailBaseVO.java index 78f923d9e8..1935c6d928 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordDetailBaseVO.java @@ -55,13 +55,13 @@ public class UnplannedissueRecordDetailBaseVO { @Schema(description = "金额") private BigDecimal amount; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -82,7 +82,7 @@ public class UnplannedissueRecordDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "物料代码", requiredMode = Schema.RequiredMode.REQUIRED) private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordDetailExcelVO.java index c709105aac..64a2029698 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordDetailExcelVO.java @@ -56,13 +56,13 @@ public class UnplannedissueRecordDetailExcelVO { @ExcelProperty("金额") private BigDecimal amount; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") @@ -85,7 +85,7 @@ public class UnplannedissueRecordDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordDetailExportReqVO.java index 8d768ebe93..5a93d82f5d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordDetailExportReqVO.java @@ -48,13 +48,13 @@ public class UnplannedissueRecordDetailExportReqVO { @Schema(description = "金额") private BigDecimal amount; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -75,7 +75,7 @@ public class UnplannedissueRecordDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordDetailPageReqVO.java index 8b6f6f5261..55a1cba24d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordDetailPageReqVO.java @@ -50,13 +50,13 @@ public class UnplannedissueRecordDetailPageReqVO extends PageParam { @Schema(description = "金额") private BigDecimal amount; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -77,7 +77,7 @@ public class UnplannedissueRecordDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/UnplannedissueRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/UnplannedissueRequestDetailController.java index d8e6c7250b..ed4f2b5a70 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/UnplannedissueRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/UnplannedissueRequestDetailController.java @@ -82,7 +82,7 @@ public class UnplannedissueRequestDetailController { } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:unplannedissue-request-detail:query')") public CommonResult> getUnplannedissueRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = unplannedissueRequestDetailService.getUnplannedissueRequestDetailSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/UnplannedissueRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/UnplannedissueRequestMainController.java index 524cb100b4..de114bb965 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/UnplannedissueRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/UnplannedissueRequestMainController.java @@ -93,7 +93,7 @@ public class UnplannedissueRequestMainController { } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:unplannedissue-request-main:query')") public CommonResult> getUnplannedissueRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = unplannedissueRequestMainService.getUnplannedissueRequestMainSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/vo/UnplannedissueRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/vo/UnplannedissueRequestDetailBaseVO.java index 98a05a6667..99ee847d3c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/vo/UnplannedissueRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/vo/UnplannedissueRequestDetailBaseVO.java @@ -49,8 +49,8 @@ public class UnplannedissueRequestDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "物品代码不能为空") + @Schema(description = "物料代码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "物料代码不能为空") private String itemCode; @Schema(description = "备注") @@ -63,13 +63,13 @@ public class UnplannedissueRequestDetailBaseVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/vo/UnplannedissueRequestDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/vo/UnplannedissueRequestDetailExcelVO.java index 0e93f77a26..36f06088d0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/vo/UnplannedissueRequestDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/vo/UnplannedissueRequestDetailExcelVO.java @@ -46,7 +46,7 @@ public class UnplannedissueRequestDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -58,13 +58,13 @@ public class UnplannedissueRequestDetailExcelVO { @ExcelProperty("创建者用户名") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/vo/UnplannedissueRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/vo/UnplannedissueRequestDetailExportReqVO.java index 0fb3bbe0e5..1a09bb24ae 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/vo/UnplannedissueRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/vo/UnplannedissueRequestDetailExportReqVO.java @@ -37,7 +37,7 @@ public class UnplannedissueRequestDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -50,13 +50,13 @@ public class UnplannedissueRequestDetailExportReqVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/vo/UnplannedissueRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/vo/UnplannedissueRequestDetailPageReqVO.java index f01c9db581..b472155dea 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/vo/UnplannedissueRequestDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/vo/UnplannedissueRequestDetailPageReqVO.java @@ -41,7 +41,7 @@ public class UnplannedissueRequestDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -54,13 +54,13 @@ public class UnplannedissueRequestDetailPageReqVO extends PageParam { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/vo/UnplannedissueRequestMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/vo/UnplannedissueRequestMainExcelVO.java index 7785952180..dfab35ecd6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/vo/UnplannedissueRequestMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/vo/UnplannedissueRequestMainExcelVO.java @@ -98,16 +98,16 @@ public class UnplannedissueRequestMainExcelVO { @ExcelProperty("原因") private String reason; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty(value = "计量单位",converter = DictConvert.class) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/UnplannedreceiptJobDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/UnplannedreceiptJobDetailController.java index 676cfa6557..daf2d3699f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/UnplannedreceiptJobDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/UnplannedreceiptJobDetailController.java @@ -56,7 +56,7 @@ public class UnplannedreceiptJobDetailController { @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:unplannedreceipt-job-detail:query')") public CommonResult> getUnplannedreceiptJobDetailSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = unplannedreceiptJobDetailService.getUnplannedreceiptJobDetailSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/UnplannedreceiptJobMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/UnplannedreceiptJobMainController.java index 5226b89eb7..c06b3e1597 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/UnplannedreceiptJobMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/UnplannedreceiptJobMainController.java @@ -72,7 +72,7 @@ public class UnplannedreceiptJobMainController { return success(true); } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:unplannedreceipt-job-main:query')") public CommonResult> getUnplannedreceiptJobMainSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = unplannedreceiptJobMainService.getUnplannedreceiptJobMainSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/vo/UnplannedreceiptJobDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/vo/UnplannedreceiptJobDetailBaseVO.java index 88b1e25797..ada495e5ba 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/vo/UnplannedreceiptJobDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/vo/UnplannedreceiptJobDetailBaseVO.java @@ -66,16 +66,16 @@ public class UnplannedreceiptJobDetailBaseVO { @Schema(description = "原因") private String reason; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/vo/UnplannedreceiptJobDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/vo/UnplannedreceiptJobDetailExcelVO.java index 0c0831a4bb..cc5fcfcd98 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/vo/UnplannedreceiptJobDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/vo/UnplannedreceiptJobDetailExcelVO.java @@ -57,16 +57,16 @@ public class UnplannedreceiptJobDetailExcelVO { @DictFormat("unplanned_receipt_reason") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String reason; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/vo/UnplannedreceiptJobDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/vo/UnplannedreceiptJobDetailExportReqVO.java index 87c8e06dae..5797d373ce 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/vo/UnplannedreceiptJobDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/vo/UnplannedreceiptJobDetailExportReqVO.java @@ -51,16 +51,16 @@ public class UnplannedreceiptJobDetailExportReqVO { @Schema(description = "原因") private String reason; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/vo/UnplannedreceiptJobDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/vo/UnplannedreceiptJobDetailPageReqVO.java index 204cd2773f..c67b99241c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/vo/UnplannedreceiptJobDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/vo/UnplannedreceiptJobDetailPageReqVO.java @@ -53,16 +53,16 @@ public class UnplannedreceiptJobDetailPageReqVO extends PageParam { @Schema(description = "原因") private String reason; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/UnplannedreceiptRecordDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/UnplannedreceiptRecordDetailController.java index 1432314e55..ffbea28a98 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/UnplannedreceiptRecordDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/UnplannedreceiptRecordDetailController.java @@ -90,7 +90,7 @@ public class UnplannedreceiptRecordDetailController { } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:unplannedreceipt-record-detail:query')") public CommonResult> getUnplannedreceiptRecordDetailSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = unplannedreceiptRecordDetailService.getUnplannedreceiptRecordDetailSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/UnplannedreceiptRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/UnplannedreceiptRecordMainController.java index 8bb1c8f8bf..379370dac0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/UnplannedreceiptRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/UnplannedreceiptRecordMainController.java @@ -64,7 +64,7 @@ public class UnplannedreceiptRecordMainController { return success(true); } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:unplannedreceiptRecordMain:query')") public CommonResult> getUnplannedreceiptRecordMainSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = unplannedreceiptRecordMainService.getUnplannedreceiptRecordMainSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/vo/UnplannedreceiptRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/vo/UnplannedreceiptRecordDetailBaseVO.java index 5cdf1f6543..5cc2df838f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/vo/UnplannedreceiptRecordDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/vo/UnplannedreceiptRecordDetailBaseVO.java @@ -66,13 +66,13 @@ public class UnplannedreceiptRecordDetailBaseVO { @Schema(description = "金额") private Integer amount; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -93,7 +93,7 @@ public class UnplannedreceiptRecordDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/vo/UnplannedreceiptRecordDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/vo/UnplannedreceiptRecordDetailExcelVO.java index b7ad7fc147..57988b43b1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/vo/UnplannedreceiptRecordDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/vo/UnplannedreceiptRecordDetailExcelVO.java @@ -68,13 +68,13 @@ public class UnplannedreceiptRecordDetailExcelVO { @ExcelProperty("金额") private Integer amount; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") @@ -97,7 +97,7 @@ public class UnplannedreceiptRecordDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/vo/UnplannedreceiptRecordDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/vo/UnplannedreceiptRecordDetailExportReqVO.java index 1e8a95b1e6..3da8572e05 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/vo/UnplannedreceiptRecordDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/vo/UnplannedreceiptRecordDetailExportReqVO.java @@ -61,13 +61,13 @@ public class UnplannedreceiptRecordDetailExportReqVO { @Schema(description = "金额") private Integer amount; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -88,7 +88,7 @@ public class UnplannedreceiptRecordDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/vo/UnplannedreceiptRecordDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/vo/UnplannedreceiptRecordDetailPageReqVO.java index c6fa7767f2..927d94fc93 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/vo/UnplannedreceiptRecordDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/vo/UnplannedreceiptRecordDetailPageReqVO.java @@ -63,13 +63,13 @@ public class UnplannedreceiptRecordDetailPageReqVO extends PageParam { @Schema(description = "金额") private Integer amount; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") @@ -90,7 +90,7 @@ public class UnplannedreceiptRecordDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/UnplannedreceiptRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/UnplannedreceiptRequestDetailController.java index 07a66e73c7..ddebff03e9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/UnplannedreceiptRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/UnplannedreceiptRequestDetailController.java @@ -91,7 +91,7 @@ public class UnplannedreceiptRequestDetailController { } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:unplannedreceiptRequestDetail:query')") public CommonResult> getUnplannedreceiptRequestDetailSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = unplannedreceiptRequestDetailService.getUnplannedreceiptRequestDetailSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/UnplannedreceiptRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/UnplannedreceiptRequestMainController.java index bfcfac8f50..cd9d51ecfa 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/UnplannedreceiptRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/UnplannedreceiptRequestMainController.java @@ -102,7 +102,7 @@ public class UnplannedreceiptRequestMainController { } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:unplannedreceipt-request-main:query')") public CommonResult> getUnplannedreceiptRequestMainSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = unplannedreceiptRequestMainService.getUnplannedreceiptRequestMainSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/vo/UnplannedreceiptRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/vo/UnplannedreceiptRequestDetailBaseVO.java index d370c9d772..b87d8dc598 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/vo/UnplannedreceiptRequestDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/vo/UnplannedreceiptRequestDetailBaseVO.java @@ -63,7 +63,7 @@ public class UnplannedreceiptRequestDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -76,13 +76,13 @@ public class UnplannedreceiptRequestDetailBaseVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/vo/UnplannedreceiptRequestDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/vo/UnplannedreceiptRequestDetailExcelVO.java index 748326d8a2..dfecd2ddf9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/vo/UnplannedreceiptRequestDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/vo/UnplannedreceiptRequestDetailExcelVO.java @@ -55,7 +55,7 @@ public class UnplannedreceiptRequestDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") @@ -67,13 +67,13 @@ public class UnplannedreceiptRequestDetailExcelVO { @ExcelProperty("创建者用户名") private String creator; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/vo/UnplannedreceiptRequestDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/vo/UnplannedreceiptRequestDetailExportReqVO.java index 5a6d8f8102..9bcf684892 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/vo/UnplannedreceiptRequestDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/vo/UnplannedreceiptRequestDetailExportReqVO.java @@ -53,7 +53,7 @@ public class UnplannedreceiptRequestDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -66,13 +66,13 @@ public class UnplannedreceiptRequestDetailExportReqVO { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/vo/UnplannedreceiptRequestDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/vo/UnplannedreceiptRequestDetailPageReqVO.java index c560f46d87..f5ac6248d6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/vo/UnplannedreceiptRequestDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/vo/UnplannedreceiptRequestDetailPageReqVO.java @@ -56,7 +56,7 @@ public class UnplannedreceiptRequestDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") @@ -69,13 +69,13 @@ public class UnplannedreceiptRequestDetailPageReqVO extends PageParam { @Schema(description = "创建者用户名") private String creator; - @Schema(description = "物品名称") + @Schema(description = "物料名称") private String itemName; - @Schema(description = "物品描述1") + @Schema(description = "物料描述1") private String itemDesc1; - @Schema(description = "物品描述2") + @Schema(description = "物料描述2") private String itemDesc2; @Schema(description = "项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/vo/UnplannedreceiptRequestMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/vo/UnplannedreceiptRequestMainExcelVO.java index b2fa71333e..e1f3b21ebc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/vo/UnplannedreceiptRequestMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/vo/UnplannedreceiptRequestMainExcelVO.java @@ -120,16 +120,16 @@ public class UnplannedreceiptRequestMainExcelVO { @DictFormat("unplanned_receipt_reason") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String reason; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; - @ExcelProperty("物品名称") + @ExcelProperty("物料名称") private String itemName; - @ExcelProperty("物品描述1") + @ExcelProperty("物料描述1") private String itemDesc1; - @ExcelProperty("物品描述2") + @ExcelProperty("物料描述2") private String itemDesc2; @ExcelProperty("项目代码") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/warehouse/WarehouseController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/warehouse/WarehouseController.java index 03400bdcf7..fdc966c1db 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/warehouse/WarehouseController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/warehouse/WarehouseController.java @@ -191,7 +191,7 @@ public class WarehouseController { } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:warehouse:query')") public CommonResult> getWarehouseSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = warehouseService.getWarehouseSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/WorkMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/WorkMainController.java index aa9717ea07..c59d76a453 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/WorkMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/WorkMainController.java @@ -104,7 +104,7 @@ public class WorkMainController { return success(WorkMainConvert.INSTANCE.convertPage(pageResult)); } @PostMapping("/senior") - @Operation(summary = "高级搜索获得物品基本信息分页") + @Operation(summary = "高级搜索获得物料基本信息分页") @PreAuthorize("@ss.hasPermission('wms:work-main:query')") public CommonResult> getWorkMainSenior(@Valid @RequestBody CustomConditions conditions) { PageResult pageResult = workMainService.getWorkMainSenior(conditions); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/vo/WorkDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/vo/WorkDetailBaseVO.java index b9066342f8..afe7fae316 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/vo/WorkDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/vo/WorkDetailBaseVO.java @@ -35,8 +35,8 @@ public class WorkDetailBaseVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "物品代码不能为空") + @Schema(description = "物料代码", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "物料代码不能为空") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/vo/WorkDetailExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/vo/WorkDetailExcelVO.java index 8db0576520..658a29f2a0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/vo/WorkDetailExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/vo/WorkDetailExcelVO.java @@ -33,7 +33,7 @@ public class WorkDetailExcelVO { @ExcelProperty("单据号") private String number; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/vo/WorkDetailExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/vo/WorkDetailExportReqVO.java index 7a4f7b7867..6538a441a9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/vo/WorkDetailExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/vo/WorkDetailExportReqVO.java @@ -27,7 +27,7 @@ public class WorkDetailExportReqVO { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/vo/WorkDetailPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/vo/WorkDetailPageReqVO.java index 4f85be1d97..5b70d5691a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/vo/WorkDetailPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/vo/WorkDetailPageReqVO.java @@ -29,7 +29,7 @@ public class WorkDetailPageReqVO extends PageParam { @Schema(description = "单据号") private String number; - @Schema(description = "物品代码") + @Schema(description = "物料代码") private String itemCode; @Schema(description = "备注") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/vo/WorkMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/vo/WorkMainExcelVO.java index 13e7782eb2..b9a652c02f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/vo/WorkMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/vo/WorkMainExcelVO.java @@ -77,7 +77,7 @@ public class WorkMainExcelVO { @ExcelProperty("完工数量") private BigDecimal finishedQty; - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("备注2") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/vo/WorkMainImportVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/vo/WorkMainImportVO.java index ba7a7098ec..b2503fe631 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/vo/WorkMainImportVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/work/vo/WorkMainImportVO.java @@ -38,7 +38,7 @@ public class WorkMainImportVO { private String dueDate; //子表数据 - @ExcelProperty("物品代码") + @ExcelProperty("物料代码") private String itemCode; @ExcelProperty("订单数量") private BigDecimal orderQty; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/customeritem/CustomeritemConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/customeritem/CustomeritemConvert.java index 634af310db..19f41b6a47 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/customeritem/CustomeritemConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/customeritem/CustomeritemConvert.java @@ -11,7 +11,7 @@ import org.mapstruct.factory.Mappers; import java.util.List; /** - * 客户物品 Convert + * 客户物料 Convert * * @author 超级管理员 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/itembasic/ItembasicConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/itembasic/ItembasicConvert.java index 41dda3414e..ceb6629ca2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/itembasic/ItembasicConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/itembasic/ItembasicConvert.java @@ -9,7 +9,7 @@ import org.mapstruct.factory.Mappers; import java.util.List; /** - * 物品基本信息 Convert + * 物料基本信息 Convert * * @author 超级管理员 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/itempackaging/ItempackagingConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/itempackaging/ItempackagingConvert.java index 37b47ab14f..66598e644f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/itempackaging/ItempackagingConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/itempackaging/ItempackagingConvert.java @@ -16,7 +16,7 @@ import org.mapstruct.factory.Mappers; import java.util.List; /** - * 物品包装信息 Convert + * 物料包装信息 Convert * * @author 超级管理员 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/supplieritem/SupplieritemConvert.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/supplieritem/SupplieritemConvert.java index 45831586b6..ba820c87d7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/supplieritem/SupplieritemConvert.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/convert/supplieritem/SupplieritemConvert.java @@ -10,7 +10,7 @@ import org.mapstruct.factory.Mappers; import com.win.module.wms.dal.dataobject.supplieritem.SupplieritemDO; /** - * 供应商物品 Convert + * 供应商物料 Convert * * @author 超级管理员 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/backflushRequest/BackflushRequestDetailbDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/backflushRequest/BackflushRequestDetailbDO.java index 6e369b7e33..2ffb133b0d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/backflushRequest/BackflushRequestDetailbDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/backflushRequest/BackflushRequestDetailbDO.java @@ -36,7 +36,7 @@ public class BackflushRequestDetailbDO extends BaseDO { */ private String bomVersion; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -52,15 +52,15 @@ public class BackflushRequestDetailbDO extends BaseDO { */ private String remark; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/businesstype/BusinesstypeDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/businesstype/BusinesstypeDO.java index 3fbfe94eb5..82b5e68ece 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/businesstype/BusinesstypeDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/businesstype/BusinesstypeDO.java @@ -42,13 +42,13 @@ public class BusinesstypeDO extends BaseDO { */ private String description; /** - * 可用物品类型范围 + * 可用物料类型范围 * * 枚举 {@link TODO item_type 对应的类} */ private String itemTypes; /** - * 可用物品状态范围 + * 可用物料状态范围 * * 枚举 {@link TODO item_status 对应的类} */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countJob/CountJobDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countJob/CountJobDetailDO.java index 000998821b..9114da88b7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countJob/CountJobDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countJob/CountJobDetailDO.java @@ -53,19 +53,19 @@ public class CountJobDetailDO extends BaseDO { */ private String inventoryStatus; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countPlan/CountPlanMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countPlan/CountPlanMainDO.java index 64f5538ed4..f2dbde5b72 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countPlan/CountPlanMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countPlan/CountPlanMainDO.java @@ -54,7 +54,7 @@ public class CountPlanMainDO extends BaseDO { */ private BigDecimal limitedValue; /** - * 物品忽略名单 + * 物料忽略名单 */ private String ignoreListOfItem; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countRecord/CountRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countRecord/CountRecordDetailDO.java index b9ec865998..35a1641387 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countRecord/CountRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countRecord/CountRecordDetailDO.java @@ -83,15 +83,15 @@ public class CountRecordDetailDO extends BaseDO { */ private String countDescription; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** @@ -127,7 +127,7 @@ public class CountRecordDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countRequest/CountRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countRequest/CountRequestDetailDO.java index 1973f24509..a5f371f6bf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countRequest/CountRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countRequest/CountRequestDetailDO.java @@ -67,15 +67,15 @@ public class CountRequestDetailDO extends BaseDO { */ private Long siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** @@ -98,7 +98,7 @@ public class CountRequestDetailDO extends BaseDO { @Version private Integer concurrencyStamp; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countadjustRecord/CountadjustRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countadjustRecord/CountadjustRecordDetailDO.java index 6728eb1d39..2abee0d522 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countadjustRecord/CountadjustRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countadjustRecord/CountadjustRecordDetailDO.java @@ -70,15 +70,15 @@ public class CountadjustRecordDetailDO extends BaseDO { */ private BigDecimal adjustQty; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** @@ -114,7 +114,7 @@ public class CountadjustRecordDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countadjustRequest/CountadjustRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countadjustRequest/CountadjustRequestDetailDO.java index 4b8326fadf..f6cbfa04ad 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countadjustRequest/CountadjustRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countadjustRequest/CountadjustRequestDetailDO.java @@ -87,15 +87,15 @@ public class CountadjustRequestDetailDO extends BaseDO { */ private Long siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** @@ -118,7 +118,7 @@ public class CountadjustRequestDetailDO extends BaseDO { @Version private Integer concurrencyStamp; /** - * 物品代码 + * 物料代码 */ private String itemCode; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customeritem/CustomeritemDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customeritem/CustomeritemDO.java index 36aa0c1313..4819c12b0f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customeritem/CustomeritemDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customeritem/CustomeritemDO.java @@ -14,7 +14,7 @@ import com.baomidou.mybatisplus.annotation.*; import com.win.framework.mybatis.core.dataobject.BaseDO; /** - * 客户物品 DO + * 客户物料 DO * * @author 超级管理员 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreceiptRecord/CustomerreceiptRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreceiptRecord/CustomerreceiptRecordDetailDO.java index 7606d40602..13ddc3141c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreceiptRecord/CustomerreceiptRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreceiptRecord/CustomerreceiptRecordDetailDO.java @@ -104,7 +104,7 @@ public class CustomerreceiptRecordDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -116,15 +116,15 @@ public class CustomerreceiptRecordDetailDO extends BaseDO { */ private String siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreceiptRequest/CustomerreceiptRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreceiptRequest/CustomerreceiptRequestDetailDO.java index 3706fa1436..c8c2596244 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreceiptRequest/CustomerreceiptRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreceiptRequest/CustomerreceiptRequestDetailDO.java @@ -70,7 +70,7 @@ public class CustomerreceiptRequestDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -82,15 +82,15 @@ public class CustomerreceiptRequestDetailDO extends BaseDO { */ private Long siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnJob/CustomerreturnJobDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnJob/CustomerreturnJobDetailDO.java index 0d9240362e..b64cfab6fe 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnJob/CustomerreturnJobDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnJob/CustomerreturnJobDetailDO.java @@ -65,19 +65,19 @@ public class CustomerreturnJobDetailDO extends BaseDO { */ private String toLocationCode; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnRecord/CustomerreturnRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnRecord/CustomerreturnRecordDetailDO.java index 5434e3342d..18f267ee28 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnRecord/CustomerreturnRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnRecord/CustomerreturnRecordDetailDO.java @@ -104,7 +104,7 @@ public class CustomerreturnRecordDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -116,15 +116,15 @@ public class CustomerreturnRecordDetailDO extends BaseDO { */ private String siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnRequest/CustomerreturnRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnRequest/CustomerreturnRequestDetailDO.java index 02d7b40e4a..1e91f8e95e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnRequest/CustomerreturnRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnRequest/CustomerreturnRequestDetailDO.java @@ -78,7 +78,7 @@ public class CustomerreturnRequestDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -90,15 +90,15 @@ public class CustomerreturnRequestDetailDO extends BaseDO { */ private Long siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customersettleRecord/CustomersettleRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customersettleRecord/CustomersettleRecordDetailDO.java index dfc3512e5e..f4e26f0006 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customersettleRecord/CustomersettleRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customersettleRecord/CustomersettleRecordDetailDO.java @@ -76,15 +76,15 @@ public class CustomersettleRecordDetailDO extends BaseDO { */ private BigDecimal amount; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** @@ -120,7 +120,7 @@ public class CustomersettleRecordDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customersettleRequest/CustomersettleRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customersettleRequest/CustomersettleRequestDetailDO.java index 96b833a832..35f5f5d953 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customersettleRequest/CustomersettleRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customersettleRequest/CustomersettleRequestDetailDO.java @@ -67,7 +67,7 @@ public class CustomersettleRequestDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -79,15 +79,15 @@ public class CustomersettleRequestDetailDO extends BaseDO { */ private Long siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverJob/DeliverJobDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverJob/DeliverJobDetailDO.java index d78887231f..6e737a2d55 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverJob/DeliverJobDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverJob/DeliverJobDetailDO.java @@ -65,19 +65,19 @@ public class DeliverJobDetailDO extends BaseDO { */ private String toLocationCode; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverPlan/DeliverPlanDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverPlan/DeliverPlanDetailDO.java index a9be2ea8d5..cacb4e6409 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverPlan/DeliverPlanDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverPlan/DeliverPlanDetailDO.java @@ -53,7 +53,7 @@ public class DeliverPlanDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverRecord/DeliverRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverRecord/DeliverRecordDetailDO.java index 65682607ab..e1c6ba02ef 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverRecord/DeliverRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverRecord/DeliverRecordDetailDO.java @@ -104,7 +104,7 @@ public class DeliverRecordDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -116,15 +116,15 @@ public class DeliverRecordDetailDO extends BaseDO { */ private String siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverRequest/DeliverRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverRequest/DeliverRequestDetailDO.java index 26c7b8eb7f..bb108ecb57 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverRequest/DeliverRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverRequest/DeliverRequestDetailDO.java @@ -84,19 +84,19 @@ public class DeliverRequestDetailDO extends BaseDO { */ private Long siteId; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/demandforecasting/DemandforecastingDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/demandforecasting/DemandforecastingDetailDO.java index b7f5f7e8fc..289344ff21 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/demandforecasting/DemandforecastingDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/demandforecasting/DemandforecastingDetailDO.java @@ -48,7 +48,7 @@ public class DemandforecastingDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectJob/InspectJobDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectJob/InspectJobDetailDO.java index dcbecc60d8..335613385f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectJob/InspectJobDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectJob/InspectJobDetailDO.java @@ -61,19 +61,19 @@ public class InspectJobDetailDO extends BaseDO { */ private String siteId; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectJob/InspectJobMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectJob/InspectJobMainDO.java index aed6576bec..d9d554cc97 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectJob/InspectJobMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectJob/InspectJobMainDO.java @@ -168,7 +168,7 @@ public class InspectJobMainDO extends BaseDO { */ private String batch; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectRecord/InspectRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectRecord/InspectRecordDetailDO.java index 8670bc5681..18c7ebe1d3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectRecord/InspectRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectRecord/InspectRecordDetailDO.java @@ -113,7 +113,7 @@ public class InspectRecordDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -129,15 +129,15 @@ public class InspectRecordDetailDO extends BaseDO { */ private String siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectRecord/InspectRecordMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectRecord/InspectRecordMainDO.java index 335b29bedd..c86bceaea2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectRecord/InspectRecordMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectRecord/InspectRecordMainDO.java @@ -174,7 +174,7 @@ public class InspectRecordMainDO extends BaseDO { */ private BigDecimal batchNotPassedQty; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectRequest/InspectRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectRequest/InspectRequestDetailDO.java index fba48044f2..fd9c4a39cd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectRequest/InspectRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectRequest/InspectRequestDetailDO.java @@ -60,19 +60,19 @@ public class InspectRequestDetailDO extends BaseDO { */ private Long masterId; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectRequest/InspectRequestMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectRequest/InspectRequestMainDO.java index 3425a391a1..6d6a1d38ff 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectRequest/InspectRequestMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectRequest/InspectRequestMainDO.java @@ -111,7 +111,7 @@ public class InspectRequestMainDO extends BaseDO { */ private String batch; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorychangeRecord/InventorychangeRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorychangeRecord/InventorychangeRecordDetailDO.java index a1c413f55b..23992c6a93 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorychangeRecord/InventorychangeRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorychangeRecord/InventorychangeRecordDetailDO.java @@ -132,15 +132,15 @@ public class InventorychangeRecordDetailDO extends BaseDO { */ private String toInventoryStatus; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** @@ -176,7 +176,7 @@ public class InventorychangeRecordDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorychangeRequest/InventorychangeRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorychangeRequest/InventorychangeRequestDetailDO.java index bd06627e84..d809d3fb8d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorychangeRequest/InventorychangeRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorychangeRequest/InventorychangeRequestDetailDO.java @@ -139,15 +139,15 @@ public class InventorychangeRequestDetailDO extends BaseDO { */ private Long siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** @@ -169,7 +169,7 @@ public class InventorychangeRequestDetailDO extends BaseDO { */ private String concurrencyStamp; /** - * 物品代码 + * 物料代码 */ private String itemCode; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventoryinitRecord/InventoryinitRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventoryinitRecord/InventoryinitRecordDetailDO.java index dc3b7ee644..b19075c79e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventoryinitRecord/InventoryinitRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventoryinitRecord/InventoryinitRecordDetailDO.java @@ -105,15 +105,15 @@ public class InventoryinitRecordDetailDO extends BaseDO { */ private BigDecimal amount; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** @@ -145,7 +145,7 @@ public class InventoryinitRecordDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventoryinitRequest/InventoryinitRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventoryinitRequest/InventoryinitRequestDetailDO.java index d22e86ccfb..069b9dd719 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventoryinitRequest/InventoryinitRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventoryinitRequest/InventoryinitRequestDetailDO.java @@ -112,15 +112,15 @@ public class InventoryinitRequestDetailDO extends BaseDO { */ private Long siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** @@ -138,7 +138,7 @@ public class InventoryinitRequestDetailDO extends BaseDO { */ private String concurrencyStamp; /** - * 物品代码 + * 物料代码 */ private String itemCode; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveJob/InventorymoveJobDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveJob/InventorymoveJobDetailDO.java index 6611f6f6a5..3ac81c5392 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveJob/InventorymoveJobDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveJob/InventorymoveJobDetailDO.java @@ -28,19 +28,19 @@ public class InventorymoveJobDetailDO extends BaseDO { @TableId private Long id; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveRecord/InventorymoveRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveRecord/InventorymoveRecordDetailDO.java index 467fd55766..f8ea9f39fd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveRecord/InventorymoveRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveRecord/InventorymoveRecordDetailDO.java @@ -100,15 +100,15 @@ public class InventorymoveRecordDetailDO extends BaseDO { */ private String toInventoryStatus; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** @@ -144,7 +144,7 @@ public class InventorymoveRecordDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveRequest/InventorymoveRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveRequest/InventorymoveRequestDetailDO.java index b32e4460e2..27e3dbab6c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveRequest/InventorymoveRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveRequest/InventorymoveRequestDetailDO.java @@ -96,15 +96,15 @@ public class InventorymoveRequestDetailDO extends BaseDO { */ private Long siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** @@ -126,7 +126,7 @@ public class InventorymoveRequestDetailDO extends BaseDO { */ private String concurrencyStamp; /** - * 物品代码 + * 物料代码 */ private String itemCode; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueJob/IssueJobDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueJob/IssueJobDetailDO.java index d8c2edea0b..a8fa48f0fb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueJob/IssueJobDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueJob/IssueJobDetailDO.java @@ -67,19 +67,19 @@ public class IssueJobDetailDO extends BaseDO { */ private String toLocationCode; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueRecord/IssueRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueRecord/IssueRecordDetailDO.java index cd84ee92ad..19f686af2f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueRecord/IssueRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueRecord/IssueRecordDetailDO.java @@ -109,7 +109,7 @@ public class IssueRecordDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -121,15 +121,15 @@ public class IssueRecordDetailDO extends BaseDO { */ private String siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueRequest/IssueRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueRequest/IssueRequestDetailDO.java index b9243a4260..3593e9a4a0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueRequest/IssueRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueRequest/IssueRequestDetailDO.java @@ -70,7 +70,7 @@ public class IssueRequestDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -82,15 +82,15 @@ public class IssueRequestDetailDO extends BaseDO { */ private String siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/itembasic/ItembasicDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/itembasic/ItembasicDO.java index e9cbef2773..8adee4684d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/itembasic/ItembasicDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/itembasic/ItembasicDO.java @@ -11,7 +11,7 @@ import lombok.*; import java.time.LocalDateTime; /** - * 物品基本信息 DO + * 物料基本信息 DO * * @author 超级管理员 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/itempackaging/ItempackagingDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/itempackaging/ItempackagingDO.java index 76687d352e..5b36b93451 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/itempackaging/ItempackagingDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/itempackaging/ItempackagingDO.java @@ -16,7 +16,7 @@ import com.baomidou.mybatisplus.annotation.*; import com.win.framework.mybatis.core.dataobject.BaseDO; /** - * 物品包装信息 DO + * 物料包装信息 DO * * @author 超级管理员 */ @@ -36,7 +36,7 @@ public class ItempackagingDO extends BaseDO { @TableId private Long id; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/offlinesettlementRecord/OfflinesettlementRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/offlinesettlementRecord/OfflinesettlementRecordDetailDO.java index e34fe17fbe..f73492f59b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/offlinesettlementRecord/OfflinesettlementRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/offlinesettlementRecord/OfflinesettlementRecordDetailDO.java @@ -57,19 +57,19 @@ public class OfflinesettlementRecordDetailDO extends BaseDO { */ private String areaCode; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/offlinesettlementRequest/OfflinesettlementRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/offlinesettlementRequest/OfflinesettlementRequestDetailDO.java index 310035c128..61e913b199 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/offlinesettlementRequest/OfflinesettlementRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/offlinesettlementRequest/OfflinesettlementRequestDetailDO.java @@ -50,15 +50,15 @@ public class OfflinesettlementRequestDetailDO extends BaseDO { */ private String locationCode; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** @@ -88,7 +88,7 @@ public class OfflinesettlementRequestDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/onlinesettlementRecord/OnlinesettlementRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/onlinesettlementRecord/OnlinesettlementRecordDetailDO.java index 646ab80561..4525a6d6ec 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/onlinesettlementRecord/OnlinesettlementRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/onlinesettlementRecord/OnlinesettlementRecordDetailDO.java @@ -57,19 +57,19 @@ public class OnlinesettlementRecordDetailDO extends BaseDO { */ private String areaCode; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/onlinesettlementRequest/OnlinesettlementRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/onlinesettlementRequest/OnlinesettlementRequestDetailDO.java index c0ef0482c1..2258dc9a40 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/onlinesettlementRequest/OnlinesettlementRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/onlinesettlementRequest/OnlinesettlementRequestDetailDO.java @@ -50,15 +50,15 @@ public class OnlinesettlementRequestDetailDO extends BaseDO { */ private String locationCode; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** @@ -88,7 +88,7 @@ public class OnlinesettlementRequestDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packageMassage/PackageDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packageMassage/PackageDO.java index 554ebbc43a..301a1c5eb6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packageMassage/PackageDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packageMassage/PackageDO.java @@ -38,15 +38,15 @@ public class PackageDO extends BaseDO { */ private String itemCode; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** @@ -120,7 +120,7 @@ public class PackageDO extends BaseDO { */ private String supplierCode; /** - * 供应商物品代码 + * 供应商物料代码 */ private String supplierItemCode; /** @@ -168,7 +168,7 @@ public class PackageDO extends BaseDO { */ private String customerDockCode; /** - * 客户物品代码 + * 客户物料代码 */ private String customerItemCode; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packagemergemain/PackagemergeDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packagemergemain/PackagemergeDetailDO.java index 7b4a736f58..e90e3de5f1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packagemergemain/PackagemergeDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packagemergemain/PackagemergeDetailDO.java @@ -89,7 +89,7 @@ public class PackagemergeDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -101,15 +101,15 @@ public class PackagemergeDetailDO extends BaseDO { */ private String siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packageovermain/PackageoverDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packageovermain/PackageoverDetailDO.java index 750d9b74c0..b707444bf0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packageovermain/PackageoverDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packageovermain/PackageoverDetailDO.java @@ -89,7 +89,7 @@ public class PackageoverDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -101,15 +101,15 @@ public class PackageoverDetailDO extends BaseDO { */ private String siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packagesplitmain/PackagesplitDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packagesplitmain/PackagesplitDetailDO.java index 98180b3dc3..6c6a47c91d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packagesplitmain/PackagesplitDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packagesplitmain/PackagesplitDetailDO.java @@ -89,7 +89,7 @@ public class PackagesplitDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -101,15 +101,15 @@ public class PackagesplitDetailDO extends BaseDO { */ private String siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/pickJob/PickJobDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/pickJob/PickJobDetailDO.java index ec56e70beb..f0aff15154 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/pickJob/PickJobDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/pickJob/PickJobDetailDO.java @@ -53,19 +53,19 @@ public class PickJobDetailDO extends BaseDO { */ private String toLocationCode; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/pickRecord/PickRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/pickRecord/PickRecordDetailDO.java index 1c9c2169f5..fc477b8fd3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/pickRecord/PickRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/pickRecord/PickRecordDetailDO.java @@ -89,7 +89,7 @@ public class PickRecordDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -101,15 +101,15 @@ public class PickRecordDetailDO extends BaseDO { */ private String siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/pickRequest/PickRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/pickRequest/PickRequestDetailDO.java index 231206375f..99bbe93df6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/pickRequest/PickRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/pickRequest/PickRequestDetailDO.java @@ -44,7 +44,7 @@ public class PickRequestDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -56,15 +56,15 @@ public class PickRequestDetailDO extends BaseDO { */ private String siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/preparetoissue/PreparetoissueDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/preparetoissue/PreparetoissueDetailDO.java index 958defca55..c7ddd0271e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/preparetoissue/PreparetoissueDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/preparetoissue/PreparetoissueDetailDO.java @@ -49,7 +49,7 @@ public class PreparetoissueDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleJob/ProductdismantleJobDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleJob/ProductdismantleJobDetailDO.java index 1150d4bad0..1daaa2219a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleJob/ProductdismantleJobDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleJob/ProductdismantleJobDetailDO.java @@ -82,19 +82,19 @@ public class ProductdismantleJobDetailDO extends BaseDO { */ private String backFlushDetails; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleRecord/ProductdismantleRecordDetailaDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleRecord/ProductdismantleRecordDetailaDO.java index a9cece23ee..67cd019e43 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleRecord/ProductdismantleRecordDetailaDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleRecord/ProductdismantleRecordDetailaDO.java @@ -95,7 +95,7 @@ public class ProductdismantleRecordDetailaDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -107,15 +107,15 @@ public class ProductdismantleRecordDetailaDO extends BaseDO { */ private String siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleRecord/ProductdismantleRecordDetailbDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleRecord/ProductdismantleRecordDetailbDO.java index c7fb900317..7c1ae7d7b9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleRecord/ProductdismantleRecordDetailbDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleRecord/ProductdismantleRecordDetailbDO.java @@ -70,7 +70,7 @@ public class ProductdismantleRecordDetailbDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -82,15 +82,15 @@ public class ProductdismantleRecordDetailbDO extends BaseDO { */ private String siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleRequest/ProductdismantleRequestDetailaDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleRequest/ProductdismantleRequestDetailaDO.java index 563314e036..ba1ec3ae70 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleRequest/ProductdismantleRequestDetailaDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleRequest/ProductdismantleRequestDetailaDO.java @@ -90,7 +90,7 @@ public class ProductdismantleRequestDetailaDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -102,15 +102,15 @@ public class ProductdismantleRequestDetailaDO extends BaseDO { */ private String siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleRequest/ProductdismantleRequestDetailbDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleRequest/ProductdismantleRequestDetailbDO.java index dc8dee2abd..c8bc7fe800 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleRequest/ProductdismantleRequestDetailbDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleRequest/ProductdismantleRequestDetailbDO.java @@ -36,7 +36,7 @@ public class ProductdismantleRequestDetailbDO extends BaseDO { */ private String bomVersion; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -52,15 +52,15 @@ public class ProductdismantleRequestDetailbDO extends BaseDO { */ private String remark; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/production/ProductionDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/production/ProductionDetailDO.java index 5cf0b23eab..6b80306506 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/production/ProductionDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/production/ProductionDetailDO.java @@ -51,7 +51,7 @@ public class ProductionDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionlineitem/ProductionlineitemDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionlineitem/ProductionlineitemDO.java index f0d1dc88ae..d6ff9c2e63 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionlineitem/ProductionlineitemDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionlineitem/ProductionlineitemDO.java @@ -40,7 +40,7 @@ public class ProductionlineitemDO extends BaseDO { */ private String productionLineCode; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreceiptJob/ProductionreceiptJobDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreceiptJob/ProductionreceiptJobDetailDO.java index 8067058700..34a1797233 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreceiptJob/ProductionreceiptJobDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreceiptJob/ProductionreceiptJobDetailDO.java @@ -65,19 +65,19 @@ public class ProductionreceiptJobDetailDO extends BaseDO { */ private String toLocationCode; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreceiptRecord/ProductionreceiptRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreceiptRecord/ProductionreceiptRecordDetailDO.java index 6023dc6809..851f6597f4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreceiptRecord/ProductionreceiptRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreceiptRecord/ProductionreceiptRecordDetailDO.java @@ -93,7 +93,7 @@ public class ProductionreceiptRecordDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -105,15 +105,15 @@ public class ProductionreceiptRecordDetailDO extends BaseDO { */ private String siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreturnJob/ProductionreturnJobDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreturnJob/ProductionreturnJobDetailDO.java index aca3a86bf0..ba5ce7521d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreturnJob/ProductionreturnJobDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreturnJob/ProductionreturnJobDetailDO.java @@ -61,19 +61,19 @@ public class ProductionreturnJobDetailDO extends BaseDO { */ private String toLocationCode; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreturnRecord/ProductionreturnRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreturnRecord/ProductionreturnRecordDetailDO.java index 33539a4cf0..ca7b1a764b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreturnRecord/ProductionreturnRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreturnRecord/ProductionreturnRecordDetailDO.java @@ -105,7 +105,7 @@ public class ProductionreturnRecordDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -117,15 +117,15 @@ public class ProductionreturnRecordDetailDO extends BaseDO { */ private String siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreturnRequest/ProductionreturnRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreturnRequest/ProductionreturnRequestDetailDO.java index 925485102b..8559f22e17 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreturnRequest/ProductionreturnRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreturnRequest/ProductionreturnRequestDetailDO.java @@ -70,7 +70,7 @@ public class ProductionreturnRequestDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -82,15 +82,15 @@ public class ProductionreturnRequestDetailDO extends BaseDO { */ private String siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productputawayJob/ProductputawayJobDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productputawayJob/ProductputawayJobDetailDO.java index af1ffac278..b5d8d00ef7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productputawayJob/ProductputawayJobDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productputawayJob/ProductputawayJobDetailDO.java @@ -61,19 +61,19 @@ public class ProductputawayJobDetailDO extends BaseDO { */ private String toLocationCode; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productputawayRecord/ProductputawayRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productputawayRecord/ProductputawayRecordDetailDO.java index 7ce0b69262..41a8c801cc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productputawayRecord/ProductputawayRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productputawayRecord/ProductputawayRecordDetailDO.java @@ -105,7 +105,7 @@ public class ProductputawayRecordDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -117,15 +117,15 @@ public class ProductputawayRecordDetailDO extends BaseDO { */ private String siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productputawayRequest/ProductputawayRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productputawayRequest/ProductputawayRequestDetailDO.java index 6670eb9ed9..8ec177c6c8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productputawayRequest/ProductputawayRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productputawayRequest/ProductputawayRequestDetailDO.java @@ -72,7 +72,7 @@ public class ProductputawayRequestDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -84,15 +84,15 @@ public class ProductputawayRequestDetailDO extends BaseDO { */ private String siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productreceiptJob/ProductreceiptJobDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productreceiptJob/ProductreceiptJobDetailDO.java index 52917755e6..a6650544ec 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productreceiptJob/ProductreceiptJobDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productreceiptJob/ProductreceiptJobDetailDO.java @@ -94,19 +94,19 @@ public class ProductreceiptJobDetailDO extends BaseDO { */ private String backFlushDetails; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productreceiptRecord/BackflushRecordDetailbDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productreceiptRecord/BackflushRecordDetailbDO.java index ec1f81ec8e..8d05fb4753 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productreceiptRecord/BackflushRecordDetailbDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productreceiptRecord/BackflushRecordDetailbDO.java @@ -63,15 +63,15 @@ public class BackflushRecordDetailbDO extends BaseDO { */ private String fromAreaCode; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** @@ -97,7 +97,7 @@ public class BackflushRecordDetailbDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productreceiptRecord/ProductreceiptRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productreceiptRecord/ProductreceiptRecordDetailDO.java index 5541609a1d..739475f0b4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productreceiptRecord/ProductreceiptRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productreceiptRecord/ProductreceiptRecordDetailDO.java @@ -114,7 +114,7 @@ public class ProductreceiptRecordDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -126,15 +126,15 @@ public class ProductreceiptRecordDetailDO extends BaseDO { */ private String siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productreceiptRequest/ProductreceiptRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productreceiptRequest/ProductreceiptRequestDetailDO.java index a1f2a3f68e..6610dbee10 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productreceiptRequest/ProductreceiptRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productreceiptRequest/ProductreceiptRequestDetailDO.java @@ -100,7 +100,7 @@ public class ProductreceiptRequestDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -116,15 +116,15 @@ public class ProductreceiptRequestDetailDO extends BaseDO { */ private String siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRecord/ConsumeRecordDetailbDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRecord/ConsumeRecordDetailbDO.java index 18b1443898..611623731e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRecord/ConsumeRecordDetailbDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRecord/ConsumeRecordDetailbDO.java @@ -62,7 +62,7 @@ public class ConsumeRecordDetailbDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -74,15 +74,15 @@ public class ConsumeRecordDetailbDO extends BaseDO { */ private String siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRecord/ProductrepairRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRecord/ProductrepairRecordDetailDO.java index c1afa00c14..b8fa6f71ae 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRecord/ProductrepairRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRecord/ProductrepairRecordDetailDO.java @@ -95,7 +95,7 @@ public class ProductrepairRecordDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -107,15 +107,15 @@ public class ProductrepairRecordDetailDO extends BaseDO { */ private String siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRequest/ProductrepairRequestDetailaDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRequest/ProductrepairRequestDetailaDO.java index 86a03b00ab..7b9100ad38 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRequest/ProductrepairRequestDetailaDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRequest/ProductrepairRequestDetailaDO.java @@ -78,7 +78,7 @@ public class ProductrepairRequestDetailaDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -90,15 +90,15 @@ public class ProductrepairRequestDetailaDO extends BaseDO { */ private Long siteLd; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRequest/ProductrepairRequestDetailbDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRequest/ProductrepairRequestDetailbDO.java index c366f6d3b7..d7d2602bc2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRequest/ProductrepairRequestDetailbDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRequest/ProductrepairRequestDetailbDO.java @@ -54,7 +54,7 @@ public class ProductrepairRequestDetailbDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -66,15 +66,15 @@ public class ProductrepairRequestDetailbDO extends BaseDO { */ private Long siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productscrapJob/ProductscrapJobDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productscrapJob/ProductscrapJobDetailDO.java index e4a267b248..4501b08201 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productscrapJob/ProductscrapJobDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productscrapJob/ProductscrapJobDetailDO.java @@ -59,19 +59,19 @@ public class ProductscrapJobDetailDO extends BaseDO { */ private String reason; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productscrapRecord/ProductscrapRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productscrapRecord/ProductscrapRecordDetailDO.java index c1198f1383..818ea8a035 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productscrapRecord/ProductscrapRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productscrapRecord/ProductscrapRecordDetailDO.java @@ -77,15 +77,15 @@ public class ProductscrapRecordDetailDO extends BaseDO { */ private BigDecimal amount; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** @@ -121,7 +121,7 @@ public class ProductscrapRecordDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productscrapRecord/RawscrapRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productscrapRecord/RawscrapRecordDetailDO.java index 173f92793f..4b7c31eb68 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productscrapRecord/RawscrapRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productscrapRecord/RawscrapRecordDetailDO.java @@ -59,7 +59,7 @@ public class RawscrapRecordDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -71,15 +71,15 @@ public class RawscrapRecordDetailDO extends BaseDO { */ private String siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productscrapRequest/ProductscrapRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productscrapRequest/ProductscrapRequestDetailDO.java index 1d8884719b..e357b2bb60 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productscrapRequest/ProductscrapRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productscrapRequest/ProductscrapRequestDetailDO.java @@ -74,7 +74,7 @@ public class ProductscrapRequestDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -86,15 +86,15 @@ public class ProductscrapRequestDetailDO extends BaseDO { */ private Long siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productscrapRequest/RawscrapRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productscrapRequest/RawscrapRequestDetailDO.java index a05a4d07f3..f76da4d3e6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productscrapRequest/RawscrapRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productscrapRequest/RawscrapRequestDetailDO.java @@ -52,7 +52,7 @@ public class RawscrapRequestDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -64,15 +64,15 @@ public class RawscrapRequestDetailDO extends BaseDO { */ private Long siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchase/PurchaseDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchase/PurchaseDetailDO.java index 55068e02a0..db709dafea 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchase/PurchaseDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchase/PurchaseDetailDO.java @@ -105,7 +105,7 @@ public class PurchaseDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasePlan/PurchasePlanDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasePlan/PurchasePlanDetailDO.java index fe54171d8c..b350684c45 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasePlan/PurchasePlanDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasePlan/PurchasePlanDetailDO.java @@ -45,7 +45,7 @@ public class PurchasePlanDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchaseclaimRecord/PurchaseclaimRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchaseclaimRecord/PurchaseclaimRecordDetailDO.java index fea2788a2e..2f31889ec9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchaseclaimRecord/PurchaseclaimRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchaseclaimRecord/PurchaseclaimRecordDetailDO.java @@ -67,7 +67,7 @@ public class PurchaseclaimRecordDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -79,15 +79,15 @@ public class PurchaseclaimRecordDetailDO extends BaseDO { */ private String siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchaseclaimRequest/PurchaseclaimRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchaseclaimRequest/PurchaseclaimRequestDetailDO.java index 2baff5b47a..75b673630a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchaseclaimRequest/PurchaseclaimRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchaseclaimRequest/PurchaseclaimRequestDetailDO.java @@ -64,7 +64,7 @@ public class PurchaseclaimRequestDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -76,15 +76,15 @@ public class PurchaseclaimRequestDetailDO extends BaseDO { */ private String siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptJob/PurchasereceiptJobDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptJob/PurchasereceiptJobDetailDO.java index 660497db01..cbad1c5743 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptJob/PurchasereceiptJobDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptJob/PurchasereceiptJobDetailDO.java @@ -108,19 +108,19 @@ public class PurchasereceiptJobDetailDO extends BaseDO { */ private BigDecimal convertRate; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptRecord/PurchasereceiptRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptRecord/PurchasereceiptRecordDetailDO.java index 443ca9211a..eac1968f93 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptRecord/PurchasereceiptRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptRecord/PurchasereceiptRecordDetailDO.java @@ -162,19 +162,19 @@ public class PurchasereceiptRecordDetailDO extends BaseDO { */ private String jobDetailId; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptRecord/PurchaseshortageDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptRecord/PurchaseshortageDetailDO.java index 6e62d19fde..1e0081ea22 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptRecord/PurchaseshortageDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptRecord/PurchaseshortageDetailDO.java @@ -153,19 +153,19 @@ public class PurchaseshortageDetailDO extends BaseDO { */ private String jobDetailId; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptRequest/PurchasereceiptRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptRequest/PurchasereceiptRequestDetailDO.java index 53d6b5b4b2..d62224e7f1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptRequest/PurchasereceiptRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptRequest/PurchasereceiptRequestDetailDO.java @@ -112,7 +112,7 @@ public class PurchasereceiptRequestDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -124,15 +124,15 @@ public class PurchasereceiptRequestDetailDO extends BaseDO { */ private Long siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereturnJob/PurchasereturnJobDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereturnJob/PurchasereturnJobDetailDO.java index 6a72820c9f..9f110e94ae 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereturnJob/PurchasereturnJobDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereturnJob/PurchasereturnJobDetailDO.java @@ -77,19 +77,19 @@ public class PurchasereturnJobDetailDO extends BaseDO { */ private String reason; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereturnRecord/PurchasereturnRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereturnRecord/PurchasereturnRecordDetailDO.java index 4c242d9ff4..fef9844114 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereturnRecord/PurchasereturnRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereturnRecord/PurchasereturnRecordDetailDO.java @@ -108,7 +108,7 @@ public class PurchasereturnRecordDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -120,15 +120,15 @@ public class PurchasereturnRecordDetailDO extends BaseDO { */ private String siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereturnRequest/PurchasereturnRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereturnRequest/PurchasereturnRequestDetailDO.java index f8bbd4c0df..4c6aa84ba7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereturnRequest/PurchasereturnRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereturnRequest/PurchasereturnRequestDetailDO.java @@ -81,7 +81,7 @@ public class PurchasereturnRequestDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -93,15 +93,15 @@ public class PurchasereturnRequestDetailDO extends BaseDO { */ private String siteLd; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/putawayJob/PutawayJobDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/putawayJob/PutawayJobDetailDO.java index 1c36746dce..60c35c2851 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/putawayJob/PutawayJobDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/putawayJob/PutawayJobDetailDO.java @@ -61,19 +61,19 @@ public class PutawayJobDetailDO extends BaseDO { */ private String toLocationCode; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/putawayRecord/PutawayRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/putawayRecord/PutawayRecordDetailDO.java index c0ec91f697..702659d04b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/putawayRecord/PutawayRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/putawayRecord/PutawayRecordDetailDO.java @@ -93,7 +93,7 @@ public class PutawayRecordDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -105,15 +105,15 @@ public class PutawayRecordDetailDO extends BaseDO { */ private String siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/putawayRequest/PutawayRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/putawayRequest/PutawayRequestDetailDO.java index b9ade85a6b..405ac33542 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/putawayRequest/PutawayRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/putawayRequest/PutawayRequestDetailDO.java @@ -67,7 +67,7 @@ public class PutawayRequestDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -79,15 +79,15 @@ public class PutawayRequestDetailDO extends BaseDO { */ private String siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/repleinshJob/RepleinshJobDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/repleinshJob/RepleinshJobDetailDO.java index 7d98f8fb1c..ded9543d1f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/repleinshJob/RepleinshJobDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/repleinshJob/RepleinshJobDetailDO.java @@ -53,19 +53,19 @@ public class RepleinshJobDetailDO extends BaseDO { */ private String toLocationCode; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/repleinshRecord/RepleinshRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/repleinshRecord/RepleinshRecordDetailDO.java index a0f0f18692..91d98434d5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/repleinshRecord/RepleinshRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/repleinshRecord/RepleinshRecordDetailDO.java @@ -85,7 +85,7 @@ public class RepleinshRecordDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -97,15 +97,15 @@ public class RepleinshRecordDetailDO extends BaseDO { */ private String siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/repleinshRequest/RepleinshRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/repleinshRequest/RepleinshRequestDetailDO.java index 5ab9070548..6e25621c5b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/repleinshRequest/RepleinshRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/repleinshRequest/RepleinshRequestDetailDO.java @@ -44,7 +44,7 @@ public class RepleinshRequestDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -56,15 +56,15 @@ public class RepleinshRequestDetailDO extends BaseDO { */ private String siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/sale/SaleDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/sale/SaleDetailDO.java index efc5c7d334..e5dd2e030a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/sale/SaleDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/sale/SaleDetailDO.java @@ -94,7 +94,7 @@ public class SaleDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/scrapJob/ScrapJobDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/scrapJob/ScrapJobDetailDO.java index 9997414811..83b6881c66 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/scrapJob/ScrapJobDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/scrapJob/ScrapJobDetailDO.java @@ -59,19 +59,19 @@ public class ScrapJobDetailDO extends BaseDO { */ private String reason; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/scrapRecord/ScrapRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/scrapRecord/ScrapRecordDetailDO.java index 6bfb07a974..41fc9ff20f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/scrapRecord/ScrapRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/scrapRecord/ScrapRecordDetailDO.java @@ -77,15 +77,15 @@ public class ScrapRecordDetailDO extends BaseDO { */ private BigDecimal amount; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** @@ -121,7 +121,7 @@ public class ScrapRecordDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/scrapRequest/ScrapRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/scrapRequest/ScrapRequestDetailDO.java index b305a3a6de..feb3a11bdd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/scrapRequest/ScrapRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/scrapRequest/ScrapRequestDetailDO.java @@ -68,7 +68,7 @@ public class ScrapRequestDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -80,15 +80,15 @@ public class ScrapRequestDetailDO extends BaseDO { */ private Long siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierdeliverRecord/SupplierdeliverRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierdeliverRecord/SupplierdeliverRecordDetailDO.java index 7ce887d4a2..599196033e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierdeliverRecord/SupplierdeliverRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierdeliverRecord/SupplierdeliverRecordDetailDO.java @@ -137,19 +137,19 @@ public class SupplierdeliverRecordDetailDO extends BaseDO { */ private String projectCode; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierdeliverRequest/SupplierdeliverRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierdeliverRequest/SupplierdeliverRequestDetailDO.java index 943ccad8d9..f4597784dc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierdeliverRequest/SupplierdeliverRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierdeliverRequest/SupplierdeliverRequestDetailDO.java @@ -95,7 +95,7 @@ public class SupplierdeliverRequestDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -107,15 +107,15 @@ public class SupplierdeliverRequestDetailDO extends BaseDO { */ private Long siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierinvoiceRecord/SupplierinvoiceRecordDeatilDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierinvoiceRecord/SupplierinvoiceRecordDeatilDO.java index 363ccc55a5..8f4383a445 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierinvoiceRecord/SupplierinvoiceRecordDeatilDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierinvoiceRecord/SupplierinvoiceRecordDeatilDO.java @@ -100,7 +100,7 @@ public class SupplierinvoiceRecordDeatilDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -112,15 +112,15 @@ public class SupplierinvoiceRecordDeatilDO extends BaseDO { */ private String siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierinvoiceRequest/SupplierinvoiceRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierinvoiceRequest/SupplierinvoiceRequestDetailDO.java index bc65028f3b..19d0824dec 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierinvoiceRequest/SupplierinvoiceRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierinvoiceRequest/SupplierinvoiceRequestDetailDO.java @@ -88,7 +88,7 @@ public class SupplierinvoiceRequestDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplieritem/SupplieritemDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplieritem/SupplieritemDO.java index 3fc19de67c..2a3607d78d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplieritem/SupplieritemDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplieritem/SupplieritemDO.java @@ -14,7 +14,7 @@ import com.baomidou.mybatisplus.annotation.*; import com.win.framework.mybatis.core.dataobject.BaseDO; /** - * 供应商物品 DO + * 供应商物料 DO * * @author 超级管理员 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferissueJob/TransferissueJobDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferissueJob/TransferissueJobDetailDO.java index b50cceb30a..01519633f1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferissueJob/TransferissueJobDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferissueJob/TransferissueJobDetailDO.java @@ -53,19 +53,19 @@ public class TransferissueJobDetailDO extends BaseDO { */ private String toLocationCode; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferissueRecord/TransferissueRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferissueRecord/TransferissueRecordDetailDO.java index 34f7871376..d48d1f9b57 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferissueRecord/TransferissueRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferissueRecord/TransferissueRecordDetailDO.java @@ -79,15 +79,15 @@ public class TransferissueRecordDetailDO extends BaseDO { */ private String interfaceType; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** @@ -113,7 +113,7 @@ public class TransferissueRecordDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferissueRequest/TransferissueRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferissueRequest/TransferissueRequestDetailDO.java index 387a70045f..ba095307c9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferissueRequest/TransferissueRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferissueRequest/TransferissueRequestDetailDO.java @@ -62,7 +62,7 @@ public class TransferissueRequestDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -74,15 +74,15 @@ public class TransferissueRequestDetailDO extends BaseDO { */ private Long siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferreceiptJob/TransferreceiptJobDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferreceiptJob/TransferreceiptJobDetailDO.java index 0e75003f4c..a1d11e6046 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferreceiptJob/TransferreceiptJobDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferreceiptJob/TransferreceiptJobDetailDO.java @@ -53,19 +53,19 @@ public class TransferreceiptJobDetailDO extends BaseDO { */ private String toLocationCode; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferreceiptRecord/TransferreceiptRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferreceiptRecord/TransferreceiptRecordDetailDO.java index 88834b55b0..8e268174a7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferreceiptRecord/TransferreceiptRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferreceiptRecord/TransferreceiptRecordDetailDO.java @@ -69,15 +69,15 @@ public class TransferreceiptRecordDetailDO extends BaseDO { */ private String toAreaCode; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** @@ -113,7 +113,7 @@ public class TransferreceiptRecordDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferreceiptRequest/TransferreceiptRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferreceiptRequest/TransferreceiptRequestDetailDO.java index 584b6e7d18..6bab6e0218 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferreceiptRequest/TransferreceiptRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferreceiptRequest/TransferreceiptRequestDetailDO.java @@ -62,7 +62,7 @@ public class TransferreceiptRequestDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -74,15 +74,15 @@ public class TransferreceiptRequestDetailDO extends BaseDO { */ private Long siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/unplannedissueJob/UnplannedissueJobDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/unplannedissueJob/UnplannedissueJobDetailDO.java index f49d67b33c..cf058940ce 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/unplannedissueJob/UnplannedissueJobDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/unplannedissueJob/UnplannedissueJobDetailDO.java @@ -59,19 +59,19 @@ public class UnplannedissueJobDetailDO extends BaseDO { */ private String reason; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/unplannedissueRecord/UnplannedissueRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/unplannedissueRecord/UnplannedissueRecordDetailDO.java index d5eb55dac9..71c3c9ca21 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/unplannedissueRecord/UnplannedissueRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/unplannedissueRecord/UnplannedissueRecordDetailDO.java @@ -77,15 +77,15 @@ public class UnplannedissueRecordDetailDO extends BaseDO { */ private BigDecimal amount; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** @@ -121,7 +121,7 @@ public class UnplannedissueRecordDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/unplannedissueRequest/UnplannedissueRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/unplannedissueRequest/UnplannedissueRequestDetailDO.java index 8367f2aa84..dee810e2b3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/unplannedissueRequest/UnplannedissueRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/unplannedissueRequest/UnplannedissueRequestDetailDO.java @@ -68,7 +68,7 @@ public class UnplannedissueRequestDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -80,15 +80,15 @@ public class UnplannedissueRequestDetailDO extends BaseDO { */ private String siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/unplannedreceiptJob/UnplannedreceiptJobDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/unplannedreceiptJob/UnplannedreceiptJobDetailDO.java index daae6a5965..d49e6cf53a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/unplannedreceiptJob/UnplannedreceiptJobDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/unplannedreceiptJob/UnplannedreceiptJobDetailDO.java @@ -78,19 +78,19 @@ public class UnplannedreceiptJobDetailDO extends BaseDO { */ private String reason; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/unplannedreceiptRecord/UnplannedreceiptRecordDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/unplannedreceiptRecord/UnplannedreceiptRecordDetailDO.java index fa9a415c81..cd9a00a7e6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/unplannedreceiptRecord/UnplannedreceiptRecordDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/unplannedreceiptRecord/UnplannedreceiptRecordDetailDO.java @@ -95,15 +95,15 @@ public class UnplannedreceiptRecordDetailDO extends BaseDO { */ private Integer amount; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** @@ -139,7 +139,7 @@ public class UnplannedreceiptRecordDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/unplannedreceiptRequest/UnplannedreceiptRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/unplannedreceiptRequest/UnplannedreceiptRequestDetailDO.java index 2719a2edc8..c9d5eca822 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/unplannedreceiptRequest/UnplannedreceiptRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/unplannedreceiptRequest/UnplannedreceiptRequestDetailDO.java @@ -82,7 +82,7 @@ public class UnplannedreceiptRequestDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** @@ -94,15 +94,15 @@ public class UnplannedreceiptRequestDetailDO extends BaseDO { */ private String siteId; /** - * 物品名称 + * 物料名称 */ private String itemName; /** - * 物品描述1 + * 物料描述1 */ private String itemDesc1; /** - * 物品描述2 + * 物料描述2 */ private String itemDesc2; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/work/WorkDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/work/WorkDetailDO.java index 8343335e81..1c183ff527 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/work/WorkDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/work/WorkDetailDO.java @@ -49,7 +49,7 @@ public class WorkDetailDO extends BaseDO { */ private String number; /** - * 物品代码 + * 物料代码 */ private String itemCode; /** diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/balance/BalanceMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/balance/BalanceMapper.java index 8dd6b4a8ff..81b2734d28 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/balance/BalanceMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/balance/BalanceMapper.java @@ -137,7 +137,7 @@ public interface BalanceMapper extends BaseMapperX { /** * 更查找库存余额 * @param packingNumber 包装号 - * @param itemCode 物品编号 + * @param itemCode 物料编号 * @param batch 批次 * @param inventoryStatus 库存状态 * @param locationCode 库位编号 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customeritem/CustomeritemMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customeritem/CustomeritemMapper.java index 98f55b991b..9303e29cb9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customeritem/CustomeritemMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/customeritem/CustomeritemMapper.java @@ -14,7 +14,7 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; /** - * 客户物品 Mapper + * 客户物料 Mapper * * @author 超级管理员 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/itembasic/ItembasicMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/itembasic/ItembasicMapper.java index e471184946..7746151ee9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/itembasic/ItembasicMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/itembasic/ItembasicMapper.java @@ -15,7 +15,7 @@ import org.apache.poi.ss.formula.functions.T; import java.util.List; /** - * 物品基本信息 Mapper + * 物料基本信息 Mapper * * @author 超级管理员 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/itempackaging/ItempackagingMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/itempackaging/ItempackagingMapper.java index 916e6abaa6..8e546d861b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/itempackaging/ItempackagingMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/itempackaging/ItempackagingMapper.java @@ -14,7 +14,7 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; /** - * 物品包装信息 Mapper + * 物料包装信息 Mapper * * @author 超级管理员 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplieritem/SupplieritemMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplieritem/SupplieritemMapper.java index d38b623ef3..9ccb22066b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplieritem/SupplieritemMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/supplieritem/SupplieritemMapper.java @@ -15,7 +15,7 @@ import org.apache.poi.ss.formula.functions.T; import java.util.List; /** - * 供应商物品 Mapper + * 供应商物料 Mapper * * @author 超级管理员 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceService.java index 3641b68566..b0fb52ea0a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceService.java @@ -62,7 +62,7 @@ public interface BalanceService { * TB2----BY_QUANTITY * 跟据管理模式查询数量 * @author lianhongxi - * @param itemCode 物品code + * @param itemCode 物料code * @param inventoryStatus 库存状态 * @param locationCode 库位code * @return @@ -72,7 +72,7 @@ public interface BalanceService { * TB2----BY_BATCH * 跟据管理模式查询批次 * @author lianhongxi - * @param itemCode 物品code + * @param itemCode 物料code * @param batch 批次 * @param inventoryStatus 库存状态 * @param locationCode 库位code @@ -83,7 +83,7 @@ public interface BalanceService { * TB2----BY_PACKAGING * 跟据管理模式查询包装号 * @author lianhongxi - * @param itemCode 物品code + * @param itemCode 物料code * @param batch 批次 * @param packingNumber 包装号 * @param inventoryStatus 库存状态 @@ -104,7 +104,7 @@ public interface BalanceService { void updateBalance(BalanceUpdateReqVO updateReqVO); /** - * 根据物品类型查询库存余额 + * 根据物料类型查询库存余额 * @param pageVO * @return */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java index 50603c63d2..1efede22b3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java @@ -109,7 +109,7 @@ public class BalanceServiceImpl implements BalanceService { * TB----TB2----BY_QUANTITY * 跟据管理模式查询数量 * @author lianhongxi - * @param itemCode 物品code + * @param itemCode 物料code * @param inventoryStatus 库存状态 * @param locationCode 库位code * @return @@ -134,7 +134,7 @@ public class BalanceServiceImpl implements BalanceService { * 按批次查找 * TB----TB2-----BY_BATCH * @author lianhongxi - * @param itemCode 物品code + * @param itemCode 物料code * @param batch 批次 * @param inventoryStatus 库存状态 * @param locationCode 库位code @@ -163,7 +163,7 @@ public class BalanceServiceImpl implements BalanceService { * TB----TB2-----BY_PACKGING * 按包装查找 * @author lianhongxi - * @param itemCode 物品code + * @param itemCode 物料code * @param packingNumber 包装号 * @param batch 批次 * @param inventoryStatus 库存状态 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/bom/BomService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/bom/BomService.java index 2126959558..8be680e2c2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/bom/BomService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/bom/BomService.java @@ -64,7 +64,7 @@ public interface BomService { */ PageResult getBomPage(BomPageReqVO pageReqVO); /** - * 获得用高级搜索物品清单分页列表 + * 获得用高级搜索物料清单分页列表 * * @param conditions 分页、排序和自定义条件 * @return 分页列表 @@ -82,7 +82,7 @@ public interface BomService { /** - * 物品与bom版本关系 + * 物料与bom版本关系 * @param productItemCode * @param version * @return diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java index 720baf2b6c..fe7a36a247 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java @@ -258,7 +258,7 @@ public class CountJobMainServiceImpl implements CountJobMainService { countRequestMainDO.setStatus(RequestStatusEnum.PARTIAL.getCode()); countRequestMainMapper.updateById(countRequestMainDO); } - //盘点申请中没有，但盘点任务盘出来多的物品，回写到盘点申请子表中 + //盘点申请中没有，但盘点任务盘出来多的物料，回写到盘点申请子表中 if(!countRequestDetailDOList.isEmpty()) { countRequestDetailMapper.insertBatch(countRequestDetailDOList); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainServiceImpl.java index 3a557506b4..d21140990f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainServiceImpl.java @@ -334,7 +334,7 @@ public class CountPlanMainServiceImpl implements CountPlanMainService { } else { countBanlanceDOList.add(balanceDO); } - //维度，按照库存扩大范围，比如维度是库位时，盘点库位上某一个物品，那要扩大到这个物品所在库位的所有物品，BY_INVENTORY，按库存 BY_ITEM，按物品 BY_BATCH，按批次 BY_LOCATION，按库位 + //维度，按照库存扩大范围，比如维度是库位时，盘点库位上某一个物料，那要扩大到这个物料所在库位的所有物料，BY_INVENTORY，按库存 BY_ITEM，按物料 BY_BATCH，按批次 BY_LOCATION，按库位 switch (mainDO.getDimension()) { case "BY_ITEM": { List balanceDOListDimension = balanceMapper.getBalanceList(null, balanceDO.getItemCode(), null, null, null); @@ -356,7 +356,7 @@ public class CountPlanMainServiceImpl implements CountPlanMainService { //利用set去重 Set subSet = new HashSet<>(); for(BalanceDO balanceDO : countBanlanceDOList) { - //忽略物品或者忽略库位直接continue + //忽略物料或者忽略库位直接continue if(mainDO.getIgnoreListOfItem().contains(balanceDO.getItemCode()) || mainDO.getIgnoreListOfLocation().contains(balanceDO.getLocationCode())) { continue; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java index ba091fc165..812295b0aa 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java @@ -525,7 +525,7 @@ public class CountRequestMainServiceImpl implements CountRequestMainService { for(CountRecordDetailDO countRecordDetailDO : countRecordDetailDOSameList) { BalanceDO balanceDO = balanceMapper.getBalanceQty(countRecordDetailDO.getPackingNumber(), countRecordDetailDO.getItemCode(), countRecordDetailDO.getBatch(), countRecordDetailDO.getInventoryStatus(), countRecordDetailDO.getLocationCode()); if(balanceDO == null) { - log.error("查询库存余额,包装号:{},物品代码:{},批次:{},库存状态:{},库位代码:{}",countRecordDetailDO.getPackingNumber(),countRecordDetailDO.getItemCode(),countRecordDetailDO.getBatch(),countRecordDetailDO.getInventoryStatus(),countRecordDetailDO.getLocationCode()); + log.error("查询库存余额,包装号:{},物料代码:{},批次:{},库存状态:{},库位代码:{}",countRecordDetailDO.getPackingNumber(),countRecordDetailDO.getItemCode(),countRecordDetailDO.getBatch(),countRecordDetailDO.getInventoryStatus(),countRecordDetailDO.getLocationCode()); throw exception(BALANCE_NOT_EXISTS); } if(balanceDO.getFrozen().equals("TRUE")) { @@ -588,7 +588,7 @@ public class CountRequestMainServiceImpl implements CountRequestMainService { } catch (ServiceException e) { message.append(e.getMessage()).append(","); } - // 校验物品基础信息 + // 校验物料基础信息 try { ItembasicDO itembasicDO = itembasicService.selectItembasic(detailDO.getItemCode()); if (!Objects.equals(itembasicDO.getUom(), detailDO.getUom())) { @@ -621,7 +621,7 @@ public class CountRequestMainServiceImpl implements CountRequestMainService { private void validateCountRequestDetailCreate(CountRequestDetailDO detailDO) { //校验库位基础信息 locationService.selectLocation(detailDO.getLocationCode()); - // 校验物品基础信息，空库位没有物品 + // 校验物料基础信息，空库位没有物料 if(detailDO.getItemCode() != null && !detailDO.getItemCode().isEmpty()) { ItembasicDO itembasicDO = itembasicService.selectItembasic(detailDO.getItemCode()); if (!Objects.equals(itembasicDO.getUom(), detailDO.getUom())) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customeritem/CustomeritemService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customeritem/CustomeritemService.java index fe4cb9fd64..7657f26515 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customeritem/CustomeritemService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customeritem/CustomeritemService.java @@ -10,14 +10,14 @@ import java.util.Collection; import java.util.List; /** - * 客户物品 Service 接口 + * 客户物料 Service 接口 * * @author 超级管理员 */ public interface CustomeritemService { /** - * 创建客户物品 + * 创建客户物料 * * @param createReqVO 创建信息 * @return 编号 @@ -25,44 +25,44 @@ public interface CustomeritemService { Long createCustomeritem(@Valid CustomeritemCreateReqVO createReqVO); /** - * 更新客户物品 + * 更新客户物料 * * @param updateReqVO 更新信息 */ void updateCustomeritem(@Valid CustomeritemUpdateReqVO updateReqVO); /** - * 删除客户物品 + * 删除客户物料 * * @param id 编号 */ void deleteCustomeritem(Long id); /** - * 获得客户物品 + * 获得客户物料 * * @param id 编号 - * @return 客户物品 + * @return 客户物料 */ CustomeritemDO getCustomeritem(Long id); /** - * 获得客户物品列表 + * 获得客户物料列表 * * @param ids 编号 - * @return 客户物品列表 + * @return 客户物料列表 */ List getCustomeritemList(CustomConditions conditions); /** - * 获得客户物品分页 + * 获得客户物料分页 * * @param pageReqVO 分页查询 - * @return 客户物品分页 + * @return 客户物料分页 */ PageResult getCustomeritemPage(CustomeritemPageReqVO pageReqVO); /** - * 获得用高级搜索客户物品分页列表 + * 获得用高级搜索客户物料分页列表 * * @param conditions 分页、排序和自定义条件 * @return 分页列表 @@ -70,20 +70,20 @@ public interface CustomeritemService { PageResult getCustomeritemSenior(CustomConditions conditions); /** - * 获得客户物品列表, 用于 Excel 导出 + * 获得客户物料列表, 用于 Excel 导出 * * @param exportReqVO 查询条件 - * @return 客户物品列表 + * @return 客户物料列表 */ List getCustomeritemList(CustomeritemExportReqVO exportReqVO); List CustomeritemimportCustomeritemList(List customeritems, Integer mode, Boolean updatePart); /** - * 查询客户物品是否存在 + * 查询客户物料是否存在 * BQ-----QCusI * @param pcustomerCode 客户code - * @param pitemCode 物品code + * @param pitemCode 物料code * @return */ public CustomeritemDO selectCustomeritemExist(String pcustomerCode,String pitemCode); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customeritem/CustomeritemServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customeritem/CustomeritemServiceImpl.java index 16b5338bdf..e494675a15 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customeritem/CustomeritemServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customeritem/CustomeritemServiceImpl.java @@ -28,7 +28,7 @@ import static com.win.framework.common.exception.util.ServiceExceptionUtil.excep import static com.win.module.wms.enums.ErrorCodeConstants.*; /** - * 客户物品 Service 实现类 + * 客户物料 Service 实现类 * * @author 超级管理员 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainService.java index 53974b8221..7ec57d274c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainService.java @@ -88,7 +88,7 @@ public interface CustomerreturnJobMainService { * * @param pnumber 单据号 * @param psupplierCode 供应商代码 - * @param pitemCode 物品代码 + * @param pitemCode 物料代码 * @return 采购订单子列表 */ public PurchaseDetailDO productionDetailExist(String pnumber, String psupplierCode, String pitemCode,String poLine); @@ -97,7 +97,7 @@ public interface CustomerreturnJobMainService { * * @param psoNumber 单据号 * @param psoLine 行号 - * @param pitemCode 物品代码 + * @param pitemCode 物料代码 * @return 采购订单子列表 */ public SaleDetailDO saleDetailExist(String psoNumber, String psoLine, String pitemCode); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestDetailServiceImpl.java index cf03f9825e..1f99814ab9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestDetailServiceImpl.java @@ -140,7 +140,7 @@ public class CustomerreturnRequestDetailServiceImpl implements CustomerreturnReq if(mainDo.getDeliverRecordNumber() != null && !"".equals(mainDo.getDeliverRecordNumber())){ validateDeliverRecordDetail(mainDo,detailDo); } - //校验物品基础信息并赋值 + //校验物料基础信息并赋值 ItembasicDO itembasicDO = validatorItembasic(detailDo.getItemCode()); detailDo.setItemName(itembasicDO.getName()); detailDo.setItemDesc1(itembasicDO.getDesc1()); @@ -195,7 +195,7 @@ public class CustomerreturnRequestDetailServiceImpl implements CustomerreturnReq } /** - * 校验物品基础信息并赋值 + * 校验物料基础信息并赋值 * @param itemCode */ private ItembasicDO validatorItembasic(String itemCode) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java index f2e4d2d5b1..8ef7c42d71 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java @@ -608,7 +608,7 @@ public class CustomerreturnRequestMainServiceImpl implements CustomerreturnReque */ private void validateCustomerreturnRequestDetailCreate(CustomerreturnRequestMainDO mainDo, CustomerreturnRequestDetailDO detailDo) { BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CustomerRejectRequest"); - //校验物品基础信息并赋值 + //校验物料基础信息并赋值 ItembasicDO itembasicDO = validatorItembasic(detailDo.getItemCode()); detailDo.setItemName(itembasicDO.getName()); detailDo.setItemDesc1(itembasicDO.getDesc1()); @@ -695,10 +695,10 @@ public class CustomerreturnRequestMainServiceImpl implements CustomerreturnReque //查询出已经退货完的记录主表下的子表数据 BigDecimal qty = BigDecimal.ZERO; for (CustomerreturnRecordDetailDO customerreturnRecordDetailDO : customerreturnRecordDetailDOS) { - //校验"当前客户退货记录子表"物品与"客户退货申请子表"物品是否一致 + //校验"当前客户退货记录子表"物料与"客户退货申请子表"物料是否一致 if (deliver.getItemCode().equals(detailDO.getItemCode()) && deliver.getBatch().equals(detailDO.getBatch()) && deliver.getPackingNumber().equals(detailDO.getPackingNumber())) { - //校验"当前客户退货记录子表"物品与"数据库里已退货的客户退货记录子表"物品是否一致 + //校验"当前客户退货记录子表"物料与"数据库里已退货的客户退货记录子表"物料是否一致 if (deliver.getItemCode().equals(customerreturnRecordDetailDO.getItemCode()) && deliver.getBatch().equals(customerreturnRecordDetailDO.getFromBatch()) && deliver.getPackingNumber().equals(customerreturnRecordDetailDO.getFromPackingNumber())) { hashMap.put(detailDO.getId(), qty = qty.add(customerreturnRecordDetailDO.getQty())); @@ -707,7 +707,7 @@ public class CustomerreturnRequestMainServiceImpl implements CustomerreturnReque } if (hashMap.get(detailDO.getId()) != null) { if (deliver.getQty().compareTo((hashMap.get(detailDO.getId())).add(detailDO.getQty())) == -1) { - throw exception(QTY_EXCEPTION, "当前客户退货申请单【" + detailDO.getId() + "的该物品" + detailDO.getItemCode() + "】已全部退货，超出当前发货记录的发货数量" + (hashMap.get(detailDO.getId())).add(detailDO.getQty()).subtract(deliver.getQty()) + "个"); + throw exception(QTY_EXCEPTION, "当前客户退货申请单【" + detailDO.getId() + "的该物料" + detailDO.getItemCode() + "】已全部退货，超出当前发货记录的发货数量" + (hashMap.get(detailDO.getId())).add(detailDO.getQty()).subtract(deliver.getQty()) + "个"); } } } @@ -749,7 +749,7 @@ public class CustomerreturnRequestMainServiceImpl implements CustomerreturnReque } /** - * 校验物品基础信息并赋值 + * 校验物料基础信息并赋值 * * @param itemCode */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainService.java index 4cedde5fee..88f39a91d7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverJob/DeliverJobMainService.java @@ -86,7 +86,7 @@ public interface DeliverJobMainService { * * @param pnumber 单据号 * @param psupplierCode 供应商代码 - * @param pitemCode 物品代码 + * @param pitemCode 物料代码 * @return 采购订单子列表 */ public PurchaseDetailDO productionDetailExist(String pnumber, String psupplierCode, String pitemCode,String poLine); @@ -95,7 +95,7 @@ public interface DeliverJobMainService { * 校验销售订单明细 * @author chenfang * @param psoNumber 单据号 - * @param pitemCode 物品代码 + * @param pitemCode 物料代码 * @param psoLine 行号 * @return 销售订单子列表 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanMainServiceImpl.java index cfec22e1c2..54ebf4ee85 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverPlan/DeliverPlanMainServiceImpl.java @@ -448,7 +448,7 @@ public class DeliverPlanMainServiceImpl implements DeliverPlanMainService { if (detailDo.getShippedQty() == null) { detailDo.setShippedQty(BigDecimal.ZERO); } - // 校验物品基础信息 + // 校验物料基础信息 try { ItembasicDO itembasicDO = itembasicService.selectItembasic(detailDo.getItemCode()); if (!detailDo.getUom().equals(itembasicDO.getUom())) { @@ -459,7 +459,7 @@ public class DeliverPlanMainServiceImpl implements DeliverPlanMainService { } detailDo.setAvailable("TRUE"); //TODO 滞后 - // 校验物品标包信息 + // 校验物料标包信息 // try { // deliverJobMainService.saleDetailExist(detailDo.getSoNumber(), detailDo.getSoLine(), detailDo.getItemCode()); // } catch (ServiceException ex) { @@ -523,7 +523,7 @@ public class DeliverPlanMainServiceImpl implements DeliverPlanMainService { customerService.selectCustomerExist(customerCode); } - //子表校验物品基础信息 + //子表校验物料基础信息 private ItembasicDO validatorItembasic(String itemCode) { return itembasicService.selectItembasic(itemCode); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainService.java index 677a9d3020..9ecb2b7395 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainService.java @@ -53,7 +53,7 @@ public interface DeliverRecordMainService { * 校验成品发货记录 * author chenfang * @param pnumber 单据号 - * @param pitemCode 物品代码 + * @param pitemCode 物料代码 * @param psoNumber 销售订单号 * @param psoLine 销售订单行 * @return diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainServiceImpl.java index aaeaa04f4e..84db1bce3c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainServiceImpl.java @@ -225,7 +225,7 @@ public class DeliverRecordMainServiceImpl implements DeliverRecordMainService { if(deliverRecordDetailDO != null){ return deliverRecordDetailDO; }else { - throw exception(PURCHASERECEIPT_RECORD_DETAIL_EXCEPTION, "销售订单号" + psoNumber + "、销售订单行、" + psoLine + "、物品代码" + pitemCode + "无效"); + throw exception(PURCHASERECEIPT_RECORD_DETAIL_EXCEPTION, "销售订单号" + psoNumber + "、销售订单行、" + psoLine + "、物料代码" + pitemCode + "无效"); } }else { throw exception(DELIVER_ORDER_DETAIL_EXCEPTION, "发货订单" + pnumber + "无效"); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestDetailServiceImpl.java index 13fcd68088..90b708c38a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestDetailServiceImpl.java @@ -145,7 +145,7 @@ public class DeliverRequestDetailServiceImpl implements DeliverRequestDetailServ } /** - * 校验物品信息并赋值 + * 校验物料信息并赋值 * @param detailDo * @return */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainServiceImpl.java index 48c9042a22..3334723e65 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainServiceImpl.java @@ -507,18 +507,18 @@ public class DeliverRequestMainServiceImpl implements DeliverRequestMainService deliverRequestDetailDO.setMasterId(deliverRequestMainDO.getId()); deliverRequestDetailDO.setNumber(deliverRequestMainDO.getNumber()); deliverRequestDetailDO.setId(null); - //判断发货申请是否超出发货计划该物品数量 + //判断发货申请是否超出发货计划该物料数量 if(deliverRequestMainDO.getDeliverPlanNumber() != null){ DeliverPlanDetailDO deliverPlanDetailDO = deliverPlanDetailService.selectDeliverPlanDetail(deliverRequestMainDO.getDeliverPlanNumber(), deliverRequestDetailDO.getItemCode()); if(BigDecimal.ZERO.compareTo(deliverPlanDetailDO.getShippedQty()) == 0){ subtract = deliverPlanDetailDO.getPlanQty().subtract(deliverRequestDetailDO.getQty()); } else if((deliverPlanDetailDO.getPlanQty().compareTo(deliverPlanDetailDO.getShippedQty()) == 0)){ - throw exception(QTY_EXCEPTION,"当前物品" + deliverRequestDetailDO.getItemCode() + "已发够数量，需要手动删除该条页面数据"); + throw exception(QTY_EXCEPTION,"当前物料" + deliverRequestDetailDO.getItemCode() + "已发够数量，需要手动删除该条页面数据"); } else { subtract = deliverPlanDetailDO.getPlanQty().subtract(deliverPlanDetailDO.getShippedQty()).subtract(deliverRequestDetailDO.getQty()); } if(subtract.compareTo(BigDecimal.ZERO) == -1){ - throw exception(QTY_EXCEPTION,"当前物品" + deliverRequestDetailDO.getItemCode() + "已超出发货计划数量,超出" + subtract.abs()); + throw exception(QTY_EXCEPTION,"当前物料" + deliverRequestDetailDO.getItemCode() + "已超出发货计划数量,超出" + subtract.abs()); } } } @@ -695,7 +695,7 @@ public class DeliverRequestMainServiceImpl implements DeliverRequestMainService return customerdockService.getCustomerdockByCustomerCode(customerCode,customerDockCode); } - //校验物品代码是否存在 + //校验物料代码是否存在 private ItembasicDO validatorItemcode(String code){ ItembasicDO itembasicDO = itembasicService.selectItembasic(code); return itembasicDO; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/demandforecasting/DemandforecastingMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/demandforecasting/DemandforecastingMainServiceImpl.java index 7ef3f82fae..3253a0f177 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/demandforecasting/DemandforecastingMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/demandforecasting/DemandforecastingMainServiceImpl.java @@ -212,11 +212,11 @@ public class DemandforecastingMainServiceImpl implements DemandforecastingMainSe */ private String validateDemandforecastingDetailImport(DemandforecastingDetailDO detailDo, DemandforecastingMainDO mainDo, BusinesstypeDO businesstypeDO) { String messageDetail = ""; - //校验物品基础信息 + //校验物料基础信息 try { ItembasicDO itembasicDO = itembasicService.selectItembasic(detailDo.getItemCode()); if (itembasicDO == null) { - messageDetail += "物品" + detailDo.getItemCode() + "无效" + ","; + messageDetail += "物料" + detailDo.getItemCode() + "无效" + ","; } else { if (!detailDo.getUom().equals(itembasicDO.getUom())) { messageDetail += "计量单位" + detailDo.getItemCode() + "错误," + "应该是" + itembasicDO.getUom() + ","; @@ -234,11 +234,11 @@ public class DemandforecastingMainServiceImpl implements DemandforecastingMainSe } catch (Exception ex) { messageDetail += ex.getMessage() + ","; } - // 校验供应商物品 + // 校验供应商物料 try { SupplieritemDO supplieritemDO = supplieritemService.selectSupplierItemExist(mainDo.getSupplierCode(), detailDo.getItemCode()); if (supplieritemDO == null) { - messageDetail += "未查找到物品" + detailDo.getItemCode() + "供应商" + mainDo.getSupplierCode() + "信息" + ","; + messageDetail += "未查找到物料" + detailDo.getItemCode() + "供应商" + mainDo.getSupplierCode() + "信息" + ","; } } catch (ServiceException ex) { @@ -304,12 +304,12 @@ public class DemandforecastingMainServiceImpl implements DemandforecastingMainSe supplierService.selectSupplier(supplierCode); } - //子表校验物品基础信息 + //子表校验物料基础信息 private void validatorItembasic(String itemCode) { itembasicService.selectItembasic(itemCode); } - //子表校验物品基础信息 + //子表校验物料基础信息 private void validatorItembasic(String poNumber, String supplierCode, String itemCode, String poLine) { purchaseMainService.selectPurchaseDetailDoExist(poNumber, supplierCode, itemCode, poLine); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/enterprise/EnterpriseService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/enterprise/EnterpriseService.java index 394e7a6c62..0f7d1e7c8d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/enterprise/EnterpriseService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/enterprise/EnterpriseService.java @@ -74,7 +74,7 @@ public interface EnterpriseService { List getEnterpriseList(EnterpriseExportReqVO exportReqVO); /** - * 获得用高级搜索物品清单分页列表 + * 获得用高级搜索物料清单分页列表 * * @param conditions 分页、排序和自定义条件 * @return 分页列表 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutService.java index 366d144fca..0c8deafb60 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/expectout/ExpectoutService.java @@ -75,7 +75,7 @@ public interface ExpectoutService { * TB2----BY_QUANTITY * 跟据管理模式查询数量 * @author lianhongxi - * @param itemcode 物品code + * @param itemcode 物料code * @param inventorystatus 库存状态 * @param locationcode 库位code * @return @@ -85,7 +85,7 @@ public interface ExpectoutService { * TB2----BY_BATCH * 跟据管理模式查询批次 * @author lianhongxi - * @param itemcode 物品code + * @param itemcode 物料code * @param batch 批次 * @param inventorystatus 库存状态 * @param locationcode 库位code @@ -96,7 +96,7 @@ public interface ExpectoutService { * TB2----BY_PACKAGING * 跟据管理模式查询包装号 * @author lianhongxi - * @param itemcode 物品code + * @param itemcode 物料code * @param batch 批次 * @param packingnumber 包装号 * @param inventorystatus 库存状态 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestMainServiceImpl.java index a1751955c7..07b5330f02 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorychangeRequest/InventorychangeRequestMainServiceImpl.java @@ -465,7 +465,7 @@ public class InventorychangeRequestMainServiceImpl implements InventorychangeReq String messageDetail = ""; ItembasicDO itembasicDO = null; BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InventoryChangeRequest"); - // 校验物品基础信息 + // 校验物料基础信息 try { itembasicDO = itembasicService.selectItembasic(detailDo.getItemCode()); detailDo.setItemDesc1(itembasicDO.getDesc1()); @@ -491,7 +491,7 @@ public class InventorychangeRequestMainServiceImpl implements InventorychangeReq if (itembasicDO != null) { jobUtils.ifInType(itembasicDO.getType(), businesstypeDO); } else { - messageDetail += "物品基本信息不存在，不能校验物品类型" + ","; + messageDetail += "物料基本信息不存在，不能校验物料类型" + ","; } } catch (ServiceException ex) { messageDetail += ex.getMessage() + ","; @@ -635,7 +635,7 @@ public class InventorychangeRequestMainServiceImpl implements InventorychangeReq return locationDO; } - //子表校验物品基础信息 + //子表校验物料基础信息 private ItembasicDO validatorItembasic(String itemCode) { return itembasicService.selectItembasic(itemCode); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java index 20f51d7df7..9bb1e83335 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java @@ -901,7 +901,7 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest } /** - * 校验物品基础信息 + * 校验物料基础信息 * * @param detailDo * @return diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java index 7ee3aa3129..2d255e1b05 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueJob/IssueJobMainServiceImpl.java @@ -516,7 +516,7 @@ public class IssueJobMainServiceImpl implements IssueJobMainService { onlinesettlementRecordDetailDO.setMasterId(onlinesettlementRecordMainDO.getId()); onlinesettlementRecordDetailDO.setNumber(number); onlinesettlementRecordDetailDO.setSupplierCode(item.getSupplierCode()); - // 查询 供应商物品 赋值 供应商物品代码 + // 查询 供应商物料 赋值 供应商物料代码 onlinesettlementRecordDetailDO.setSupplierItemCode(supplieritemService.selectSupplierItemExist(item.getSupplierCode(),item.getItemCode()).getSupplierItemCode()); onlinesettlementRecordDetailDO.setId(null); onlinesettlementRecordDetailDO.setCreator(null); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainServiceImpl.java index 9554bbd652..d818659afe 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRequest/IssueRequestMainServiceImpl.java @@ -334,7 +334,7 @@ public class IssueRequestMainServiceImpl implements IssueRequestMainService { StringBuilder message = new StringBuilder(); try { ItembasicDO itembasicDO = this.validatorItembasic(detailDo.getItemCode()); - // 赋值物品相关信息 + // 赋值物料相关信息 detailDo.setItemName(itembasicDO.getName()); detailDo.setItemDesc1(itembasicDO.getDesc1()); detailDo.setItemDesc2(itembasicDO.getDesc2()); @@ -463,7 +463,7 @@ public class IssueRequestMainServiceImpl implements IssueRequestMainService { validatorProductionLineCode(issueRequestDetailDO.getProductionLineCode()); WorkstationDO workstationDO = validatorWorkstation(issueRequestDetailDO.getWorkStationCode(), issueRequestMainDO.getWorkshopCode(), issueRequestDetailDO.getProductionLineCode()); issueRequestDetailDO.setToLocationCode(workstationDO.getRawLocationCode()); - // 暂时不校验 生产线物品关系 + // 暂时不校验 生产线物料关系 // ProductionlineitemDO productionlineitemDO = this.validatorProductionLineCodeAndpItemCodeExist(issueRequestDetailDO.getProductionLineCode(), issueRequestDetailDO.getItemCode()); // issueRequestDetailDO.setToLocationCode(productionlineitemDO.getRawLocationCode()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicService.java index 54b8383204..ed31904f33 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicService.java @@ -11,14 +11,14 @@ import java.util.Collection; import java.util.List; /** - * 物品基本信息 Service 接口 + * 物料基本信息 Service 接口 * * @author 超级管理员 */ public interface ItembasicService { /** - * 创建物品基本信息 + * 创建物料基本信息 * * @param createReqVO 创建信息 * @return 编号 @@ -26,47 +26,47 @@ public interface ItembasicService { Long createItembasic(@Valid ItembasicCreateReqVO createReqVO); /** - * 更新物品基本信息 + * 更新物料基本信息 * * @param updateReqVO 更新信息 */ void updateItembasic(@Valid ItembasicUpdateReqVO updateReqVO); /** - * 更新物品基本信息 + * 更新物料基本信息 * * @param updateReqVO 更新信息 */ void updateItembasicStatus(ItembasicUpdateReqVO updateReqVO); /** - * 删除物品基本信息 + * 删除物料基本信息 * * @param id 编号 */ void deleteItembasic(Long id); /** - * 获得物品基本信息 + * 获得物料基本信息 * * @param id 编号 - * @return 物品基本信息 + * @return 物料基本信息 */ ItembasicDO getItembasic(Long id); /** - * 获得物品基本信息列表 + * 获得物料基本信息列表 * * @param conditions 条件 - * @return 物品基本信息列表 + * @return 物料基本信息列表 */ List getItembasicList(CustomConditions conditions); /** - * 获得物品基本信息分页 + * 获得物料基本信息分页 * * @param pageReqVO 分页查询 - * @return 物品基本信息分页 + * @return 物料基本信息分页 */ PageResult getItembasicPage(ItembasicPageReqVO pageReqVO); @@ -85,39 +85,39 @@ public interface ItembasicService { List getItembasicList(); /** - * 获得物品基本信息列表, 用于 Excel 导出 + * 获得物料基本信息列表, 用于 Excel 导出 * * @param exportReqVO 查询条件 - * @return 物品基本信息列表 + * @return 物料基本信息列表 */ List getItembasicList(ItembasicExportReqVO exportReqVO); /** - * 批量导入物品基本信息 + * 批量导入物料基本信息 * - * @param importItembasics 导入物品基本信息列表 + * @param importItembasics 导入物料基本信息列表 * @param updatePart 是否支持更新 * @return 导入结果 */ List importItembasicList(List importItembasics, Integer mode,boolean updatePart); /** * BQ----QI - * 获得物品基本信息 + * 获得物料基本信息 * - * @param code 物品代码 - * @return 物品基本信息 + * @param code 物料代码 + * @return 物料基本信息 */ public ItembasicDO selectItembasic(String code); /** - * 判断 物品 是否为下线结算物品 + * 判断 物料 是否为下线结算物料 * @param code * @return */ public Boolean isOfflines(String code); /** - * 判断 物品 是否为上线结算物品 + * 判断 物料 是否为上线结算物料 * @param code * @return */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicServiceImpl.java index 540edcc9b6..e453d0cab5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itembasic/ItembasicServiceImpl.java @@ -31,7 +31,7 @@ import static com.win.framework.common.exception.util.ServiceExceptionUtil.excep import static com.win.module.wms.enums.ErrorCodeConstants.*; /** - * 物品基本信息 Service 实现类 + * 物料基本信息 Service 实现类 * * @author 超级管理员 */ @@ -53,7 +53,7 @@ public class ItembasicServiceImpl implements ItembasicService { // 插入 ItembasicDO itembasic = ItembasicConvert.INSTANCE.convert(createReqVO); itembasicMapper.insert(itembasic); - trendsApi.createTrends(itembasic.getId(), "basicItembasic", "增加了物品基本信息", TrendsTypeEnum.CREATE); + trendsApi.createTrends(itembasic.getId(), "basicItembasic", "增加了物料基本信息", TrendsTypeEnum.CREATE); // 返回 return itembasic.getId(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingService.java index 36d799bd1e..1dcf6bc453 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingService.java @@ -10,14 +10,14 @@ import java.util.Collection; import java.util.List; /** - * 物品包装信息 Service 接口 + * 物料包装信息 Service 接口 * * @author 超级管理员 */ public interface ItempackagingService { /** - * 创建物品包装信息 + * 创建物料包装信息 * * @param createReqVO 创建信息 * @return 编号 @@ -25,45 +25,45 @@ public interface ItempackagingService { Long createItempackaging(@Valid ItempackagingCreateReqVO createReqVO); /** - * 更新物品包装信息 + * 更新物料包装信息 * * @param updateReqVO 更新信息 */ void updateItempackaging(@Valid ItempackagingUpdateReqVO updateReqVO); /** - * 删除物品包装信息 + * 删除物料包装信息 * * @param id 编号 */ void deleteItempackaging(Long id); /** - * 获得物品包装信息 + * 获得物料包装信息 * * @param id 编号 - * @return 物品包装信息 + * @return 物料包装信息 */ ItempackagingDO getItempackaging(Long id); /** - * 获得物品包装信息 列表 + * 获得物料包装信息 列表 * * @param ids 编号 - * @return 物品包装信息 列表 + * @return 物料包装信息 列表 */ List getItempackagingList(CustomConditions conditions); /** - * 获得物品包装信息 分页 + * 获得物料包装信息 分页 * * @param pageReqVO 分页查询 - * @return 物品包装信息 分页 + * @return 物料包装信息 分页 */ PageResult getItempackagingPage(ItempackagingPageReqVO pageReqVO); /** - * 获得用高级搜索物品包装信息分页列表 + * 获得用高级搜索物料包装信息分页列表 * * @param conditions 分页、排序和自定义条件 * @return 分页列表 @@ -71,10 +71,10 @@ public interface ItempackagingService { PageResult getItempackagingSenior(CustomConditions conditions); /** - * 获得物品包装信息 列表, 用于 Excel 导出 + * 获得物料包装信息 列表, 用于 Excel 导出 * * @param exportReqVO 查询条件 - * @return 物品包装信息 列表 + * @return 物料包装信息 列表 */ List getItempackagingList(ItempackagingExportReqVO exportReqVO); @@ -82,9 +82,9 @@ public interface ItempackagingService { /** * BQ----QIP - * 查询物品标包信息 + * 查询物料标包信息 * @author chenfang - * @param pitemCode 物品code + * @param pitemCode 物料code * @return */ public ItempackagingDO selectItemPackagingExist(String pitemCode); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingServiceImpl.java index 407d9f7a1e..f8e316b651 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/itempackaging/ItempackagingServiceImpl.java @@ -25,7 +25,7 @@ import static com.win.framework.common.exception.util.ServiceExceptionUtil.excep import static com.win.module.wms.enums.ErrorCodeConstants.*; /** - * 物品包装信息 Service 实现类 + * 物料包装信息 Service 实现类 * * @author 超级管理员 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java index 620551e422..a1f8a7e435 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java @@ -378,7 +378,7 @@ public class LocationServiceImpl implements LocationService { String emptyLocationFirst = jsonObject.getStr("EmptyLocationFirst"); //优先非空库位 String notEmptyLocationFirst = jsonObject.getStr("NotEmptyLocationFirst"); - //可以混物品 + //可以混物料 String enableMixItem = jsonObject.getStr("EnableMixItem"); //可以混批次 String enableMixLot = jsonObject.getStr("EnableMixLot"); @@ -458,7 +458,7 @@ public class LocationServiceImpl implements LocationService { String enableMixLot = jsonObject.getStr("EnableMixLot"); String enableMixStatus = jsonObject.getStr("EnableMixStatus"); List balanceDOList = balanceMapper.getBalanceList(null, null, null, null, locationDO.getCode()); - //库位上存在物品，判断可以混物品、可以混批次、可以混状态 + //库位上存在物料，判断可以混物料、可以混批次、可以混状态 boolean flag1 = false; for (BalanceDO balanceDO : balanceDOList) { boolean flag2 = true; @@ -504,10 +504,10 @@ public class LocationServiceImpl implements LocationService { * @param locationDOList 库位list * @param emptyLocationFirst 优先空库位 * @param notEmptyLocationFirst 优先非空库位 - * @param itemCode 物品编号 + * @param itemCode 物料编号 * @param batch 批次 * @param inventoryStatus 状态 - * @param enableMixItem 可以混物品 + * @param enableMixItem 可以混物料 * @param enableMixLot 可以混批次 * @param enableMixStatus 可以混状态 * @return 过滤之后的库位list @@ -520,7 +520,7 @@ public class LocationServiceImpl implements LocationService { if (balanceDOList.isEmpty()) {//空库位 emptyList.add(locationDO); } else {//非空库位 - //库位上存在物品，判断可以混物品、可以混批次、可以混状态 + //库位上存在物料，判断可以混物料、可以混批次、可以混状态 boolean flag = true; for (BalanceDO balanceDO : balanceDOList) { if ("TRUE".equals(enableMixItem) && !itemCode.equals(balanceDO.getItemCode())) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageServiceImpl.java index 962d002c9d..b21e5beac0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/packageMassage/PackageServiceImpl.java @@ -201,7 +201,7 @@ public class PackageServiceImpl implements PackageService { // 采购标签 if (packageDO.getSupplierCode() != null && !packageDO.getSupplierCode().isEmpty()) { // TODO: 赋值 仓库代码 月台代码 库位代码 采购订单号 采购订单行 采购计划单号 发货单号 - // 赋值 供应商物品代码 + // 赋值 供应商物料代码 SupplieritemDO supplieritemDO = supplieritemService.selectSupplierItemExist(packageDO.getSupplierCode(),packageDO.getItemCode()); packageDO.setSupplierItemCode(supplieritemDO.getSupplierItemCode()); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueDetailServiceImpl.java index accfb4a2b0..4bdd2861e9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueDetailServiceImpl.java @@ -141,7 +141,7 @@ public class PreparetoissueDetailServiceImpl implements PreparetoissueDetailServ * @return */ private void validatePreparetoissueDetailCreate(PreparetoissueDetailDO detailDo) { - // 校验物品代码 + // 校验物料代码 ItembasicDO itembasicDO = itembasicService.selectItembasic(detailDo.getItemCode()); if (!itembasicDO.getUom().equals(detailDo.getUom())) { throw exception(ITEMBASIC_UOM_EXCEPTION, dictDataApi.selectDictValue(detailDo.getUom()).getLabel(), dictDataApi.selectDictValue(itembasicDO.getUom()).getLabel()); @@ -149,7 +149,7 @@ public class PreparetoissueDetailServiceImpl implements PreparetoissueDetailServ PreparetoissueMainDO mainDo = preparetoissueMainService.getPreparetoissueMain(detailDo.getMasterId()); // 校验工位基础信息 workstationService.selectWorkstationExist(detailDo.getWorkStation(),mainDo.getWorkshop(),mainDo.getProdLine()); - // 校验生产线和物品关系 + // 校验生产线和物料关系 // productionlineitemService.productionLineCodeAndpItemCodeExist(mainDo.getProdLine(), detailDo.getItemCode()); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueMainServiceImpl.java index 158460fae3..ecc6ca6214 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/preparetoissue/PreparetoissueMainServiceImpl.java @@ -305,7 +305,7 @@ public class PreparetoissueMainServiceImpl implements PreparetoissueMainService * @return */ private void validatePreparetoissueDetailCreate(PreparetoissueMainDO mainDo, PreparetoissueDetailDO detailDo) { - // 校验物品代码 + // 校验物料代码 ItembasicDO itembasicDO = itembasicService.selectItembasic(detailDo.getItemCode()); if (!itembasicDO.getUom().equals(detailDo.getUom())) { throw exception(ITEMBASIC_UOM_EXCEPTION, dictDataApi.selectDictValue(detailDo.getUom()).getLabel(), dictDataApi.selectDictValue(itembasicDO.getUom()).getLabel()); @@ -322,7 +322,7 @@ public class PreparetoissueMainServiceImpl implements PreparetoissueMainService if (detailDo.getWorkStation() != null) { workstationService.selectWorkstationExist(detailDo.getWorkStation(),mainDo.getWorkshop(),mainDo.getProdLine()); } - // 校验生产线和物品关系 + // 校验生产线和物料关系 // productionlineitemService.productionLineCodeAndpItemCodeExist(mainDo.getProdLine(), detailDo.getItemCode()); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordMainServiceImpl.java index 0701a0c0a3..74decc3b99 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordMainServiceImpl.java @@ -166,7 +166,7 @@ public class ProductdismantleRecordMainServiceImpl implements ProductdismantleRe productdismantleRecordDetailbDO.setBatch("000000"); productdismantleRecordDetailbDO.setPackingNumber(""); productdismantleRecordDetailbDO.setInventoryStatus("OK"); - // 根据成品物品 对应工位 查询 原料库位 + // 根据成品物料 对应工位 查询 原料库位 WorkstationDO workstationDO = workstationService.selectWorkstationExist(productdismantleRecordDetailaDO.getWorkStationCode(),mainDO.getWorkshopCode(),productdismantleRecordDetailaDO.getProductionLineCode()); productdismantleRecordDetailbDO.setToLocationCode(workstationDO.getRawLocationCode()); LocationDO locationDODetailb = locationService.selectLocation(workstationDO.getRawLocationCode()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestDetailaServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestDetailaServiceImpl.java index 29be88668a..df3a7ac404 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestDetailaServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestDetailaServiceImpl.java @@ -102,9 +102,9 @@ public class ProductdismantleRequestDetailaServiceImpl implements Productdismant // 校验--生产线基本信息 ProductionlineDO productionlineDO = productionlineService.productionLineCodeExist(detailDo.getProductionLineCode()); // detailDo.setFromLocationCode(productionlineDO.getRawLocationCode()); - // 校验--物品基本信息 + // 校验--物料基本信息 ItembasicDO itembasicDO = itembasicService.selectItembasic(detailDo.getItemCode()); - // 赋值物品Item相关信息 + // 赋值物料Item相关信息 detailDo.setItemDesc1(itembasicDO.getDesc1()); detailDo.setItemDesc2(itembasicDO.getDesc2()); detailDo.setItemName(itembasicDO.getName()); @@ -120,7 +120,7 @@ public class ProductdismantleRequestDetailaServiceImpl implements Productdismant // } // 校验--库存余额 TB——>TB1 validateBalance(detailDo,mainDO); - // 校验--物品类型 DBT——>DBT2——>IT + // 校验--物料类型 DBT——>DBT2——>IT jobUtils.ifInType(itembasicDO.getType(),businesstypeDO); // 校验--来源库位 DBT——>DBT2——>LO jobUtils.ifInToLocationType(detailDo.getFromLocationCode(), businesstypeDO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestDetailbServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestDetailbServiceImpl.java index b3b2a4bd7b..242e0fdf22 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestDetailbServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestDetailbServiceImpl.java @@ -92,9 +92,9 @@ public class ProductdismantleRequestDetailbServiceImpl implements Productdismant detailbDO.setMasterId(detailaDO.getId()); detailbDO.setNumber(detailaDO.getNumber()); detailbDO.setId(null); - // 校验--物品基本信息 + // 校验--物料基本信息 ItembasicDO itembasicDO = itembasicService.selectItembasic(detailbDO.getItemCode()); - // 赋值物品Item相关信息 + // 赋值物料Item相关信息 detailbDO.setItemDesc1(itembasicDO.getDesc1()); detailbDO.setItemDesc2(itembasicDO.getDesc2()); detailbDO.setItemName(itembasicDO.getName()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestMainServiceImpl.java index 26972793dd..64ba7962e8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRequest/ProductdismantleRequestMainServiceImpl.java @@ -224,9 +224,9 @@ public class ProductdismantleRequestMainServiceImpl implements ProductdismantleR detailbDO.setBomVersion(detailaDO.getBomVersion()); detailbDO.setMasterId(detailaDO.getId()); detailbDO.setNumber(detailaDO.getNumber()); - // 校验--物品基本信息 + // 校验--物料基本信息 ItembasicDO itembasicDO = itembasicService.selectItembasic(detailbDO.getItemCode()); - // 赋值物品Item相关信息 + // 赋值物料Item相关信息 detailbDO.setItemDesc1(itembasicDO.getDesc1()); detailbDO.setItemDesc2(itembasicDO.getDesc2()); detailbDO.setItemName(itembasicDO.getName()); @@ -243,9 +243,9 @@ public class ProductdismantleRequestMainServiceImpl implements ProductdismantleR // 校验--生产线基本信息 ProductionlineDO productionlineDO = productionlineService.productionLineCodeExist(detailDo.getProductionLineCode()); // detailDo.setFromLocationCode(productionlineDO.getRawLocationCode()); - // 校验--物品基本信息 + // 校验--物料基本信息 ItembasicDO itembasicDO = itembasicService.selectItembasic(detailDo.getItemCode()); - // 赋值物品Item相关信息 + // 赋值物料Item相关信息 detailDo.setItemDesc1(itembasicDO.getDesc1()); detailDo.setItemDesc2(itembasicDO.getDesc2()); detailDo.setItemName(itembasicDO.getName()); @@ -261,7 +261,7 @@ public class ProductdismantleRequestMainServiceImpl implements ProductdismantleR // } // 校验--库存余额 TB——>TB1 validateBalance(detailDo,mainDO); - // 校验--物品类型 DBT——>DBT2——>IT + // 校验--物料类型 DBT——>DBT2——>IT jobUtils.ifInType(itembasicDO.getType(),businesstypeDO); // 校验--来源库位 DBT——>DBT2——>LO jobUtils.ifInToLocationType(detailDo.getFromLocationCode(), businesstypeDO); @@ -547,7 +547,7 @@ public class ProductdismantleRequestMainServiceImpl implements ProductdismantleR // productdismantleRecordDetailbDO.setBatch("000000"); // productdismantleRecordDetailbDO.setPackingNumber(""); productdismantleRecordDetailbDO.setInventoryStatus("OK"); - // 根据成品物品 对应工位 查询 原料库位 + // 根据成品物料 对应工位 查询 原料库位 WorkstationDO workstationDO = workstationService.selectWorkstationExist(productdismantleRecordDetailaDO.getWorkStationCode(),productdismantleRecordMainDO.getWorkshopCode(),productdismantleRecordDetailaDO.getProductionLineCode()); productdismantleRecordDetailbDO.setToLocationCode(workstationDO.getRawLocationCode()); LocationDO locationDODetailb = locationService.selectLocation(workstationDO.getRawLocationCode()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionDetailServiceImpl.java index 2bb8a2623a..8df761547d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionDetailServiceImpl.java @@ -137,14 +137,14 @@ public class ProductionDetailServiceImpl implements ProductionDetailService { * @return */ private void validateProductionDetailCreate(ProductionDetailDO detailDo) { - // 校验物品代码 + // 校验物料代码 ItembasicDO itembasicDO = itembasicService.selectItembasic(detailDo.getItemCode()); if (!itembasicDO.getUom().equals(detailDo.getUom())) { throw exception(ITEMBASIC_UOM_EXCEPTION, dictDataApi.selectDictValue(detailDo.getUom()).getLabel(), dictDataApi.selectDictValue(itembasicDO.getUom()).getLabel()); } - // 校验生产线和物品关系 + // 校验生产线和物料关系 productionlineitemService.productionLineCodeAndpItemCodeExist(productionMainService.getProductionMain(detailDo.getMasterId()).getProductionLine(), detailDo.getItemCode()); - // 校验物品和bom关系 + // 校验物料和bom关系 bomService.bomItemCodeAndVersionExist(detailDo.getItemCode(), detailDo.getBomVersion()); } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainService.java index 5ebd1f1dc5..b9d423066a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainService.java @@ -74,7 +74,7 @@ public interface ProductionMainService { * 校验生产计划 * @author chenfang * @param pnumber 单据号 - * @param pitemCode 物品代码 + * @param pitemCode 物料代码 * @return 生产计划子列表 */ ProductionDetailDO planProductionDetailDoExist(String pnumber, String pitemCode); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java index 9e726f8579..c8554da69e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/production/ProductionMainServiceImpl.java @@ -232,7 +232,7 @@ public class ProductionMainServiceImpl implements ProductionMainService { * @return */ private void validateProductionDetailCreate(ProductionMainDO mainDo, ProductionDetailDO detailDo) { - // 校验物品代码 + // 校验物料代码 ItembasicDO itembasicDO = itembasicService.selectItembasic(detailDo.getItemCode()); if (!itembasicDO.getUom().equals(detailDo.getUom())) { throw exception(ITEMBASIC_UOM_EXCEPTION, dictDataApi.selectDictValue(detailDo.getUom()).getLabel(), dictDataApi.selectDictValue(itembasicDO.getUom()).getLabel()); @@ -245,9 +245,9 @@ public class ProductionMainServiceImpl implements ProductionMainService { teamService.selectTeamExist(mainDo.getTeam()); // 校验班次基础信息 shiftService.selectShiftExist(mainDo.getShift()); - // 校验生产线和物品关系 + // 校验生产线和物料关系 productionlineitemService.productionLineCodeAndpItemCodeExist(mainDo.getProductionLine(), detailDo.getItemCode()); - // 校验物品和bom关系 + // 校验物料和bom关系 bomService.bomItemCodeAndVersionExist(detailDo.getItemCode(), detailDo.getBomVersion()); } @@ -260,9 +260,9 @@ public class ProductionMainServiceImpl implements ProductionMainService { teamService.selectTeamExist(mainDo.getTeam()); // 校验班次基础信息 shiftService.selectShiftExist(mainDo.getShift()); - // 校验生产线和物品关系 + // 校验生产线和物料关系 // productionlineitemService.productionLineCodeAndpItemCodeExist(mainDo.getProductionLine(), detailDo.getItemCode()); - // 校验物品和bom关系 + // 校验物料和bom关系 // bomService.bomItemCodeAndVersionExist(detailDo.getItemCode(), detailDo.getBomVersion()); } @@ -319,7 +319,7 @@ public class ProductionMainServiceImpl implements ProductionMainService { } catch (Exception e) { message.append(e.getMessage()).append(","); } - // 校验物品代码 + // 校验物料代码 try { ItembasicDO itembasicDO = itembasicService.selectItembasic(detailDo.getItemCode()); if (!dictDataApi.selectDictValue(itembasicDO.getUom()).getLabel().equals(detailDo.getUom())) { @@ -328,13 +328,13 @@ public class ProductionMainServiceImpl implements ProductionMainService { } catch (Exception e) { message.append(e.getMessage()).append(","); } - // 校验生产线和物品关系 + // 校验生产线和物料关系 try { productionlineitemService.productionLineCodeAndpItemCodeExist(mainDo.getProductionLine(), detailDo.getItemCode()); } catch (Exception e) { message.append(e.getMessage()).append(","); } - // 校验物品和bom关系 + // 校验物料和bom关系 try { bomService.bomItemCodeAndVersionExist(detailDo.getItemCode(), detailDo.getBomVersion()); } catch (Exception e) { @@ -542,7 +542,7 @@ public class ProductionMainServiceImpl implements ProductionMainService { if (workstationDOList == null || workstationDOList.size() == 0) { throw exception(PRODUCTION_MAIN_CANNOT_ERROR); } - // 合并 相同【物品】的 数量求和 + // 合并 相同【物料】的 数量求和 List preparetoissueDetailCreateReqVOListRs = new ArrayList<>(); Map map = new HashMap<>(); for(PreparetoissueDetailCreateReqVO preparetoissueDetailCreateReqVO:preparetoissueDetailCreateReqVOList ) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemService.java index ce6af61db2..5d74307075 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionlineitem/ProductionlineitemService.java @@ -77,7 +77,7 @@ public interface ProductionlineitemService { * BQ-----QPLI * @author chenfang * @param pproductionLineCode 产线代码 - * @param pitemCode 物品代码 + * @param pitemCode 物料代码 * @return 生产线物料关系 */ public ProductionlineitemDO productionLineCodeAndpItemCodeExist(String pproductionLineCode,String pitemCode); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainServiceImpl.java index 2a418dfaab..7bdd1c9c3b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreceiptJob/ProductionreceiptJobMainServiceImpl.java @@ -281,7 +281,7 @@ public class ProductionreceiptJobMainServiceImpl implements ProductionreceiptJob List productionreceiptJobDetailUpdateReqVOList = updateReqVO.getSubList(); //发料记录子 List productionreceiptRecordDetailDOList = new ArrayList<>(); - // 上线结算 物品 + // 上线结算 物料 List OnlineDetailDOList = new ArrayList<>(); //库存事务 List transactionCreateReqVOList = new ArrayList<>(); @@ -320,7 +320,7 @@ public class ProductionreceiptJobMainServiceImpl implements ProductionreceiptJob productionreceiptRecordDetailDO.setUpdater(null); productionreceiptRecordDetailDO.setUpdateTime(null); productionreceiptRecordDetailDOList.add(productionreceiptRecordDetailDO); - // 判断 物品 是否为 上线结算物品 + // 判断 物料 是否为 上线结算物料 if (itembasicService.isOnlines(productionreceiptRecordDetailDO.getItemCode())) { OnlineDetailDOList.add(productionreceiptRecordDetailDO); } @@ -431,7 +431,7 @@ public class ProductionreceiptJobMainServiceImpl implements ProductionreceiptJob onlinesettlementRecordDetailDO.setMasterId(onlinesettlementRecordMainDO.getId()); onlinesettlementRecordDetailDO.setNumber(number); onlinesettlementRecordDetailDO.setSupplierCode(item.getSupplierCode()); - // 查询 供应商物品 赋值 供应商物品代码 + // 查询 供应商物料 赋值 供应商物料代码 onlinesettlementRecordDetailDO.setSupplierItemCode(supplieritemService.selectSupplierItemExist(item.getSupplierCode(),item.getItemCode()).getSupplierItemCode()); onlinesettlementRecordDetailDO.setId(null); onlinesettlementRecordDetailDO.setCreator(null); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestDetailServiceImpl.java index e16ff72af1..709903de04 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestDetailServiceImpl.java @@ -108,9 +108,9 @@ public class ProductionreturnRequestDetailServiceImpl implements Productionretur productionreturnRequestDetailDO.setProjectCode(itembasicDO.getProject()); // 单位校验 ifUomSuccess(itembasicDO.getUom(), productionreturnRequestDetailDO.getUom()); - // 校验 子表数据 物品类型要一致性（创建标签时 前端好判断 否则前端无法实现） + // 校验 子表数据 物料类型要一致性（创建标签时 前端好判断 否则前端无法实现） String itemCodetype = ""; - // 查询其他子表数据物品对应类型 + // 查询其他子表数据物料对应类型 QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("master_id", productionreturnRequestDetailDO.getMasterId()); List productionreturnRequestDetailDOOrther = productionreturnRequestDetailMapper.selectList(queryWrapper); @@ -118,7 +118,7 @@ public class ProductionreturnRequestDetailServiceImpl implements Productionretur itemCodetype = itembasicService.selectItembasic(productionreturnRequestDetailDOOrther.get(0).getItemCode()).getType(); } if (!itemCodetype.equals("") && !itemCodetype.equals(itembasicDO.getType())) { - throw new UtilException("物品代码：" + productionreturnRequestDetailDO.getItemCode() + " 物品类型不一致！"); + throw new UtilException("物料代码：" + productionreturnRequestDetailDO.getItemCode() + " 物料类型不一致！"); } // 校验 业务类型 jobUtils.ifInType(itembasicDO.getType(), businesstypeDO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestMainServiceImpl.java index 256f8253b6..0c27538f44 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRequest/ProductionreturnRequestMainServiceImpl.java @@ -282,7 +282,7 @@ public class ProductionreturnRequestMainServiceImpl implements ProductionreturnR //子表校验 List subList = createReqVO.getSubList(); List subDOList = ProductionreturnRequestDetailConvert.INSTANCE.convertList03(subList); - // 子表 物品类型 + // 子表 物料类型 itemCodetype = ""; for (ProductionreturnRequestDetailDO detailDO : subDOList) { validatorDetailMethod(detailDO,mainDo); @@ -354,12 +354,12 @@ public class ProductionreturnRequestMainServiceImpl implements ProductionreturnR detailDo.setItemName(itembasicDO.getName()); detailDo.setProjectCode(itembasicDO.getProject()); this.ifUomSuccess(itembasicDO.getUom(), detailDo.getUom()); - // 校验 子表数据 物品类型要一致性（创建标签时 前端好判断 否则前端无法实现） + // 校验 子表数据 物料类型要一致性（创建标签时 前端好判断 否则前端无法实现） if (itemCodetype.equals("")) { itemCodetype = itembasicDO.getType(); } if (!itemCodetype.equals(itembasicDO.getType())) { - throw new UtilException("物品代码：" + detailDo.getItemCode() + " 物品类型不一致！"); + throw new UtilException("物料代码：" + detailDo.getItemCode() + " 物料类型不一致！"); } validatorProductionline(detailDo.getProductionLineCode()); // ProductionlineitemDO productionlineitemDO = validatorProductionlineitem(detailDo.getProductionLineCode(), detailDo.getItemCode()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestDetailServiceImpl.java index c5ed08341e..4c68ba8401 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestDetailServiceImpl.java @@ -86,7 +86,7 @@ public class ProductputawayRequestDetailServiceImpl implements ProductputawayReq locationService.selectLocation(productputawayRequestDetailDO.getFromLocationCode()); // 校验 库位类型是否一致 jobUtils.ifInToLocationType(productputawayRequestDetailDO.getFromLocationCode(),businesstypeDO); - // 物品类型 与 业务设置类型 是否正确 + // 物料类型 与 业务设置类型 是否正确 jobUtils.selectItembasicExist(productputawayRequestDetailDO.getItemCode(),businesstypeDO); String value = productputawayRequestDetailDO.getInventoryStatus(); String[] businessArray = value.split(","); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestMainService.java index 944fa2bbad..594ecdb693 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestMainService.java @@ -79,9 +79,9 @@ public interface ProductputawayRequestMainService { */ PageResult getProductputawayRequestMainSenior(CustomConditions conditions); /** - * 批量导入物品基本信息 + * 批量导入物料基本信息 * - * @param importProductputaways 导入物品基本信息列表 + * @param importProductputaways 导入物料基本信息列表 * @param updatePart 是否支持更新 * @return 导入结果 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestMainServiceImpl.java index be0a45964c..1774cc3304 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRequest/ProductputawayRequestMainServiceImpl.java @@ -162,7 +162,7 @@ public class ProductputawayRequestMainServiceImpl implements ProductputawayReque validatorLocation(productputawayRequestDetailDO.getFromLocationCode()); // 校验 库位类型是否一致 IfInToLocationType(productputawayRequestDetailDO.getFromLocationCode(),businesstypeDO); - // 物品类型 与 业务设置类型 是否正确 + // 物料类型 与 业务设置类型 是否正确 jobUtils.selectItembasicExist(productputawayRequestDetailDO.getItemCode(),businesstypeDO); // String value = productputawayRequestDetailDO.getInventoryStatus(); // String[] businessArray = value.split(","); @@ -352,7 +352,7 @@ public class ProductputawayRequestMainServiceImpl implements ProductputawayReque } catch (Exception ex) { message.append(ex.getMessage()).append(","); } - // 物品类型 与 业务设置类型 是否正确 + // 物料类型 与 业务设置类型 是否正确 try { jobUtils.selectItembasicExist(detailDo.getItemCode(),businesstypeDO); } catch (Exception ex){ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainService.java index 8f8bb22ea3..17def6b448 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainService.java @@ -81,7 +81,7 @@ public interface ProductreceiptJobMainService { * /生产(明细)有效，状态正确 * * @param pnumber 单据号 - * @param pitemCode 物品代码 + * @param pitemCode 物料代码 * @return 生产计划子表信息列表 */ public ProductionDetailDO planProductionDetailExist(String pnumber, String pitemCode); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/ProductreceiptRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/ProductreceiptRecordMainServiceImpl.java index af62f0127c..68910c4e82 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/ProductreceiptRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/ProductreceiptRecordMainServiceImpl.java @@ -287,7 +287,7 @@ public class ProductreceiptRecordMainServiceImpl implements ProductreceiptRecord transactionCreateReqVO.setLocationCode(backflushRecordDetailbDO.getFromLocationCode()); transactionCreateReqVO.setQty(backflushRecordDetailbDO.getQty()); transactionCreateReqVOList.add(transactionCreateReqVO); - // 判断 物品 是否为 下线结算物品 创建 下线结算记录 + // 判断 物料 是否为 下线结算物料 创建 下线结算记录 if (itembasicService.isOfflines(backflushRecordDetailbDO.getItemCode())) { offlinesettlementRecordList.add(backflushRecordDetailbDO); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestDetailServiceImpl.java index baae085876..75cb99e55c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestDetailServiceImpl.java @@ -97,11 +97,11 @@ public class ProductreceiptRequestDetailServiceImpl implements ProductreceiptReq // 校验 生产线 ProductionlineDO productionlineDO = productionlineService.productionLineCodeExist(detailDo.getProductionLineCode()); detailDo.setToLocationCode(productionlineDO.getRawLocationCode()); - // 校验生产线和物品关系 + // 校验生产线和物料关系 productionlineitemService.productionLineCodeAndpItemCodeExist(detailDo.getProductionLineCode(), detailDo.getItemCode()); - // 校验 物品 + // 校验 物料 ItembasicDO itembasicDO = itembasicService.selectItembasic(detailDo.getItemCode()); - // 赋值物品相关信息 + // 赋值物料相关信息 detailDo.setItemName(itembasicDO.getName()); detailDo.setItemDesc1(itembasicDO.getDesc1()); detailDo.setItemDesc2(itembasicDO.getDesc2()); @@ -109,7 +109,7 @@ public class ProductreceiptRequestDetailServiceImpl implements ProductreceiptReq if (!itembasicDO.getUom().equals(detailDo.getUom())) { throw new UtilException("计量单位【" + detailDo.getUom() + "】错误，应该是" + itembasicDO.getUom()); } - // 校验 物品包装 + // 校验 物料包装 ItempackagingDO itempackagingDO = itempackagingService.selectItemPackagingExist(detailDo.getItemCode()); detailDo.setStdPackQty(itempackagingDO.getStdPackQty()); detailDo.setStdPackUnit(itempackagingDO.getStdPackUnit()); @@ -118,9 +118,9 @@ public class ProductreceiptRequestDetailServiceImpl implements ProductreceiptReq WorkstationDO workstationDO = workstationService.selectWorkstationExist(detailDo.getWorkStationCode(), mainDO.getWorkshopCode(), detailDo.getProductionLineCode()); detailDo.setToLocationCode(workstationDO.getFgLocationCode()); } - // 校验 物品和bom关系 + // 校验 物料和bom关系 bomService.bomItemCodeAndVersionExist(detailDo.getItemCode(),detailDo.getBomVersion()); - // 校验 成品库与物品关系 + // 校验 成品库与物料关系 // jobUtils.getItemCodeLocationCode(detailDo.getItemCode(), detailDo.getToLocationCode()); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestMainServiceImpl.java index 78151dec70..63f9ec6c4b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRequest/ProductreceiptRequestMainServiceImpl.java @@ -251,11 +251,11 @@ public class ProductreceiptRequestMainServiceImpl implements ProductreceiptReque // 校验 生产线 ProductionlineDO productionlineDO = productionlineService.productionLineCodeExist(detailDo.getProductionLineCode()); detailDo.setToLocationCode(productionlineDO.getRawLocationCode()); - // 校验生产线和物品关系 + // 校验生产线和物料关系 productionlineitemService.productionLineCodeAndpItemCodeExist(detailDo.getProductionLineCode(), detailDo.getItemCode()); - // 校验 物品 + // 校验 物料 ItembasicDO itembasicDO = itembasicService.selectItembasic(detailDo.getItemCode()); - // 赋值物品相关信息 + // 赋值物料相关信息 detailDo.setItemName(itembasicDO.getName()); detailDo.setItemDesc1(itembasicDO.getDesc1()); detailDo.setItemDesc2(itembasicDO.getDesc2()); @@ -263,7 +263,7 @@ public class ProductreceiptRequestMainServiceImpl implements ProductreceiptReque if (!itembasicDO.getUom().equals(detailDo.getUom())) { throw new UtilException("计量单位【" + detailDo.getUom() + "】错误，应该是" + itembasicDO.getUom()); } - // 校验 物品包装 + // 校验 物料包装 ItempackagingDO itempackagingDO = itempackagingService.selectItemPackagingExist(detailDo.getItemCode()); detailDo.setStdPackQty(itempackagingDO.getStdPackQty()); detailDo.setStdPackUnit(itempackagingDO.getStdPackUnit()); @@ -272,9 +272,9 @@ public class ProductreceiptRequestMainServiceImpl implements ProductreceiptReque WorkstationDO workstationDO = workstationService.selectWorkstationExist(detailDo.getWorkStationCode(), mainDO.getWorkshopCode(), detailDo.getProductionLineCode()); detailDo.setToLocationCode(workstationDO.getFgLocationCode()); } - // 校验 物品和bom关系 + // 校验 物料和bom关系 bomService.bomItemCodeAndVersionExist(detailDo.getItemCode(),detailDo.getBomVersion()); - // 校验 成品库与物品关系 TODO：需要上架策略完善后 打开注释 + // 校验 成品库与物料关系 TODO：需要上架策略完善后 打开注释 //jobUtils.getItemCodeLocationCode(detailDo.getItemCode(), detailDo.getToLocationCode()); } @@ -395,16 +395,16 @@ public class ProductreceiptRequestMainServiceImpl implements ProductreceiptReque } catch (Exception ex) { message.append(ex.getMessage()).append(","); } - // 校验生产线和物品关系 + // 校验生产线和物料关系 try { productionlineitemService.productionLineCodeAndpItemCodeExist(detailDo.getProductionLineCode(), detailDo.getItemCode()); } catch (Exception e) { message.append(e.getMessage()).append(","); } - // 校验 物品 + // 校验 物料 try { ItembasicDO itembasicDO = itembasicService.selectItembasic(detailDo.getItemCode()); - // 赋值物品相关信息 + // 赋值物料相关信息 detailDo.setItemName(itembasicDO.getName()); detailDo.setItemDesc1(itembasicDO.getDesc1()); detailDo.setItemDesc2(itembasicDO.getDesc2()); @@ -419,7 +419,7 @@ public class ProductreceiptRequestMainServiceImpl implements ProductreceiptReque } catch (Exception ex) { message.append(ex.getMessage()).append(","); } - // 校验 物品包装 + // 校验 物料包装 try { ItempackagingDO itempackagingDO = itempackagingService.selectItemPackagingExist(detailDo.getItemCode()); detailDo.setStdPackQty(itempackagingDO.getStdPackQty()); @@ -436,13 +436,13 @@ public class ProductreceiptRequestMainServiceImpl implements ProductreceiptReque } catch (Exception ex) { message.append(ex.getMessage()).append(","); } - // 校验 物品和bom关系 + // 校验 物料和bom关系 try { bomService.bomItemCodeAndVersionExist(detailDo.getItemCode(),detailDo.getBomVersion()); } catch (Exception ex) { message.append(ex.getMessage()).append(","); } - // 校验 成品库与物品关系 TODO：需要上架策略完善后 打开注释 + // 校验 成品库与物料关系 TODO：需要上架策略完善后 打开注释 // try { // jobUtils.getItemCodeLocationCode(detailDo.getItemCode(), detailDo.getToLocationCode()); // } catch (Exception ex) { @@ -526,7 +526,7 @@ public class ProductreceiptRequestMainServiceImpl implements ProductreceiptReque backflushRequestDetailbDO.setNumber(detailbDO.getNumber()); backflushRequestDetailbDO.setQty(new BigDecimal(itemBom.get("qty").toString()).multiply(detailbDO.getQty())); backflushRequestDetailbDO.setUom(itemBom.get("uom")==null?"":itemBom.get("uom").toString()); - // 赋值物品相关信息 + // 赋值物料相关信息 ItembasicDO itembasicDO = itembasicService.selectItembasic(itemBom.get("itemCode")==null?"":itemBom.get("itemCode").toString()); backflushRequestDetailbDO.setItemName(itembasicDO.getName()); backflushRequestDetailbDO.setItemDesc1(itembasicDO.getDesc1()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailaServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailaServiceImpl.java index 86c235b088..4d7bb4f5d2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailaServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestDetailaServiceImpl.java @@ -86,9 +86,9 @@ public class ProductrepairRequestDetailaServiceImpl implements ProductrepairRequ public void validateDetailMethod(ProductrepairRequestMainDO mainDO, ProductrepairRequestDetailaBaseVO detailDo, BusinesstypeDO businesstypeDO) { // 校验--生产线基本信息 ProductionlineDO productionlineDO = productionlineService.productionLineCodeExist(detailDo.getProductionLineCode()); - // 校验--物品基本信息 + // 校验--物料基本信息 ItembasicDO itembasicDO = itembasicService.selectItembasic(detailDo.getItemCode()); - // 赋值物品Item相关信息 + // 赋值物料Item相关信息 detailDo.setItemDesc1(itembasicDO.getDesc1()); detailDo.setItemDesc2(itembasicDO.getDesc2()); detailDo.setItemName(itembasicDO.getName()); @@ -104,7 +104,7 @@ public class ProductrepairRequestDetailaServiceImpl implements ProductrepairRequ } // 校验--库存余额 TB——>TB1 validateBalance(detailDo,mainDO); - // 校验--物品类型 DBT——>DBT2——>IT + // 校验--物料类型 DBT——>DBT2——>IT jobUtils.ifInType(itembasicDO.getType(),businesstypeDO); // 校验--来源库位 DBT——>DBT2——>LO jobUtils.ifInToLocationType(detailDo.getFromLocationCode(), businesstypeDO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainServiceImpl.java index a37e1e898c..26eef7897a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productrepairRequest/ProductrepairRequestMainServiceImpl.java @@ -246,9 +246,9 @@ public class ProductrepairRequestMainServiceImpl implements ProductrepairRequest } public void validateDetailbBom(ProductrepairRequestDetailbDO detailbDO, ProductrepairRequestDetailaDO detailaDO, ProductrepairRequestMainDO mainBo) { - // 校验--物品基本信息 + // 校验--物料基本信息 ItembasicDO itembasicDO = itembasicService.selectItembasic(detailbDO.getItemCode()); - // 赋值物品Item相关信息 + // 赋值物料Item相关信息 detailbDO.setItemDesc1(itembasicDO.getDesc1()); detailbDO.setItemDesc2(itembasicDO.getDesc2()); detailbDO.setItemName(itembasicDO.getName()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestDetailServiceImpl.java index f4c3b9df25..447ab2d4d9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/ProductscrapRequestDetailServiceImpl.java @@ -129,7 +129,7 @@ public class ProductscrapRequestDetailServiceImpl implements ProductscrapRequest // 校验--生产线基本信息 ProductionlineDO productionlineDO = productionlineService.productionLineCodeExist(detailCreateReqVO.getProductionLineCode()); detailCreateReqVO.setFromLocationCode(productionlineDO.getRawLocationCode()); - // 校验--物品基本信息 BQ——>QI + // 校验--物料基本信息 BQ——>QI ItembasicDO itembasic = validatorItembasic(detailCreateReqVO.getItemCode()); detailCreateReqVO.setItemDesc1(itembasic.getDesc1()); detailCreateReqVO.setItemDesc2(itembasic.getDesc2()); @@ -143,7 +143,7 @@ public class ProductscrapRequestDetailServiceImpl implements ProductscrapRequest } // 校验--uom // validatorUom(detailCreateReqVO.getUom(), itembasic.getUom()); - // 校验--物品类型 DBT---DBT2---IT1 + // 校验--物料类型 DBT---DBT2---IT1 jobUtils.ifInType(itembasic.getType(), businesstypeDO); // 校验--来源库位 DBT——>DBT2——>LO jobUtils.ifInToLocationType(detailCreateReqVO.getFromLocationCode(), businesstypeDO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/RawscrapRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/RawscrapRequestDetailServiceImpl.java index 518f9b021a..5f71834746 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/RawscrapRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productscrapRequest/RawscrapRequestDetailServiceImpl.java @@ -120,9 +120,9 @@ public class RawscrapRequestDetailServiceImpl implements RawscrapRequestDetailSe @Override public void validateDetailbBom(RawscrapRequestDetailDO rawscrapRequestDetailDO, ProductscrapRequestDetailDO detailDO, ProductscrapRequestMainDO mainBo) { - // 校验--物品基本信息 + // 校验--物料基本信息 ItembasicDO itembasicDO = itembasicService.selectItembasic(rawscrapRequestDetailDO.getItemCode()); - // 赋值物品Item相关信息 + // 赋值物料Item相关信息 rawscrapRequestDetailDO.setItemDesc1(itembasicDO.getDesc1()); rawscrapRequestDetailDO.setItemDesc2(itembasicDO.getDesc2()); rawscrapRequestDetailDO.setItemName(itembasicDO.getName()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseDetailService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseDetailService.java index 96fa9b93e7..e55328e71e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseDetailService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseDetailService.java @@ -85,7 +85,7 @@ public interface PurchaseDetailService { * 获取采购订单详情 * @param number 订单号 * @param lineNumber 订单行号 - * @param itemCode 物品编码 + * @param itemCode 物料编码 * @return */ PurchaseDetailDO selectPurchaseDetail(String number, String lineNumber, String itemCode); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseDetailServiceImpl.java index 345cf1fa0d..9d4c2f3aba 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseDetailServiceImpl.java @@ -178,7 +178,7 @@ public class PurchaseDetailServiceImpl implements PurchaseDetailService { //校验子表公共方法(适用于新增/修改) @Transactional public void validatePurchaseDetailCreate(PurchaseMainDO mainDo, PurchaseDetailDO detailDo) { - // 校验物品基础信息 + // 校验物料基础信息 ItembasicDO itembasicDO = this.validatorItembasic(detailDo.getItemCode()); if (itembasicDO != null) { if (!itembasicDO.getUom().equals(detailDo.getUom())) { @@ -223,12 +223,12 @@ public class PurchaseDetailServiceImpl implements PurchaseDetailService { return itembasicService.selectItembasic(itemCode); } - //子表校验 校验物品标包信息 + //子表校验 校验物料标包信息 private ItempackagingDO validatorItemPackagingExist(String itemCode) { return itempackagingService.selectItemPackagingExist(itemCode); } - //子表校验 校验供应商物品 + //子表校验 校验供应商物料 private SupplieritemDO validatorSupplierItemExist(String supplierCode, String itemCode) { return supplieritemService.selectSupplierItemExist(supplierCode, itemCode); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainService.java index cc1592682b..b0117b52ab 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainService.java @@ -86,7 +86,7 @@ public interface PurchaseMainService { * * @param pnumber 单据号 * @param psupplierCode 供应商代码 - * @param pitemCode 物品代码 + * @param pitemCode 物料代码 * @return 采购订单子列表 * @author chenfang */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java index 6b0e1a8fdd..59f14bb790 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java @@ -284,12 +284,12 @@ public class PurchaseMainServiceImpl implements PurchaseMainService { return itembasicService.selectItembasic(itemCode); } - //子表校验 校验物品标包信息 + //子表校验 校验物料标包信息 private ItempackagingDO validatorItemPackagingExist(String itemCode) { return itempackagingService.selectItemPackagingExist(itemCode); } - //子表校验 校验供应商物品 + //子表校验 校验供应商物料 private SupplieritemDO validatorSupplierItemExist(String supplierCode, String itemCode) { return supplieritemService.selectSupplierItemExist(supplierCode, itemCode); } @@ -312,7 +312,7 @@ public class PurchaseMainServiceImpl implements PurchaseMainService { //校验子表公共方法(适用于新增/修改) private void validatorDetailMethod(PurchaseDetailDO detailDo, PurchaseMainDO mainDo) { - // 校验物品基础信息 + // 校验物料基础信息 ItembasicDO itembasicDO = this.validatorItembasic(detailDo.getItemCode()); if (itembasicDO != null) { if (!itembasicDO.getUom().equals(detailDo.getUom())) { @@ -431,7 +431,7 @@ public class PurchaseMainServiceImpl implements PurchaseMainService { */ private String validatorPurchaseDetailImport(PurchaseDetailDO detailDo, PurchaseMainDO mainDo) { String messageDetail = ""; - // 校验物品基础信息 + // 校验物料基础信息 try { ItembasicDO itembasicDO = itembasicService.selectItembasic(detailDo.getItemCode()); DictDataRespDTO dictDataRespDTO = dictDataApi.selectDictTypeAndLabel(DictTypeConstants.UOM, detailDo.getUom()); @@ -442,7 +442,7 @@ public class PurchaseMainServiceImpl implements PurchaseMainService { } catch (ServiceException ex) { messageDetail += ex.getMessage() + ","; } - // 校验物品标包信息 + // 校验物料标包信息 try { ItempackagingDO itempackagingDO = itempackagingService.selectItemPackagingExist(detailDo.getItemCode()); detailDo.setStdPackUnit(itempackagingDO.getStdPackUnit()); @@ -450,7 +450,7 @@ public class PurchaseMainServiceImpl implements PurchaseMainService { } catch (ServiceException ex) { messageDetail += ex.getMessage() + ","; } - // 校验供应商物品 + // 校验供应商物料 try { SupplieritemDO supplieritemDO = supplieritemService.selectSupplierItemExist(mainDo.getSupplierCode(), detailDo.getItemCode()); detailDo.setSupplierUom(supplieritemDO.getSupplierUom()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanDetailServiceImpl.java index ea9f233213..7e9fbe2f91 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanDetailServiceImpl.java @@ -202,7 +202,7 @@ public class PurchasePlanDetailServiceImpl implements PurchasePlanDetailService itembasicService.selectItembasic(itemCode); } - //子表校验 校验供应商物品 + //子表校验 校验供应商物料 private SupplieritemDO validatorSupplierItemExist(String supplierCode, String itemCode) { return supplieritemService.selectSupplierItemExist(supplierCode, itemCode); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainService.java index d98a27a4f0..58260dac22 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainService.java @@ -84,7 +84,7 @@ public interface PurchasePlanMainService { * @param psupplierCode 供应商code * @param ppoNumber 订单号 * @param ppoLine 订单行 - * @param pitemCode 物品code + * @param pitemCode 物料code * @return */ PurchasePlanDetailDO selectPurchasePlan(String pnubmer, String psupplierCode, String ppoNumber, String ppoLine, String pitemCode); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainServiceImpl.java index eecc47e9b0..5e17eaa496 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainServiceImpl.java @@ -214,7 +214,7 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService { itembasicService.selectItembasic(itemCode); } - //子表校验 校验供应商物品 + //子表校验 校验供应商物料 private SupplieritemDO validatorSupplierItemExist(String supplierCode, String itemCode) { return supplieritemService.selectSupplierItemExist(supplierCode, itemCode); } @@ -356,7 +356,7 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService { private String validatorPurchasePlanDetailImport(PurchasePlanDetailDO detailDo, PurchasePlanMainDO mainDo) { String messageDetail = ""; - // 校验物品基础信息 + // 校验物料基础信息 try { ItembasicDO itembasicDO = itembasicService.selectItembasic(detailDo.getItemCode()); if (itembasicDO.getUom() != detailDo.getUom()) { @@ -365,7 +365,7 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService { } catch (ServiceException ex) { messageDetail += ex.getMessage() + ","; } - // 校验供应商物品 + // 校验供应商物料 try { SupplieritemDO supplieritemDO = supplieritemService.selectSupplierItemExist(mainDo.getSupplierCode(), detailDo.getItemCode()); } catch (ServiceException ex) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java index 63de7d0498..c713a0a561 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainService.java @@ -65,7 +65,7 @@ public interface PurchasereceiptJobMainService { * 调用校验供应商发货记录方法 * * @param pasnNumber 发货单号 - * @param pitemCode 物品代码 + * @param pitemCode 物料代码 * @param ppoNumber 订单号 * @param ppoLine 订单行 * @return 供应商发货记录子 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java index cc98297861..16dfd270d0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java @@ -404,7 +404,7 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain //按零件号和批次分组 Map> listMap = new HashMap<>(); for(PurchasereceiptRecordDetailDO purchasereceiptRecordDetailDO : purchasereceiptRecordDetailDOList) { - //采购收货记录 生成后免检物品 创建 上架申请 + //采购收货记录 生成后免检物料 创建 上架申请 String key = purchasereceiptRecordDetailDO.getItemCode() + "_" + purchasereceiptRecordDetailDO.getFromBatch(); List list = listMap.get(key); if(list == null) { @@ -458,7 +458,7 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain } //移除预计入 expectinService.deleteExpectinByJobNumber(purchasereceiptJobMainDO.getNumber()); - //采购收货记录 生成后免检物品 创建 上架申请 + //采购收货记录 生成后免检物料 创建 上架申请 if(switchDO2.getEffectiveSetValue().equals("TRUE") && "EXEMPT".equals(jsonObject.getStr("InspectType"))) { PutawayRequestMainCreateReqVO putawayRequestMainCreateReqVO = new PutawayRequestMainCreateReqVO(); BeanUtils.copyProperties(purchasereceiptRecordMainDO, putawayRequestMainCreateReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainServiceImpl.java index f8e609aea0..6a340e277c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRecord/PurchasereceiptRecordMainServiceImpl.java @@ -132,7 +132,7 @@ public class PurchasereceiptRecordMainServiceImpl implements PurchasereceiptReco if (purchasereceiptRecordDetailDO != null) { return purchasereceiptRecordDetailDO; } else { - throw new UtilException("采购收货记录明细:订单号" + ppoNumber + "、订单行" + ppoLine + "物品代码、" + pitemCode + "无效"); + throw new UtilException("采购收货记录明细:订单号" + ppoNumber + "、订单行" + ppoLine + "物料代码、" + pitemCode + "无效"); } } else { throw new UtilException("采购收货记录无效" + pNumber + "无效"); @@ -153,7 +153,7 @@ public class PurchasereceiptRecordMainServiceImpl implements PurchasereceiptReco // //按零件号和批次分组 // Map> listMap = new HashMap<>(); // for(PurchasereceiptRecordDetailDO purchasereceiptRecordDetailDO : detailDOList) { -// //采购收货记录 生成后免检物品 创建 上架申请 +// //采购收货记录 生成后免检物料 创建 上架申请 // if(switchDO2.getEffectiveSetValue().equals("TRUE")) { // InspectRequestDetailCreateReqVO inspectRequestDetailCreateReqVO = new InspectRequestDetailCreateReqVO(); // BeanUtils.copyProperties(purchasereceiptRecordDetailDO, inspectRequestDetailCreateReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestDetailServiceImpl.java index 6310a88842..973040505c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestDetailServiceImpl.java @@ -122,7 +122,7 @@ public class PurchasereceiptRequestDetailServiceImpl implements PurchasereceiptR } /** - * 校验物品信息并赋值 + * 校验物料信息并赋值 * @param detailDo * @return */ @@ -136,7 +136,7 @@ public class PurchasereceiptRequestDetailServiceImpl implements PurchasereceiptR } /** - * 校验物品包装信息并赋值 + * 校验物料包装信息并赋值 * @param detailDo */ private void validateItemPacking(PurchasereceiptRequestDetailDO detailDo) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java index c847a46150..ae5b11a8af 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java @@ -676,7 +676,7 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq } /** - * 校验物品信息并赋值 + * 校验物料信息并赋值 * @param detailDo * @return */ @@ -690,7 +690,7 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq } /** - * 校验物品包装信息并赋值 + * 校验物料包装信息并赋值 * @param detailDo */ private void validateItemPacking(PurchasereceiptRequestDetailDO detailDo) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java index 88e034d789..953dc0f4d8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java @@ -113,7 +113,7 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe * 调用校验供应商发货记录方法 * * @param psupplierCode 发货单号 - * @param pitemCode 物品代码 + * @param pitemCode 物料代码 * @param ppoNumber 订单号 * @param ppoLine 订单行 * @return 供应商发货记录子 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestDetailServiceImpl.java index b71f0535c6..a490f91e34 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestDetailServiceImpl.java @@ -125,7 +125,7 @@ public class PurchasereturnRequestDetailServiceImpl implements PurchasereturnReq } /** - * 校验物品信息并赋值 + * 校验物料信息并赋值 * @param detailDO * @return */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestDetailServiceImpl.java index caec7a6108..4fca561a13 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestDetailServiceImpl.java @@ -124,7 +124,7 @@ public class RepleinshRequestDetailServiceImpl implements RepleinshRequestDetail } /** - * 校验物品信息并赋值 + * 校验物料信息并赋值 * @param detailDo * @return */ @@ -148,7 +148,7 @@ public class RepleinshRequestDetailServiceImpl implements RepleinshRequestDetail BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("RepleinmentRequest"); jobUtils.ifInType(itemType, businesstypeDO); detailDo.setInventoryStatus(businesstypeDO.getInInventoryStatuses()); - //校验物品类型 + //校验物料类型 jobUtils.selectItembasicExist(itemCode,businesstypeDO); //校验到库位 jobUtils.ifInFromLocationType(locationCode,businesstypeDO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestMainServiceImpl.java index 29416f02ef..bb6aa0744a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRequest/RepleinshRequestMainServiceImpl.java @@ -467,7 +467,7 @@ public class RepleinshRequestMainServiceImpl implements RepleinshRequestMainServ } /** - * 校验物品信息并赋值 + * 校验物料信息并赋值 * @param detailDo * @return */ @@ -497,7 +497,7 @@ public class RepleinshRequestMainServiceImpl implements RepleinshRequestMainServ mainDo.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses()); mainDo.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses()); detailDo.setInventoryStatus(businesstypeDO.getInInventoryStatuses()); - //校验物品类型 + //校验物料类型 jobUtils.selectItembasicExist(itemCode,businesstypeDO); //校验到库位 jobUtils.ifInFromLocationType(locationCode,businesstypeDO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleService.java index bf723eb724..49c5ef315f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleService.java @@ -40,10 +40,10 @@ public interface RuleService { void updateRule(@Valid RuleUpdateReqVO updateReqVO); /** - * 获得物品基本信息列表 + * 获得物料基本信息列表 * * @param conditions 条件 - * @return 物品基本信息列表 + * @return 物料基本信息列表 */ List getRuleList(CustomConditions conditions); @@ -101,7 +101,7 @@ public interface RuleService { * 获取检验策略 * * @param supplierCode 供应商类型 - * @param itemCode 物品代码 + * @param itemCode 物料代码 * @return */ RuleRespVO inspect(String supplierCode, String itemCode); @@ -119,7 +119,7 @@ public interface RuleService { * * @param supplierCode 供应商 * @param customerCode 客户 - * @param itemCode 物品代码 + * @param itemCode 物料代码 * @param inventoryStatus 库存状态 * @param storageType 存储类型 * @param transactionType 库存事务 @@ -133,7 +133,7 @@ public interface RuleService { /** * 获取存储容量策略 * - * @param itemCode 物品代码 + * @param itemCode 物料代码 * @param locationCode 库位代码 * @return */ @@ -144,7 +144,7 @@ public interface RuleService { * * @param supplierCode 供应商 * @param customerCode 客户 - * @param itemCode 物品代码 + * @param itemCode 物料代码 * @param inventoryStatus 库存状态 * @param storageType 存储类型 * @param transactionType 库存事务 @@ -155,7 +155,7 @@ public interface RuleService { /** * 获取补料策略 * - * @param itemCode 物品代码 + * @param itemCode 物料代码 * @param locationCode 库位代码 * @return */ @@ -166,9 +166,9 @@ public interface RuleService { * * @param supplierCode 供应商 * @param customerCode 客户 - * @param itemCode 物品代码 + * @param itemCode 物料代码 * @param locationCode 库位代码 - * @param ignoreListOfItem 物品忽略名单 + * @param ignoreListOfItem 物料忽略名单 * @param ignoreListOfLocation 库位忽略名单 * @return */ @@ -179,7 +179,7 @@ public interface RuleService { * * @param supplierCode 供应商 * @param customerCode 客户 - * @param itemCode 物品代码 + * @param itemCode 物料代码 * @return */ RuleRespVO batch(String supplierCode, String customerCode, String itemCode); @@ -197,13 +197,13 @@ public interface RuleService { * 获取器具容量策略 * * @param containerType 器具类型 - * @param itemCode 物品代码 + * @param itemCode 物料代码 * @return */ RuleRespVO applianceCapacity(String containerType, String itemCode); /** - * 获取根据物品代码List以及库位代码管理精度策略 + * 获取根据物料代码List以及库位代码管理精度策略 * * @param reqVO * @return @@ -211,7 +211,7 @@ public interface RuleService { List> getPrecisionStrategyByItemCodes(PrecisionStrategyReqVO reqVO); /** - * 获取根据物品代码以及库位代码管理精度策略 + * 获取根据物料代码以及库位代码管理精度策略 * * @param reqVO2List * @return @@ -221,7 +221,7 @@ public interface RuleService { /** * 获取上架列表 * - * @param itemCode 物品代码 + * @param itemCode 物料代码 * @param inventoryStatus 库存状态 * @return */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainService.java index 07407a5815..607a9a71c3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainService.java @@ -82,7 +82,7 @@ public interface SaleMainService { * * @param psoNumber 单据号 * @param psoLine 行号 - * @param pitemCode 物品代码 + * @param pitemCode 物料代码 * @return 销售订单子列表 */ public SaleDetailDO selectSaleDetailDoExist(String psoNumber, String psoLine, String pitemCode); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainServiceImpl.java index 7afdc6e75a..3e5520eb2f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/sale/SaleMainServiceImpl.java @@ -202,7 +202,7 @@ public class SaleMainServiceImpl implements SaleMainService { List subDOList = SaleDetailConvert.INSTANCE.convertList03(subList); for (SaleDetailDO purchaseDetailDO : subDOList) { String messageDetail = ""; - // 校验物品基础信息 + // 校验物料基础信息 try { ItembasicDO itembasicDO = itembasicService.selectItembasic(purchaseDetailDO.getItemCode()); if (itembasicDO.getUom() != purchaseDetailDO.getUom()) { @@ -370,7 +370,7 @@ public class SaleMainServiceImpl implements SaleMainService { } /** - * 校验物品信息并赋值 + * 校验物料信息并赋值 * @param detailDo * @return */ @@ -390,7 +390,7 @@ public class SaleMainServiceImpl implements SaleMainService { } /** - * 校验物品包装信息并赋值 + * 校验物料包装信息并赋值 * @param detailDO * @return */ @@ -399,7 +399,7 @@ public class SaleMainServiceImpl implements SaleMainService { } /** - * 校验客户物品信息并赋值 + * 校验客户物料信息并赋值 * @param mainDO * @return */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceService.java index e1f0489a0f..cdf0be6fd4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/saleprice/SalepriceService.java @@ -86,7 +86,7 @@ public interface SalepriceService { * BQ------QSaleP * @author chenfang * @param pcustomerCode 客户code - * @param pitemCode 物品code + * @param pitemCode 物料code * @return */ public SalepriceDO selectItemPackagingExist(String pcustomerCode,String pitemCode); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestMainServiceImpl.java index 00ba613ac1..ce1407bbe1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestMainServiceImpl.java @@ -299,7 +299,7 @@ public class ScrapRequestMainServiceImpl implements ScrapRequestMainService { // BQ——>QI ItembasicDO itembasic = validatorItembasic(detailDo.getItemCode()); if(itembasic == null){ - // 物品【item_code】无效 + // 物料【item_code】无效 throw exception(SCRAP_REQUEST_ITEMCODE_INVALID); } detailDo.setItemDesc1(itembasic.getDesc1()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainService.java index 9e14e314ee..c69235f9fd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainService.java @@ -87,7 +87,7 @@ public interface SupplierdeliverRecordMainService { * 校验供应商发货记录 * @author chenfang * @param pasnNumber 发货单号 - * @param pitemCode 物品代码 + * @param pitemCode 物料代码 * @param ppoNumber 订单号 * @param ppoLine 订单行 * @return 供应商发货记录子 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainServiceImpl.java index c3780f0d34..82e9bc5fb6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRecord/SupplierdeliverRecordMainServiceImpl.java @@ -114,7 +114,7 @@ public class SupplierdeliverRecordMainServiceImpl implements SupplierdeliverReco if (supplierdeliverRecordDetailDO != null) { return supplierdeliverRecordDetailDO; } else { - throw new UtilException("供应商发货明细:订单号" + ppoNumber + "、订单行" + ppoLine + "物品代码、" + pitemCode + "无效"); + throw new UtilException("供应商发货明细:订单号" + ppoNumber + "、订单行" + ppoLine + "物料代码、" + pitemCode + "无效"); } } else { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestDetailServiceImpl.java index 22cc551050..b77b26c515 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestDetailServiceImpl.java @@ -125,12 +125,12 @@ public class SupplierdeliverRequestDetailServiceImpl implements SupplierdeliverR itembasicService.selectItembasic(itemCode); } - //子表校验 校验供应商物品 + //子表校验 校验供应商物料 private SupplieritemDO validatorSupplierItemExist(String supplierCode, String itemCode) { return supplieritemService.selectSupplierItemExist(supplierCode, itemCode); } - //子表校验 校验物品标包信息 + //子表校验 校验物料标包信息 private ItempackagingDO validatorItemPackagingExist(String itemCode) { return itempackagingService.selectItemPackagingExist(itemCode); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java index e8ca8b9c35..ef76f412c7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java @@ -297,12 +297,12 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq itembasicService.selectItembasic(itemCode); } - //子表校验 校验供应商物品 + //子表校验 校验供应商物料 private SupplieritemDO validatorSupplierItemExist(String supplierCode, String itemCode) { return supplieritemService.selectSupplierItemExist(supplierCode, itemCode); } - //子表校验 校验物品标包信息 + //子表校验 校验物料标包信息 private ItempackagingDO validatorItemPackagingExist(String itemCode) { return itempackagingService.selectItemPackagingExist(itemCode); } @@ -455,7 +455,7 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq @Transactional public String validatorSupplierdeliverRequestDetailImport(SupplierdeliverRequestDetailDO supplierdeliverRequestDetailDO, SupplierdeliverRequestMainDO supplierdeliverRequestMainDO) { String messageDetail = ""; - // 校验物品基础信息 + // 校验物料基础信息 try { ItembasicDO itembasicDO = itembasicService.selectItembasic(supplierdeliverRequestDetailDO.getItemCode()); if (itembasicDO.getUom() != supplierdeliverRequestDetailDO.getUom()) { @@ -465,7 +465,7 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq } catch (ServiceException ex) { messageDetail += ex.getMessage() + ","; } - // 校验物品标包信息 + // 校验物料标包信息 try { ItempackagingDO itempackagingDO = itempackagingService.selectItemPackagingExist(supplierdeliverRequestDetailDO.getItemCode()); supplierdeliverRequestDetailDO.setStdPackUnit(itempackagingDO.getStdPackUnit()); @@ -473,7 +473,7 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq } catch (Exception ex) { messageDetail += ex.getMessage() + ","; } - // 校验供应商物品 + // 校验供应商物料 try { SupplieritemDO supplieritemDO = supplieritemService.selectSupplierItemExist(supplierdeliverRequestMainDO.getSupplierCode(), supplierdeliverRequestDetailDO.getItemCode()); } catch (Exception ex) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplieritem/SupplieritemService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplieritem/SupplieritemService.java index dbeb1685fe..9c09ac1efd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplieritem/SupplieritemService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplieritem/SupplieritemService.java @@ -11,14 +11,14 @@ import com.win.module.wms.dal.dataobject.supplieritem.SupplieritemDO; import com.win.framework.common.pojo.PageResult; /** - * 供应商物品 Service 接口 + * 供应商物料 Service 接口 * * @author 超级管理员 */ public interface SupplieritemService { /** - * 创建供应商物品 + * 创建供应商物料 * * @param createReqVO 创建信息 * @return 编号 @@ -26,7 +26,7 @@ public interface SupplieritemService { Long createSupplieritem(@Valid SupplieritemCreateReqVO createReqVO); /** - * 获得用高级搜索供应商物品分页列表 + * 获得用高级搜索供应商物料分页列表 * * @param conditions 分页、排序和自定义条件 * @return 分页列表 @@ -34,48 +34,48 @@ public interface SupplieritemService { PageResult getSupplieritemSenior(CustomConditions conditions); /** - * 更新供应商物品 + * 更新供应商物料 * * @param updateReqVO 更新信息 */ void updateSupplieritem(@Valid SupplieritemUpdateReqVO updateReqVO); /** - * 删除供应商物品 + * 删除供应商物料 * * @param id 编号 */ void deleteSupplieritem(Long id); /** - * 获得供应商物品 + * 获得供应商物料 * * @param id 编号 - * @return 供应商物品 + * @return 供应商物料 */ SupplieritemDO getSupplieritem(Long id); /** - * 获得供应商物品列表 + * 获得供应商物料列表 * * @param ids 编号 - * @return 供应商物品列表 + * @return 供应商物料列表 */ List getSupplieritemList(CustomConditions conditions); /** - * 获得供应商物品分页 + * 获得供应商物料分页 * * @param pageReqVO 分页查询 - * @return 供应商物品分页 + * @return 供应商物料分页 */ PageResult getSupplieritemPage(SupplieritemPageReqVO pageReqVO); /** - * 获得供应商物品列表, 用于 Excel 导出 + * 获得供应商物料列表, 用于 Excel 导出 * * @param exportReqVO 查询条件 - * @return 供应商物品列表 + * @return 供应商物料列表 */ List getSupplieritemList(SupplieritemExportReqVO exportReqVO); @@ -83,15 +83,15 @@ public interface SupplieritemService { /** * BQ----QSI - * 查询供应商物品是否存在 + * 查询供应商物料是否存在 * @param psupplierCode 供应商code - * @param pitemCode 物品code + * @param pitemCode 物料code * @return */ public SupplieritemDO selectSupplierItemExist(String psupplierCode,String pitemCode); /** - * 采购清单新增时添加子表供应商物品信息时需要筛选出可用的除RAW,FG以外类型物品信息 + * 采购清单新增时添加子表供应商物料信息时需要筛选出可用的除RAW,FG以外类型物料信息 * @param pageVO * @return */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplieritem/SupplieritemServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplieritem/SupplieritemServiceImpl.java index 256ac8ab56..5cb7409b52 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplieritem/SupplieritemServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplieritem/SupplieritemServiceImpl.java @@ -37,7 +37,7 @@ import static com.win.module.wms.enums.ErrorCodeConstants.*; /** - * 供应商物品 Service 实现类 + * 供应商物料 Service 实现类 * * @author 超级管理员 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestDetailServiceImpl.java index 888a732668..5038acf3e7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestDetailServiceImpl.java @@ -103,7 +103,7 @@ public class TransferissueRequestDetailServiceImpl implements TransferissueReque if(fromlocationDO == null){ throw exception(TRANSFERISSUE_REQUEST_DETAIL_LOCALTIONCODE_NOT_EXISTS, transferissueRequestDetailDO.getFromLocationCode()); } - // BQ----QI 校验物品基础信息 + // BQ----QI 校验物料基础信息 ItembasicDO item = validatorItembasic(transferissueRequestDetailDO.getItemCode()); if(item == null){ throw exception(TRANSFERISSUE_REQUEST_DETAIL_ITEM_NOT_EXISTS, transferissueRequestDetailDO.getItemCode()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestMainServiceImpl.java index 2e3854e1cb..5874fccc15 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestMainServiceImpl.java @@ -182,7 +182,7 @@ public class TransferissueRequestMainServiceImpl implements TransferissueRequest if(fromlocationDO == null){ throw exception(TRANSFERISSUE_REQUEST_DETAIL_LOCALTIONCODE_NOT_EXISTS, transferissueRequestDetailDO.getFromLocationCode()); } - // BQ----QI 校验物品基础信息 + // BQ----QI 校验物料基础信息 ItembasicDO item = validatorItembasic(transferissueRequestDetailDO.getItemCode()); if(item == null){ throw exception(TRANSFERISSUE_REQUEST_DETAIL_ITEM_NOT_EXISTS, transferissueRequestDetailDO.getItemCode()); @@ -376,7 +376,7 @@ public class TransferissueRequestMainServiceImpl implements TransferissueRequest message.append(ex.getMessage()).append(","); } try{ - //BQ----QI 校验物品基础信息 + //BQ----QI 校验物料基础信息 ItembasicDO item = validatorItembasic(detailDo.getItemCode()); if(item == null){ throw exception(TRANSFERISSUE_REQUEST_DETAIL_ITEM_NOT_EXISTS, detailDo.getItemCode()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestDetailServiceImpl.java index 7f5fc25a58..c97ad4b875 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestDetailServiceImpl.java @@ -89,7 +89,7 @@ public class TransferreceiptRequestDetailServiceImpl implements TransferreceiptR if(fromlocationDO == null){ throw exception(TRANSFERRECEIPT_REQUEST_DETAIL_LOCALTIONCODE_NOT_EXISTS, transferreceiptRequestDetailDO.getFromLocationCode()); } - // BQ----QI 校验物品基础信息 + // BQ----QI 校验物料基础信息 ItembasicDO item = validatorItembasic(transferreceiptRequestDetailDO.getItemCode()); if(item == null){ throw exception(TRANSFERRECEIPT_REQUEST_DETAIL_ITEM_NOT_EXISTS, transferreceiptRequestDetailDO.getItemCode()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainServiceImpl.java index 185eb36c0b..91c4977703 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainServiceImpl.java @@ -553,11 +553,11 @@ public class UnplannedissueRequestMainServiceImpl implements UnplannedissueReque message.append(ex.getMessage()).append(","); } try{ - // BQ——>QI 校验物品基础信息 + // BQ——>QI 校验物料基础信息 ItembasicDO itembasicDO = itembasicService.selectItembasic(detailDo.getItemCode()); - detailDo.setItemDesc1(itembasicDO.getDesc1()); // 物品描述1 - detailDo.setItemDesc2(itembasicDO.getDesc2()); // 物品描述2 - detailDo.setItemName(itembasicDO.getName()); // 物品名称 + detailDo.setItemDesc1(itembasicDO.getDesc1()); // 物料描述1 + detailDo.setItemDesc2(itembasicDO.getDesc2()); // 物料描述2 + detailDo.setItemName(itembasicDO.getName()); // 物料名称 detailDo.setUom(itembasicDO.getUom()); // 计量单位 detailDo.setProjectCode(itembasicDO.getProject()); // 项目代码 }catch (Exception ex) { diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkMainServiceImpl.java index 8c2e1179be..08a8236797 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/work/WorkMainServiceImpl.java @@ -235,7 +235,7 @@ public class WorkMainServiceImpl implements WorkMainService { // List subDOList = WorkDetailConvert.INSTANCE.convertList03(subList); // for (WorkDetailDO purchaseDetailDO : subDOList) { // String messageDetail = ""; -// // 校验物品基础信息 +// // 校验物料基础信息 // try { // ItembasicDO itembasicDO = itembasicService.selectItembasic(purchaseDetailDO.getItemCode()); // if (itembasicDO.getUom() != purchaseDetailDO.getUom()) { @@ -254,7 +254,7 @@ public class WorkMainServiceImpl implements WorkMainService { // messageDetail += ex.getMessage() + ","; // } // -// // 校验物品标包信息 +// // 校验物料标包信息 // try { // ItempackagingDO itempackagingDO = itempackagingService.selectItemPackagingExist(purchaseDetailDO.getItemCode()); //// purchaseDetailDO.setStdPackUnit(itempackagingDO.getStdPackUnit()); @@ -262,11 +262,11 @@ public class WorkMainServiceImpl implements WorkMainService { // } catch (ServiceException ex) { // messageDetail += ex.getMessage() + ","; // } -// // 校验客户物品基础信息 +// // 校验客户物料基础信息 // try { // CustomeritemDO customeritemDO = customeritemService.selectCustomeritemExist(createReqVO.getCustomerCode(), purchaseDetailDO.getItemCode()); // if (customeritemDO == null) { -// messageDetail += "未查找到客户" + createReqVO.getCustomerCode() + "与物品" + purchaseDetailDO.getItemCode() + "的对应关系" + ","; +// messageDetail += "未查找到客户" + createReqVO.getCustomerCode() + "与物料" + purchaseDetailDO.getItemCode() + "的对应关系" + ","; // } else { // //根据customeritemdto赋值 // } @@ -333,7 +333,7 @@ public class WorkMainServiceImpl implements WorkMainService { } /** - * 校验物品信息并赋值 + * 校验物料信息并赋值 * @param detailDo * @return */ @@ -353,7 +353,7 @@ public class WorkMainServiceImpl implements WorkMainService { } /** - * 校验客户物品信息 + * 校验客户物料信息 * @param detailDo * @return */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/util/JobUtils.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/util/JobUtils.java index fcfc8aa65a..71e0a39cb0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/util/JobUtils.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/util/JobUtils.java @@ -322,8 +322,8 @@ public class JobUtils { /** * 校验物料有效，状态正确 * - * @param itemCode 物品代码 - * @return 物品基本信息列表 + * @param itemCode 物料代码 + * @return 物料基本信息列表 * @author chenfang * @author chenfang */ @@ -398,7 +398,7 @@ public class JobUtils { * SQ-------G * 零件库位关系有效 * - * @param pitemCode 物品代码 + * @param pitemCode 物料代码 * @return 上架策略信息 * @author chenfang */ @@ -609,21 +609,21 @@ public class JobUtils { if ("{\"ManagementPrecision\":\"BY_QUANTITY\"}".equals(managementtRule.getConfiguration())) { balanceDOList = balanceService.selectByNumber(itemcode, inventoryStatus, locationcode); if (balanceDOList == null) { - throw exception(MANAGEMENTPRECISION_EXCEPTION, "物品代码" + itemcode + "库存状态" + inventoryStatus + "在" + locationcode + "库位中未查找到库存记录"); + throw exception(MANAGEMENTPRECISION_EXCEPTION, "物料代码" + itemcode + "库存状态" + inventoryStatus + "在" + locationcode + "库位中未查找到库存记录"); } else { return balanceDOList; } } else if ("{\"ManagementPrecision\":\"BY_BATCH\"}".equals(managementtRule.getConfiguration())) { balanceDOList = balanceService.selectByBatch(itemcode, batch, inventoryStatus, locationcode); if (balanceDOList == null) { - throw exception(MANAGEMENTPRECISION_EXCEPTION, "物品代码" + itemcode + "批次" + batch + "库存状态" + inventoryStatus + "在" + locationcode + "库位中未查找到库存记录"); + throw exception(MANAGEMENTPRECISION_EXCEPTION, "物料代码" + itemcode + "批次" + batch + "库存状态" + inventoryStatus + "在" + locationcode + "库位中未查找到库存记录"); } else { return balanceDOList; } } else if ("{\"ManagementPrecision\":\"BY_PACKAGING\"}".equals(managementtRule.getConfiguration())) { balanceDOList = balanceService.selectByPackaging(itemcode, packingnumber, batch, inventoryStatus, locationcode); if (balanceDOList == null) { - throw exception(MANAGEMENTPRECISION_EXCEPTION, "物品代码" + itemcode + "箱码" + packingnumber + "批次" + batch + "库存状态" + inventoryStatus + "在" + locationcode + "库位中未查找到库存记录"); + throw exception(MANAGEMENTPRECISION_EXCEPTION, "物料代码" + itemcode + "箱码" + packingnumber + "批次" + batch + "库存状态" + inventoryStatus + "在" + locationcode + "库位中未查找到库存记录"); } else { return balanceDOList; } @@ -1051,16 +1051,16 @@ public class JobUtils { // balanceDO.getQty().subtract(countQtyExpectout) 扣减预计出数量 countQty = countQty.add(balanceDO.getQty().subtract(countQtyExpectout)); if (balanceDO.getLocationCode().isEmpty()) { - throw new UtilException("物品代码:" + balanceDO.getItemCode() + " 库存余额不足"); + throw new UtilException("物料代码:" + balanceDO.getItemCode() + " 库存余额不足"); } balanceDOListJob.add(balanceDO); - // 数据列表循环累加 直到总和大于等于当前物品的qty {countQty >= balanceDO.getQty()} + // 数据列表循环累加 直到总和大于等于当前物料的qty {countQty >= balanceDO.getQty()} if (countQty.compareTo(qty) != -1) { break; } } if (balanceDOListJob == null || balanceDOListJob.size() == 0) { - throw new UtilException("物品代码:" + itemCode + " 没有找到推荐的库存"); + throw new UtilException("物料代码:" + itemCode + " 没有找到推荐的库存"); } // 发料类型为按单件时 返回 库存余额数量 为需求数量 // 发料包装类型——按 包装 返回 当前库存余额数量 @@ -1081,7 +1081,7 @@ public class JobUtils { residueQty = residueQty.subtract(balanceDOListJob.get(i).getQty()); } } - // 合并 相同【物品】和【批次】和【库位】的 数量求和 + // 合并 相同【物料】和【批次】和【库位】的 数量求和 List balanceDOListRs = new ArrayList<>(); Map map = new HashMap<>(); for(BalanceDO balanceDOItem:balanceDOListJob ) { @@ -1115,7 +1115,7 @@ public class JobUtils { /** * bom拆解 - * @param itemCode 父物品代码 + * @param itemCode 父物料代码 * @param bomVersion bom版本 * @return */ @@ -1137,7 +1137,7 @@ public class JobUtils { bomExportReqVO.setAvailable("TRUE"); List bomDOList = bomService.getBomList(bomExportReqVO); bomDOList.forEach(item -> { - // 判断物品是否是虚零件 拆解BOM 子零件按照父零件版本进行查询 + // 判断物料是否是虚零件 拆解BOM 子零件按照父零件版本进行查询 if (itembasicService.selectItembasic(item.getComponentItemCode()).getIsPhantom().equals("TRUE")) { this.bomRecursion(item.getComponentItemCode(), item.getVersion(), list, item.getComponentQty().multiply(componentQty)); } else { @@ -1153,7 +1153,7 @@ public class JobUtils { /** * bom拆解 高级筛选 - * @param itemCode 父物品代码 + * @param itemCode 父物料代码 * @param bomVersion bom版本 * @return */ @@ -1174,7 +1174,7 @@ public class JobUtils { queryWrapper.eq("available","TRUE"); List bomDOList = bomMapper.selectList(queryWrapper); bomDOList.forEach(item -> { - // 判断物品是否是虚零件 拆解BOM 子零件按照父零件版本进行查询 + // 判断物料是否是虚零件 拆解BOM 子零件按照父零件版本进行查询 if (itembasicService.selectItembasic(item.getComponentItemCode()).getIsPhantom().equals("TRUE")) { this.bomRecursionSenior(item.getComponentItemCode(), item.getVersion(), list, item.getComponentQty().multiply(componentQty), new QueryWrapper()); } else {