Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/api/docAsn/docAsn.js

@@ -77,3 +77,15 @@ export function queryDocAsnDetails(asnNo) {
   })
 }
 
+export function delDocAsnDetails(asnNo,asnLineNo) {
+  return request({
+    url: '/docAsn/docAsn/delDocAsnDetails',
+    method: 'post',
+    data: {
+      "asnNo": asnNo,
+      "asnLineNo": asnLineNo
+    }
+  })
+}
+
+

ruoyi-ui/src/api/docOrder/docOrder.js

@@ -75,3 +75,24 @@ export function initOrderDetails(orderNo) {
     method: 'get'
   })
 }
+
+// 新增入库单
+export function deleteOrderDetails(orderNo,orderLineNo) {
+  return request({
+    url: '/docOrder/docOrder/deleteOrderDetails',
+    method: 'post',
+    data: {
+      "orderNo": orderNo,
+      "orderLineNo": orderLineNo
+    }
+  })
+}
+
+// 新增入库单
+export function addDocOrderDetails(data) {
+  return request({
+    url: '/docOrder/docOrder/addDocOrderDetails',
+    method: 'post',
+    data: data
+  })
+}

ruoyi-ui/src/views/docAsn/docAsnDetails-add-or-update.vue

@@ -123,9 +123,9 @@
 
 <script>
   import {lotattConfigList} from "@/api/ams/config"
-  import {queryLocationZoneDict} from "@/api/base/locationZone"
   import {addDocAsnDetails} from "@/api/docAsn/docAsn"
   import SkuSearchDialog from '@/views/base/baseSku/skuSearchDialog'
+  import {queryLocationZoneDict} from "@/api/base/locationZone"
   import {queryLocationDict} from "@/api/base/locationInfo"
 
   export default {
@@ -193,10 +193,10 @@
             for (let i = 0; i < this.tableOption.length; i++) {
               this.dataForm['' + this.tableOption[i].lotattId] = this.tableOption[i].defaultValue
             }
-            console.log(this.dataForm)
             addDocAsnDetails(this.dataForm).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.visible = false
+              this.$emit('refreshDataList',this.dataForm.asnNo)
             });
           }
         });

ruoyi-ui/src/views/docAsn/docAsnDetails.vue

@@ -83,8 +83,8 @@
     />
     <div>
       <el-button type="primary" size="mini" @click="addOrUpdateHandle()">明细新增</el-button>
-      <el-button type="primary" size="mini" >明细编辑</el-button>
-      <el-button type="primary" size="mini" >明细删除</el-button>
+      <el-button type="primary" size="mini" @click="addOrUpdateHandle()">明细编辑</el-button>
+      <el-button type="primary" size="mini" @click="deleteHandle()">明细删除</el-button>
     </div>
     <!-- 弹窗, 新增 / 修改 -->
     <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
@@ -94,7 +94,8 @@
 <script>
   import AddOrUpdate from './docAsnDetails-add-or-update'
   import { lotattConfigList } from "@/api/ams/config"
-  import { queryDocAsnDetails } from "@/api/docAsn/docAsn"
+  import { queryDocAsnDetails,delDocAsn } from "@/api/docAsn/docAsn"
+  import {delDocAsnDetails} from "../../../api/docAsn/docAsn";
 
   export default {
     data () {
@@ -153,6 +154,21 @@
             this.tableOption.push(obj)
           }
         })
+      },
+      deleteHandle() {
+        if(this.dataListSelections && this.dataListSelections.length>0) {
+          for(let i= 0;i<this.dataListSelections.length;i++) {
+            let obj = this.dataListSelections[i]
+            delDocAsnDetails(obj.asnNo,obj.asnLineNo).then(response => {
+              if(response.code == 200) {
+                this.$modal.msgSuccess(response.msg);
+              } else {
+                this.$modal.msgError(response.msg);
+              }
+              this.getDataList(obj.asnNo)
+            });
+          }
+        }
       }
     }
   }

