Ver Fonte

出库单修改

andy há 3 anos atrás
pai
commit
25d058226b

+ 12 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/order/WmsDocOrderHeaderController.java

@@ -133,4 +133,16 @@ public class WmsDocOrderHeaderController extends BaseController
         }
         return AjaxResult.success("",orderHeader);
     }
+
+    @PreAuthorize("@ss.hasPermi('docOrder:docOrder:add')")
+    @Log(title = "新增出库单表头", businessType = BusinessType.INSERT)
+    @PostMapping("/addDocOrderHeader")
+    public AjaxResult addDocOrderHeader(@RequestBody WmsDocOrderHeader wmsDocOrderHeader){
+        LoginUser loginUser = getLoginUser();
+        wmsDocOrderHeader.setAddTime(new Date());
+        wmsDocOrderHeader.setAddWho(loginUser.getUsername());
+        wmsDocOrderHeader.setCreateBy(loginUser.getUsername());
+        wmsDocOrderHeader.setCreateTime(new Date());
+        return toAjax(wmsDocOrderHeaderService.insertWmsDocOrderHeader(wmsDocOrderHeader));
+    }
 }

+ 9 - 0
ruoyi-ui/src/api/docOrder/docOrder.js

@@ -50,3 +50,12 @@ export function initOrderHeader(orderNo) {
     method: 'get'
   })
 }
+
+// 新增入库单
+export function addDocOrderHeader(data) {
+  return request({
+    url: '/docOrder/docOrder/addDocOrderHeader',
+    method: 'post',
+    data: data
+  })
+}

+ 21 - 5
ruoyi-ui/src/views/docOrder/docOrderHeader-add-or-update.vue

@@ -57,8 +57,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6" style="text-align: right;">
-            <el-button size="mini" type="primary" :disabled=" id !== '' ? true : false" @click="dataFormHeadSubmit()">提交</el-button>
-            <el-button size="mini" type="primary" :disabled=" id === '' ? true : false" @click="dataFormHeadSubmit()">修改</el-button>
+            <el-button size="mini" type="primary" @click="dataFormHeadSubmit()">提交</el-button>
+            <el-button size="mini" type="primary" @click="dataFormHeadSubmit()">修改</el-button>
           </el-col>
         </el-row>
       </el-form>
@@ -74,7 +74,7 @@
 </template>
 
 <script>
-  import { initOrderHeader } from '@/api/docOrder/docOrder'
+  import { initOrderHeader, addDocOrderHeader } from '@/api/docOrder/docOrder'
   import OrderDetails from './docOrderDetails'
   import {queryCustomerDict} from "@/api/base/customer";
 
@@ -117,7 +117,6 @@
           initOrderHeader(id).then(response => {
             if(response.code == 200) {
               let orderHeader = response.data;
-              this.id = orderHeader.orderNo
               this.dataFormHead.orderNo = orderHeader.orderNo
               this.dataFormHead.orderType = orderHeader.orderType
               this.dataFormHead.orderStatus = orderHeader.orderStatus
@@ -125,7 +124,7 @@
               this.dataFormHead.soReference1 = orderHeader.soReference1
               this.dataFormHead.soReference2 = orderHeader.soReference2
               this.dataFormHead.soReference3 = orderHeader.soReference3
-              this.dataFormHead.customerId
+              this.dataFormHead.customerId = parseInt(orderHeader.customerId)
               console.log(this.dataFormHead.orderNo)
               this.$refs.orderDetails.getDataList(this.dataFormHead.orderNo)
             } else {
@@ -136,6 +135,23 @@
       },
       // 表单提交
       dataFormHeadSubmit () {
+        if(this.id === '') {
+          addDocOrderHeader(this.dataFormHead).then(response => {
+            if(response.code == 200) {
+              this.$modal.msgSuccess(response.msg);
+            } else {
+              this.$modal.msgError(response.msg);
+            }
+          })
+        } else {
+          addDocOrderHeader(this.dataFormHead).then(response => {
+            if(response.code == 200) {
+              this.$modal.msgSuccess(response.msg);
+            } else {
+              this.$modal.msgError(response.msg);
+            }
+          })
+        }
       }
     }
   }

+ 4 - 6
ruoyi-ui/src/views/docOrder/index.vue

@@ -308,12 +308,10 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const orderNo = row.orderNo || this.ids
-      getDocOrder(orderNo).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改出库单头";
-      });
+      this.addOrUpdateVisible = true
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.init(row.orderNo)
+      })
     },
     /** 提交按钮 */
     submitForm() {

+ 1 - 0
warewms-ams/src/main/java/com/ruoyi/ams/order/service/impl/WmsDocOrderHeaderServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ruoyi.ams.order.service.impl;
 
+import java.util.Date;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;