fix

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/fold_disc_site/FoldDiscSiteDeviceDriver.java

@@ -117,9 +117,9 @@ public class FoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implements
                 json.put("device_code",device_code);
                 json.put("type",1);
                 acsToWmsService.notify(json);
-                if (number == max_emptypalletnum) {
-                    this.requireSucess = false;
-                }
+            }
+            if(mode!=last_mode && mode==8){
+                this.requireSucess=false;
             }
 
         } catch (Exception var17) {
@@ -154,6 +154,8 @@ public class FoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implements
                     log.debug("设备运转模式:等待工作");
                     break;
                 case 2:
+                    break;
+                case 8:
                     if (!this.requireSucess) {
                             this.shipDeviceUpdate();
                     }
@@ -214,6 +216,7 @@ public class FoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implements
             if (StrUtil.equals(res_jo.getString("code"), "200")) {
                 log.info("叠盘位堆叠数量满自动申请搬运任务成功！");
                 this.requireSucess = true;
+                this.writing(8);
             }
         }
     }

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml

@@ -21,6 +21,9 @@
         <if test="query.group_bind_material_status != null">
             AND vg.group_bind_material_status = #{query.group_bind_material_status}
         </if>
+        <if test="query.material_id != null">
+            AND vg.material_id = #{query.material_id}
+        </if>
         <if test="query.region_code != null">
             AND vg.point_code IN (
                 SELECT p.point_code

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dto/SchBaseVehiclematerialgroupQuery.java

@@ -15,5 +15,6 @@ public class SchBaseVehiclematerialgroupQuery implements Serializable {
     private String vehicle_code;
     private String workshop_code;
     private String region_code;
+    private String material_id;
     private String group_bind_material_status;
 }

lms/nladmin-ui/src/views/wms/sch/group/index.vue

@@ -47,6 +47,15 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
+          <el-form-item label="物料编码">
+            <el-input
+              v-model="query.material_id"
+              clearable
+              size="mini"
+              placeholder="物料编码"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
           <el-form-item label="绑定状态">
             <el-select
               v-model="query.group_bind_material_status"
@@ -239,6 +248,8 @@
             {{ scope.row.is_full?'是':'否' }}
           </template>
         </el-table-column>-->
+        
+        <el-table-column prop="material_id" label="物料编码" show-overflow-tooltip :min-width="flexWidth('material_id',crud.data,'物料编码')" />
         <el-table-column prop="pcsn" label="批次" :min-width="flexWidth('pcsn',crud.data,'批次')" />
         <el-table-column prop="workorder_code" label="工单编码" :min-width="flexWidth('workorder_code',crud.data,'工单编码')" />
         <el-table-column prop="instorage_time" label="回温开始时间" :min-width="flexWidth('instorage_time',crud.data,'入库时间')" />
@@ -248,10 +259,9 @@
           </template>
         </el-table-column>
         <el-table-column prop="standing_time" label="回温时间(小时)" :min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')" />
-        <!--<el-table-column prop="material_name" label="物料名称" show-overflow-tooltip :min-width="flexWidth('material_qty',crud.data,'物料数量')" />
-        <el-table-column prop="material_code" label="物料编码" show-overflow-tooltip :min-width="flexWidth('material_qty',crud.data,'物料数量')" />
+        <!-- <el-table-column prop="material_code" label="物料编码" show-overflow-tooltip :min-width="flexWidth('material_qty',crud.data,'物料数量')" />
         <el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_qty',crud.data,'物料数量')" />
-        <el-table-column prop="material_qty" label="物料数量" :min-width="flexWidth('material_qty',crud.data,'物料数量')" />-->
+        <el-table-column prop="material_qty" label="物料数量" :min-width="flexWidth('material_qty',crud.data,'物料数量')" /> -->
         <el-table-column prop="material_weight" label="物料重量" :min-width="flexWidth('material_weight',crud.data,'物料重量')" />
         <el-table-column prop="group_number" label="组盘次数" :min-width="flexWidth('group_number',crud.data,'组盘次数')" />
         <el-table-column prop="task_code" label="任务编码" :min-width="flexWidth('task_code',crud.data,'任务编码')" />