ruoyi-ui/src/views/docAsn/docAsnHeader-add-or-update.vue

@@ -88,8 +88,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="4" 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>
@@ -192,23 +192,13 @@
         });
       },
       dataFormHeadSubmit () {
-        if(this.id === '') {
-          addDocAsnHeader(this.dataFormHead).then(response => {
-            if(response.code == 200) {
-              this.$modal.msgSuccess(response.msg);
-            } else {
-              this.$modal.msgError(response.msg);
-            }
-          })
-        } else {
-          updateDocAsn(this.dataFormHead).then(response => {
-            if(response.code == 200) {
-              this.$modal.msgSuccess(response.msg);
-            } else {
-              this.$modal.msgError(response.msg);
-            }
-          })
-        }
+        addDocAsnHeader(this.dataFormHead).then(response => {
+          if(response.code == 200) {
+            this.$modal.msgSuccess(response.msg);
+          } else {
+            this.$modal.msgError(response.msg);
+          }
+        })
       }
     }
   }

ruoyi-ui/src/views/docOrder/docOrderDetails-add-or-update.vue

@@ -47,17 +47,27 @@
         </el-col>
         <el-col :span="8">
           <el-form-item label="指定库区" prop="pickZone">
-            <el-input v-model="dataForm.pickZone" placeholder=""></el-input>
+            <el-select v-model="dataForm.pickZone" @change="locationZoneChange" placeholder="请选择库区" clearable
+                       size="small" style="width: 100%">
+              <el-option
+                v-for="dict in this.locationZoneCombo"
+                :key="dict.zoneId"
+                :label="dict.zoneName"
+                :value="dict.zoneId"
+              />
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="指定库位" prop="location">
-            <el-input v-model="dataForm.location" placeholder=""></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="lotnum" prop="lotnum">
-            <el-input v-model="dataForm.lotnum" placeholder=""></el-input>
+            <el-select v-model="dataForm.location" placeholder="请选择库位" clearable size="small" style="width: 100%">
+              <el-option
+                v-for="dict in locationCombo"
+                :key="dict.id"
+                :label="dict.locationNo"
+                :value="dict.id"
+              ></el-option>
+            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
@@ -110,9 +120,12 @@
   import {lotattConfigList} from "@/api/ams/config"
   import {queryCustomerDict} from "@/api/base/customer"
   import SkuSearchDialog from '@/views/base/baseSku/skuSearchDialog'
+  import {queryLocationZoneDict} from "@/api/base/locationZone"
+  import {queryLocationDict} from "@/api/base/locationInfo"
+  import {addDocOrderDetails} from "@/api/docOrder/docOrder"
 
   export default {
-    dicts: ['sys_yes_no', 'ams_inv_quality', 'asn_status'],
+    dicts: ['sys_yes_no', 'ams_inv_quality', 'so_status'],
     data () {
       return {
         visible: false,
@@ -123,15 +136,16 @@
         dataForm: {
           orderNo: '',
           customerId: '',
-          orderStatus: '',
+          lineStatus: '00',
           sku: '',
           pickZone: '',
-          location: '',
-          lotnum: ''
+          location: ''
         },
         dataRule: {},
         tableOption: [],
-        customerIdCombo: []
+        customerIdCombo: [],
+        locationCombo: [],
+        locationZoneCombo: []
       }
     },
     components: {
@@ -140,16 +154,25 @@
     methods: {
       init (id) {
         this.id = id
+        this.dataForm.orderNo = id
         this.initData()
         this.visible = true
         this.$nextTick(() => {
-
+            //查询明细
         })
       },
       // 表单提交
       dataFormSubmit () {
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
+            for (let i = 0; i < this.tableOption.length; i++) {
+              this.dataForm['' + this.tableOption[i].lotattId] = this.tableOption[i].defaultValue
+            }
+            addDocOrderDetails(this.dataForm).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.visible = false
+              this.$emit('refreshDataList',this.dataForm.orderNo)
+            });
           }
         })
       },
