From 9a16d8be8575ba316c686a7cf9d1a4401622ca5f Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Fri, 5 Jul 2024 09:48:10 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../handler/decisioner/impl/base/FIFORuleHandler.java     | 2 +-
 .../task/handler/impl/GroupDickInStorageTask.java         | 2 +-
 wms_pro/qd/src/views/wms/base_manage/struct/index.vue     | 2 +-
 .../views/wms/stor_manage/warehouse/pick/TaskDialog.vue   | 8 +++-----
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/base/FIFORuleHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/base/FIFORuleHandler.java
index 17f50d52..ac1a9d5f 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/base/FIFORuleHandler.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/decisioner/impl/base/FIFORuleHandler.java
@@ -59,7 +59,7 @@ public class FIFORuleHandler extends Decisioner<StructattrVechielDto, JSONObject
                 , "order_by", "ABS(qty-#{plan_qty}) asc,update_time asc")
         );
         int finalPlan_qty = plan_qty;
-        vechielDtos.sort(Comparator.comparingInt(o -> (o.getQty().intValue() - finalPlan_qty)));
+//        vechielDtos.sort(Comparator.comparingInt(o -> (o.getQty().intValue() - finalPlan_qty)));
         List<String> need = list.stream().map(StructattrVechielDto::getVehicle_code).collect(Collectors.toList());
 
         List<StructattrVechielDto> disList = new ArrayList<>();
diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/GroupDickInStorageTask.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/GroupDickInStorageTask.java
index 30e40dd2..982058b3 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/GroupDickInStorageTask.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/GroupDickInStorageTask.java
@@ -65,7 +65,7 @@ public  class GroupDickInStorageTask extends AbstractTask {
             if (StringUtils.isEmpty(point_code1)){
                 throw new BadRequestException("申请任务失败:请求参数数据异常");
             }
-            MdGruopDick mst = iMdGruopDickService.getOne(new QueryWrapper<MdGruopDick>().eq("vehicle_code", vehicle_code).lt("status", StatusEnum.FORM_STATUS.code("完成")));
+            MdGruopDick mst = iMdGruopDickService.getOne(new QueryWrapper<MdGruopDick>().eq("vehicle_code", vehicle_code).le("status", StatusEnum.FORM_STATUS.code("完成")));
             if (mst == null){
                 throw new BadRequestException("申请任务失败:载具"+vehicle_code+"组盘信息不存在");
             }
diff --git a/wms_pro/qd/src/views/wms/base_manage/struct/index.vue b/wms_pro/qd/src/views/wms/base_manage/struct/index.vue
index 79b33183..cb5a2191 100644
--- a/wms_pro/qd/src/views/wms/base_manage/struct/index.vue
+++ b/wms_pro/qd/src/views/wms/base_manage/struct/index.vue
@@ -101,7 +101,7 @@
           </el-row>
           <el-row :gutter="20">
             <el-col :span="12">
-              <<el-form-item label="归属库区" prop="sect_name">
+              <el-form-item label="归属库区" prop="sect_name">
               <el-input v-model="form.sect_name" style="width: 200px;" />
             </el-form-item>
             </el-col>
diff --git a/wms_pro/qd/src/views/wms/stor_manage/warehouse/pick/TaskDialog.vue b/wms_pro/qd/src/views/wms/stor_manage/warehouse/pick/TaskDialog.vue
index 5554cc31..5cba333d 100644
--- a/wms_pro/qd/src/views/wms/stor_manage/warehouse/pick/TaskDialog.vue
+++ b/wms_pro/qd/src/views/wms/stor_manage/warehouse/pick/TaskDialog.vue
@@ -191,7 +191,7 @@
         <el-table-column width="130" show-overflow-tooltip v-for="(item, index) in disCols" :key="item.value"
                          :label="item.lable">
           <template slot-scope="scope">
-            <el-switch v-if="item.value == 'is_artificial'"
+            <el-switch v-if="item.value == 'is_artificiality'"
               v-model="tabledis[scope.$index].form_data[item.value]"
               active-color="#409EFF"
               inactive-color="#F56C6C"
@@ -351,9 +351,7 @@ export default {
       dtl.source_form_id = this.currentDtl.id
       dtl.source_form_date = this.currentDtl.create_time
       dtl.parent_id = this.currentDtl.id
-      debugger
-      dtl.form_data = this.disFormData
-
+      dtl.form_data = JSON.parse(JSON.stringify(this.disFormData))
       this.tabledis.push(dtl)
     },
     subRow(index){
@@ -441,7 +439,7 @@ export default {
   padding: 10px 0px 0px 20px;
 }
 .crud-opts-right2  {
-  padding-left: 77%;
+  padding-left: 89%;
 }
 
 .input-with-select {