bug修复

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

@@ -82,9 +82,9 @@
       @pagination="getDataList"
     />
     <div>
-      <el-button type="primary" size="mini" @click="addOrUpdateHandle()">明细新增</el-button>
-      <el-button type="primary" size="mini" @click="addOrUpdateHandle()">明细编辑</el-button>
-      <el-button type="primary" size="mini" @click="deleteHandle()">明细删除</el-button>
+      <el-button type="primary" size="mini" :disabled="viewTag" @click="addOrUpdateHandle()">明细新增</el-button>
+      <el-button type="primary" size="mini" :disabled="viewTag" @click="addOrUpdateHandle()">明细编辑</el-button>
+      <el-button type="primary" size="mini" :disabled="viewTag" @click="deleteHandle()">明细删除</el-button>
     </div>
     <!-- 弹窗, 新增 / 修改 -->
     <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
@@ -111,7 +111,8 @@
         dataListLoading: false,
         dataListSelections: [],
         addOrUpdateVisible: false,
-        tableOption: []
+        tableOption: [],
+        viewTag: false
       }
     },
     mounted () {
@@ -125,7 +126,8 @@
     },
     methods: {
       // 获取数据列表
-      getDataList (asnNo) {
+      getDataList (asnNo, viewTag) {
+        this.viewTag = viewTag
         this.queryParams.asnNo = asnNo
         this.initLotatt()
         queryDocAsnDetails(asnNo).then(response => {

ruoyi-ui/src/views/wms/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" @click="dataFormHeadSubmit()">提交</el-button>
-            <el-button size="mini" type="primary" @click="dataFormHeadSubmit()">修改</el-button>
+            <el-button size="mini" type="primary" :disabled="viewTag" @click="dataFormHeadSubmit()">提交</el-button>
+            <el-button size="mini" type="primary" :disabled="viewTag" @click="dataFormHeadSubmit()">修改</el-button>
           </el-col>
         </el-row>
       </el-form>
@@ -150,14 +150,16 @@
         asnStatusCombo: [],
         asnTypeCombo: [],
         customerIdCombo: [],
-        supplierCombo: []
+        supplierCombo: [],
+        viewTag: false //是否只读
       }
     },
     components: {
       AsnDetails
     },
     methods: {
-      init (id) {
+      init (id, viewTag) {
+        this.viewTag = viewTag
         this.initData()
         this.visible = true
         this.$nextTick(() => {
@@ -175,7 +177,7 @@
               this.dataFormHead.supplierId = parseInt(asnHeader.supplierId) ? parseInt(asnHeader.supplierId) : ''
               this.dataFormHead.customerId = parseInt(asnHeader.customerId) ? parseInt(asnHeader.customerId) : ''
               this.dataFormHead.notes = asnHeader.notes
-              this.$refs.asnDetails.getDataList(this.dataFormHead.asnNo)
+              this.$refs.asnDetails.getDataList(this.dataFormHead.asnNo, viewTag)
             } else {
               this.$modal.msgError(response.msg);
             }

ruoyi-ui/src/views/wms/docAsn/index.vue

@@ -129,6 +129,12 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleView(scope.row)"
+          >查看</el-button>
           <el-button
             size="mini"
             type="text"
@@ -438,6 +444,12 @@ export default {
         this.getList();
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
+    },
+    handleView(row) {
+      console.log('---->')
+      console.log(row)
+      this.addOrUpdateVisible = true
+      this.$refs.addOrUpdate.init(row.asnNo, true)
     }
   }
 };

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

@@ -66,9 +66,9 @@
       @pagination="getDataList"
     />
     <div>
-      <el-button type="primary" size="mini" @click="addOrUpdateHandle()">明细新增</el-button>
-      <el-button type="primary" size="mini" @click="addOrUpdateHandle()" >明细编辑</el-button>
-      <el-button type="primary" size="mini" @click="deleteHandle()" >明细删除</el-button>
+      <el-button type="primary" size="mini" :disabled="viewTag" @click="addOrUpdateHandle()">明细新增</el-button>
+      <el-button type="primary" size="mini" :disabled="viewTag" @click="addOrUpdateHandle()" >明细编辑</el-button>
+      <el-button type="primary" size="mini" :disabled="viewTag" @click="deleteHandle()" >明细删除</el-button>
     </div>
     <!-- 弹窗, 新增 / 修改 -->
     <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
@@ -97,7 +97,8 @@
         dataListLoading: false,
         dataListSelections: [],
         tableOption: [],
-        addOrUpdateVisible: false
+        addOrUpdateVisible: false,
+        viewTag: false
       }
     },
     mounted () {
@@ -109,7 +110,8 @@
     },
     methods: {
       // 获取数据列表
-      getDataList (orderNo) {
+      getDataList (orderNo,viewTag) {
+        this.viewTag = viewTag
         this.initLotatt()
         if (orderNo) {
           this.dataForm.orderNo = orderNo

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

@@ -69,8 +69,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="6" style="text-align: right;">
-            <el-button size="mini" type="primary" :disabled="addDisable" @click="dataFormHeadSubmit()">提交</el-button>
-            <el-button size="mini" type="primary" @click="dataFormHeadSubmit()">修改</el-button>
+            <el-button size="mini" type="primary" :disabled="viewTag" @click="dataFormHeadSubmit()">提交</el-button>
+            <el-button size="mini" type="primary" :disabled="viewTag" @click="dataFormHeadSubmit()">修改</el-button>
           </el-col>
         </el-row>
       </el-form>
@@ -110,7 +110,8 @@
         },
         activeTap: 'orderDetails',
         customerIdCombo: [],
-        addDisable: false
+        addDisable: false,
+        viewTag: false
       }
     },
     components: {
@@ -122,7 +123,8 @@
           this.customerIdCombo = response.data;
         });
       },
-      init (id) {
+      init (id, viewTag) {
+        this.viewTag = viewTag
         this.initData()
         this.visible = true
         this.$nextTick(() => {
@@ -139,7 +141,7 @@
               if(orderHeader.customerId && orderHeader.customerId != '') {
                 this.dataFormHead.customerId = parseInt(orderHeader.customerId)
               }
-              this.$refs.orderDetails.getDataList(this.dataFormHead.orderNo)
+              this.$refs.orderDetails.getDataList(this.dataFormHead.orderNo,this.viewTag)
             } else {
               this.$modal.msgError(response.msg);
             }

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

@@ -65,7 +65,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['docOrder:docOrder:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <!--<el-col :span="1.5">
         <el-button
@@ -103,8 +104,8 @@
     </el-row>
 
     <el-table v-loading="loading" :data="docOrderList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="出库单号" align="center" prop="orderNo" />
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="出库单号" align="center" prop="orderNo"/>
       <!--<el-table-column label="货主代码" align="center" prop="customerId" />-->
       <el-table-column label="单据状态" align="center" prop="orderStatus">
         <template slot-scope="scope">
@@ -116,15 +117,22 @@
           <dict-tag :options="dict.type.so_type" :value="scope.row.orderType"/>
         </template>
       </el-table-column>
-      <el-table-column label="客户单号1" align="center" prop="soReference1" />
-      <el-table-column label="客户单号2" align="center" prop="soReference2" />
-      <el-table-column label="客户单号3" align="center" prop="soReference3" />
-      <el-table-column label="创建时间" align="center" prop="createTime" />
-      <el-table-column label="创建人" align="center" prop="createBy" />
+      <el-table-column label="客户单号1" align="center" prop="soReference1"/>
+      <el-table-column label="客户单号2" align="center" prop="soReference2"/>
+      <el-table-column label="客户单号3" align="center" prop="soReference3"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"/>
+      <el-table-column label="创建人" align="center" prop="createBy"/>
       <!--<el-table-column label="单据操作优先级" align="center" prop="priority" />-->
       <!--<el-table-column label="收货单位名称" align="center" prop="consigneeName" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-view"
+            @click="handleView(scope.row)"
+          >查看
+          </el-button>
           <el-button
             size="mini"
             type="text"
@@ -132,7 +140,8 @@
             @click="handleUpdate(scope.row)"
             v-if="scope.row.orderStatus != '99'"
             v-hasPermi="['docOrder:docOrder:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
@@ -140,14 +149,16 @@
             v-if="scope.row.orderStatus === '00' || scope.row.orderStatus === '10'"
             @click="doAllocation(scope.row)"
             v-hasPermi="['docOrder:docOrder:edit']"
-          >分配</el-button>
+          >分配
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['docOrder:docOrder:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
           <el-button
             size="mini"
             type="text"
@@ -155,7 +166,8 @@
             v-if="scope.row.orderStatus != '99' && scope.row.orderStatus != '00'"
             @click="handleCancel(scope.row)"
             v-hasPermi="['docOrder:docOrder:cancel']"
-          >取消</el-button>
+          >取消
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -167,13 +179,20 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
     <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getList"></add-or-update>
   </div>
 </template>
 
 <script>
-import { listDocOrder, getDocOrder, delDocOrder, addDocOrder, updateDocOrder, doAllocation, doCancel } from "@/api/docOrder/docOrder";
+import {
+  listDocOrder,
+  getDocOrder,
+  delDocOrder,
+  addDocOrder,
+  updateDocOrder,
+  doAllocation,
+  doCancel
+} from "@/api/docOrder/docOrder";
 import AddOrUpdate from './docOrderHeader-add-or-update'
 
 export default {
@@ -219,8 +238,7 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
-      }
+      rules: {}
     };
   },
   components: {
@@ -313,7 +331,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.orderNo)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -355,12 +373,13 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const orderNos = row.orderNo || this.ids;
-      this.$modal.confirm('是否确认删除出库单头编号为"' + orderNos + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除出库单头编号为"' + orderNos + '"的数据项？').then(function () {
         return delDocOrder(orderNos);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => {
+      });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -371,20 +390,28 @@ export default {
     doAllocation(row) {
       let obj = {}
       obj.orderNo = row.orderNo
-      this.$modal.confirm('是否确认要进行分配库存').then(function() {
+      this.$modal.confirm('是否确认要进行分配库存').then(function () {
         return doAllocation(obj);
       }).then((data) => {
         this.getList();
         this.$modal.msgSuccess(data.msg);
-      }).catch(() => {});
+      }).catch(() => {
+      });
     },
     handleCancel(row) {
-      this.$modal.confirm('确定要进行取消操作').then(function() {
+      this.$modal.confirm('确定要进行取消操作').then(function () {
         return doCancel(row.orderNo);
       }).then((data) => {
         this.getList();
         this.$modal.msgSuccess(data.msg);
-      }).catch(() => {});
+      }).catch(() => {
+      });
+    },
+    handleView(row) {
+      this.addOrUpdateVisible = true
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.init(row.orderNo, true)
+      })
     }
   }
 };

warewms-ams/src/main/java/com/ruoyi/ams/asn/service/impl/WmsDocAsnHeaderServiceImpl.java

@@ -292,6 +292,7 @@ public class WmsDocAsnHeaderServiceImpl implements IWmsDocAsnHeaderService {
             wmsBoxInfo.setLocationId(Long.parseLong(STAGE01));
             wmsBoxInfo.setUpdateBy(loginUser.getUsername());
             wmsBoxInfo.setUpdateTime(new Date());
+            wmsBoxInfo.setIsFull(stockForm.getFullTag());
             wmsBoxInfo.setIsEmpty("N");
             boxInfoService.updateWmsBoxInfo(wmsBoxInfo);
         }