@@ -162,6 +185,10 @@
         lotattConfigList().then(response => {
           this.tableOption = response.data
         })
+
+        queryLocationZoneDict().then(response => {
+          this.locationZoneCombo = response.data
+        })
       },
       showHidden() {
         this.attShowFlag = !this.attShowFlag
@@ -175,6 +202,15 @@
       afterChoseSku: function (userName, value) {
         this.dataForm.sku = value
       },
+      locationZoneChange: function (value) {
+        let param = 0
+        if (value != '') {
+          param = value
+        }
+        queryLocationDict(param).then(response => {
+          this.locationCombo = response.data
+        })
+      }
     }
   }
 </script>

ruoyi-ui/src/views/docOrder/docOrderDetails.vue

@@ -66,8 +66,8 @@
     />
     <div>
       <el-button type="primary" size="mini" @click="addOrUpdateHandle()">明细新增</el-button>
-      <el-button type="primary" size="mini" >明细编辑</el-button>
-      <el-button type="primary" size="mini" >明细删除</el-button>
+      <el-button type="primary" size="mini" @click="deleteHandle()" >明细编辑</el-button>
+      <el-button type="primary" size="mini" @click="addOrUpdateHandle()" >明细删除</el-button>
     </div>
     <!-- 弹窗, 新增 / 修改 -->
     <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
@@ -77,7 +77,7 @@
 <script>
   import AddOrUpdate from './docOrderDetails-add-or-update'
   import { lotattConfigList } from "@/api/ams/config"
-  import { initOrderDetails } from "@/api/docOrder/docOrder"
+  import { initOrderDetails,deleteOrderDetails } from "@/api/docOrder/docOrder"
 
   export default {
     dicts: ['so_status', 'so_type'],
@@ -109,6 +109,7 @@
     methods: {
       // 获取数据列表
       getDataList (orderNo) {
+        console.log("----------------------->"+orderNo)
         this.initLotatt()
         if (orderNo) {
           this.dataForm.orderNo = orderNo
@@ -135,6 +136,21 @@
             this.tableOption.push(obj)
           }
         })
+      },
+      deleteHandle() {
+        if(this.dataListSelections && this.dataListSelections.length>0) {
+          for(let i= 0;i<this.dataListSelections.length;i++) {
+            let obj = this.dataListSelections[i]
+            deleteOrderDetails(obj.ordeNo,obj.orderLineNo).then(response => {
+              if(response.code == 200) {
+                this.$modal.msgSuccess(response.msg);
+              } else {
+                this.$modal.msgError(response.msg);
+              }
+              this.getDataList(obj.ordeNo)
+            });
+          }
+        }
       }
     }
   }

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

@@ -110,7 +110,6 @@
         });
       },
       init (id) {
-        console.log(id)
         this.initData()
         this.visible = true
         this.$nextTick(() => {
@@ -124,8 +123,9 @@
               this.dataFormHead.soReference1 = orderHeader.soReference1
               this.dataFormHead.soReference2 = orderHeader.soReference2
               this.dataFormHead.soReference3 = orderHeader.soReference3
-              this.dataFormHead.customerId = parseInt(orderHeader.customerId)
-              console.log(this.dataFormHead.orderNo)
+              if(orderHeader.customerId && orderHeader.customerId != '') {
+                this.dataFormHead.customerId = parseInt(orderHeader.customerId)
+              }
               this.$refs.orderDetails.getDataList(this.dataFormHead.orderNo)
             } else {
               this.$modal.msgError(response.msg);

ruoyi-ui/src/views/docOrder/index.vue

@@ -156,7 +156,7 @@
       @pagination="getList"
     />
 
-    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList=""></add-or-update>
+    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getList"></add-or-update>
   </div>
 </template>