From 44ed1da408e83c6d2cfe51ea218307bc94b55a8f Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Sun, 25 Jun 2023 14:56:13 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E8=B4=A8=E6=A3=80=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchase/dao/PcsIfPurchaseorder.java      |  8 +-
 .../impl/PcsIfPurchaseorderServiceImpl.java   |  6 +-
 .../wms/ql_manage/physicalMst/Dialog1.vue     |  2 +-
 .../ql_manage/physicalMst/RelevancyDialog.vue |  5 +-
 .../views/wms/ql_manage/physicalMst/index.vue |  9 +-
 .../wms/ql_manage/physicalMst/physicalMst.js  | 99 +++++++++++++++++++
 6 files changed, 113 insertions(+), 16 deletions(-)
 create mode 100644 mes/qd/src/views/wms/ql_manage/physicalMst/physicalMst.js

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/PcsIfPurchaseorder.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/PcsIfPurchaseorder.java
index 56e68611..62ea37e6 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/PcsIfPurchaseorder.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/dao/PcsIfPurchaseorder.java
@@ -114,7 +114,7 @@ public class PcsIfPurchaseorder implements Serializable {
     /**
      * 提交人
      */
-    private String audit_optid;
+    private String audit_id;
 
     /**
      * 提交时间
@@ -124,17 +124,17 @@ public class PcsIfPurchaseorder implements Serializable {
     /**
      * 提交人姓名
      */
-    private String audit_optname;
+    private String audit_name;
 
     /**
      * 确认人
      */
-    private String confirm_optid;
+    private String confirm_id;
 
     /**
      * 确认人姓名
      */
-    private String confirm_optname;
+    private String confirm_name;
 
     /**
      * 确认时间
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/impl/PcsIfPurchaseorderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/impl/PcsIfPurchaseorderServiceImpl.java
index d5d9c380..3ecb2e97 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/impl/PcsIfPurchaseorderServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pcs_manage/service/purchase/impl/PcsIfPurchaseorderServiceImpl.java
@@ -60,15 +60,15 @@ public class PcsIfPurchaseorderServiceImpl extends ServiceImpl<PcsIfPurchaseorde
         }
         PcsIfPurchaseorder purchaseorder = this.getOne(new QueryWrapper<PcsIfPurchaseorder>().eq("po_code", po_code));
 
-        if (purchaseorder.getSTATUS().equals(PCSEnum.BILL_STATUS.code("确认"))) {
+        if (purchaseorder.getSTATUS().equals(PCSEnum.BILL_STATUS.code("完成"))) {
             throw new BadRequestException("当前单据状态已经完成，无法进行入库数修改！");
         }
 
         BigDecimal new_instor_qty = NumberUtil.add(instor_qty, purchaseorder.getInstor_qty(), 3);
         if (purchaseorder.getTotal_qty().compareTo(new_instor_qty) <= 0) {
             purchaseorder.setSTATUS(PCSEnum.BILL_STATUS.code("完成"));
-            purchaseorder.setConfirm_optid(SecurityUtils.getCurrentUserId());
-            purchaseorder.setConfirm_optname(SecurityUtils.getCurrentNickName());
+            purchaseorder.setConfirm_id(SecurityUtils.getCurrentUserId());
+            purchaseorder.setConfirm_name(SecurityUtils.getCurrentNickName());
             purchaseorder.setConfirm_time(DateUtil.now());
         } else {
             purchaseorder.setSTATUS(PCSEnum.BILL_STATUS.code("到货中"));
diff --git a/mes/qd/src/views/wms/ql_manage/physicalMst/Dialog1.vue b/mes/qd/src/views/wms/ql_manage/physicalMst/Dialog1.vue
index 8ca0f248..4486e7b3 100644
--- a/mes/qd/src/views/wms/ql_manage/physicalMst/Dialog1.vue
+++ b/mes/qd/src/views/wms/ql_manage/physicalMst/Dialog1.vue
@@ -326,7 +326,7 @@
 <script>
 import CRUD, { crud } from '@crud/crud'
 import MaterDtl from '@/views/wms/pub/MaterDialog'
-import crudPhysicalMst from '@/api/wms/ql/physicalMst'
+import crudPhysicalMst from '@/views/wms/ql_manage/physicalMst'
 
 export default {
   name: 'Dialog1',
diff --git a/mes/qd/src/views/wms/ql_manage/physicalMst/RelevancyDialog.vue b/mes/qd/src/views/wms/ql_manage/physicalMst/RelevancyDialog.vue
index a775f7fe..476e05b4 100644
--- a/mes/qd/src/views/wms/ql_manage/physicalMst/RelevancyDialog.vue
+++ b/mes/qd/src/views/wms/ql_manage/physicalMst/RelevancyDialog.vue
@@ -137,12 +137,11 @@
 </template>
 
 <script>
-import crudPhysicalMst from '@/api/wms/ql/physicalMst'
+import crudPhysicalMst from '@/views/wms/ql_manage/physicalMst/physicalMst'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
-import crudInspectionsheetmst from '@/api/wms/ql/inspectionsheetmst'
 import DateRangePicker from '@/components/DateRangePicker'
 
 const defaultForm = {
@@ -201,7 +200,7 @@ export default {
     }
   },
   created() {
-    crudInspectionsheetmst.getStatus().then(res => {
+    crudPhysicalMst.getStatus().then(res => {
       this.statusList = res
     })
   },
diff --git a/mes/qd/src/views/wms/ql_manage/physicalMst/index.vue b/mes/qd/src/views/wms/ql_manage/physicalMst/index.vue
index 970f6b45..048d3db4 100644
--- a/mes/qd/src/views/wms/ql_manage/physicalMst/index.vue
+++ b/mes/qd/src/views/wms/ql_manage/physicalMst/index.vue
@@ -225,7 +225,7 @@
 </template>
 
 <script>
-import crudPhysicalMst from '@/api/wms/ql/physicalMst'
+import crudPhysicalMst from '@/views/wms/ql_manage/physicalMst/physicalMst'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
@@ -233,9 +233,8 @@ import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import MaterDtl from '@/views/wms/pub/MaterDialog'
 import Dialog1 from './Dialog1'
-import crudInspectionsheetmst from '@/api/wms/ql/inspectionsheetmst'
 import DateRangePicker from '@/components/DateRangePicker'
-import RelevancyDialog from '@/views/wms/ql/physicalMst/RelevancyDialog'
+import RelevancyDialog from '@/views/wms/ql_manage/physicalMst/RelevancyDialog'
 
 const defaultForm = {
   inspection_id: null,
@@ -294,10 +293,10 @@ export default {
     }
   },
   created() {
-    crudInspectionsheetmst.getStatus().then(res => {
+    crudPhysicalMst.getStatus().then(res => {
       this.statusList = res
     })
-    crudInspectionsheetmst.getMaterialType().then(res => {
+    crudPhysicalMst.getMaterialType().then(res => {
       this.materialType = res
     })
   },
diff --git a/mes/qd/src/views/wms/ql_manage/physicalMst/physicalMst.js b/mes/qd/src/views/wms/ql_manage/physicalMst/physicalMst.js
new file mode 100644
index 00000000..7c543433
--- /dev/null
+++ b/mes/qd/src/views/wms/ql_manage/physicalMst/physicalMst.js
@@ -0,0 +1,99 @@
+import request from '@/utils/request'
+
+export function add(data) {
+  return request({
+    url: 'api/physicalMst',
+    method: 'post',
+    data
+  })
+}
+
+export function del(ids) {
+  return request({
+    url: 'api/physicalMst/',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function edit(data) {
+  return request({
+    url: 'api/physicalMst',
+    method: 'put',
+    data
+  })
+}
+
+export function getResult(data) {
+  return request({
+    url: 'api/physicalMst/getResult',
+    method: 'post',
+    data
+  })
+}
+
+export function saveResult(data) {
+  return request({
+    url: 'api/physicalMst/saveResult',
+    method: 'post',
+    data
+  })
+}
+
+export function confirm(data) {
+  return request({
+    url: 'api/physicalMst/confirm',
+    method: 'put',
+    data
+  })
+}
+
+export function setValid(data) {
+  return request({
+    url: 'api/physicalMst/setValid',
+    method: 'put',
+    data
+  })
+}
+
+export function copyAdd(data) {
+  return request({
+    url: 'api/physicalMst/copyAdd',
+    method: 'post',
+    data
+  })
+}
+
+export function isMaterType(data) {
+  return request({
+    url: 'api/physicalMst/isMaterType',
+    method: 'post',
+    data
+  })
+}
+
+export function hpySync(data) {
+  return request({
+    url: 'api/physicalMst/hpySync',
+    method: 'post',
+    data
+  })
+}
+
+export function getMaterialType(data) {
+  return request({
+    url: 'api/physicalMst/hpySync',
+    method: 'post',
+    data
+  })
+}
+
+export function getStatus(data) {
+  return request({
+    url: 'api/physicalMst/hpySync',
+    method: 'post',
+    data
+  })
+}
+
+export default { add, edit, del, getResult, saveResult, confirm, setValid, copyAdd, isMaterType, getStatus, getMaterialType }