From 4f2e8b3e2fd811e31823156a17929bd4091be4e3 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Mon, 18 Sep 2023 10:12:12 +0800 Subject: [PATCH] =?UTF-8?q?add:=E5=8E=9F=E6=9D=90=E6=96=99=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QlTestInspectionsheetmstServiceImpl.java | 4 +- .../structIvt/StIvtStructivtYlController.java | 12 ++- .../impl/StIvtIostorinvYlServiceImpl.java | 1 + .../dao/mapper/xml/StIvtStructivtYlMapper.xml | 1 + .../src/main/resources/config/application.yml | 2 +- mes/qd/src/views/system/user/index.vue | 4 +- .../deviceFile/equipmentfile/ChangeDialog.vue | 2 +- .../deviceFile/equipmentfile/ViewDialog1.vue | 2 +- .../deviceFile/equipmentfile/ViewDialog2.vue | 2 +- .../device_manage/ios/embiin/AddDialog.vue | 2 +- .../device_manage/ios/embiout/AddDialog.vue | 2 +- .../devicelubricateplan/CopyAddDialog.vue | 2 +- .../repair/devicerepairpa/AddChangeDialog.vue | 2 +- .../repair/devicerepairpa/BomDialog.vue | 2 +- .../repair/devicerepairpa/ReceiveDialog.vue | 2 +- .../repair/devicerepairudit/ReceiveDialog.vue | 2 +- .../device_manage/repair/devicevprs/index.vue | 4 +- .../devicesportcheckplan/CopyAddDialog.vue | 2 +- .../devicemaintenanceplan/CopyAddDialog.vue | 2 +- .../em/devicefaultclass/index.vue | 6 +- .../em/devicelubricateitems/index.vue | 4 +- .../em/devicemaintain/index.vue | 6 +- .../em/devicerepairitems/index.vue | 4 +- .../em/devicesportcheckitems/index.vue | 4 +- .../master/class/UploadDialog.vue | 2 +- .../master/customer/UploadDialog.vue | 2 +- .../master/material/UploadDialog.vue | 2 +- .../semirealrawmaterial/UploadDialog.vue | 2 +- .../ql/productStandard/AddDialog.vue | 4 +- .../src/views/wms/pcs/purchaseplan/index.vue | 2 +- .../wms/pdm/base/productRoute/AddDialog.vue | 2 +- .../pdm/base/productRoute/UploadDialog.vue | 2 +- .../product_manage/workorder/UploadDialog.vue | 2 +- .../product/bucketRecord/UploadDialog.vue | 2 +- .../product/productIn/AddDialog.vue | 2 +- .../product/productIn/DivDialog.vue | 6 +- .../product/productIn/TaskDialog.vue | 2 +- .../product/productMoreOrless/AddDialog.vue | 4 +- .../product/productOut/AddIvt.vue | 2 +- .../product/productOut/DivDialog.vue | 2 +- .../product/productOut/TaskDialog.vue | 2 +- .../product/productOut/index.vue | 2 +- .../rawproduct/rawProductIn/AddDialog.vue | 6 +- .../rawproduct/rawProductIn/AddDtl.vue | 2 +- .../rawproduct/rawProductIn/ViewDialog.vue | 4 +- .../rawproduct/rawProductIvt/index.vue | 89 ++++++++++++++++++- .../rawproduct/rawProductIvt/productivt.js | 6 +- .../rawproduct/rawProductOut/AddDialog.vue | 2 +- .../rawproductmoreOrless/AddDialog.vue | 2 +- .../semiproduct/semiproductIn/index.vue | 2 +- .../semiproductMoreOrless/AddDialog.vue | 2 +- .../semiproductShutFrame/AddDialog.vue | 8 +- 52 files changed, 168 insertions(+), 75 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/impl/QlTestInspectionsheetmstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/impl/QlTestInspectionsheetmstServiceImpl.java index bd12848b..a1edc3fc 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/impl/QlTestInspectionsheetmstServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/quality_manage/service/report/impl/QlTestInspectionsheetmstServiceImpl.java @@ -134,8 +134,8 @@ public class QlTestInspectionsheetmstServiceImpl extends ServiceImpl @@ -72,5 +70,11 @@ public class StIvtStructivtYlController { public ResponseEntity getAllRawIvt(StructIvtYLQuery query, PageQuery page) { return new ResponseEntity<>(structivtYlService.getAllRawIvt(query, page), HttpStatus.OK); } + @GetMapping("/update") + @Log("更新原料库存") + //("查询原料库存") + public ResponseEntity update(@RequestBody JSONObject form) { + return new ResponseEntity<>(HttpStatus.OK); + } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvYlServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvYlServiceImpl.java index de36dd87..1a45c564 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvYlServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/rawmanage/service/iostorInv/impl/StIvtIostorinvYlServiceImpl.java @@ -161,6 +161,7 @@ public class StIvtIostorinvYlServiceImpl extends ServiceImpl + order by instorage_time desc