opt:入库接口和工单接口查询页面优化

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

@@ -18,4 +18,6 @@ public class MaterialQuery implements Serializable {
     private String supplierCode;
     //绑定状态
     private String group_bind_material_status;
+    //绑定状态
+    private String return_status;
 }

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/material/service/impl/MaterialServiceImpl.java

@@ -35,7 +35,9 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> i
         wrapper.like(StringUtils.isNotBlank(whereJson.getProductName()),Material::getProductName,whereJson.getProductName());
         wrapper.like(StringUtils.isNotBlank(whereJson.getSupplierCode()),Material::getSupplierCode,whereJson.getSupplierCode());
         wrapper.like(StringUtils.isNotBlank(whereJson.getProductDescription()),Material::getProductDescription,whereJson.getProductDescription());
-        wrapper.like(StringUtils.isNotBlank(whereJson.getGroup_bind_material_status()),Material::getGroup_bind_material_status,whereJson.getGroup_bind_material_status());
+        wrapper.eq(StringUtils.isNotBlank(whereJson.getGroup_bind_material_status()),Material::getGroup_bind_material_status,whereJson.getGroup_bind_material_status());
+        wrapper.eq(StringUtils.isNotBlank(whereJson.getReturn_status()),Material::getReturn_status,whereJson.getReturn_status());
+        wrapper.orderByDesc(Material::getCreate_time);
         pages = materialMapper.selectPage(pages, wrapper);
         return pages;
     }

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/YCLCKTask.java

@@ -330,17 +330,6 @@ public class YCLCKTask extends AbstractTask {
                             .execute().body();
                     log.info("QPMES065服务调用成功，反馈{}",resultMsg);
                     JSONObject result = JSONObject.parseObject(resultMsg);
-                    String Code = result.getString("Code");
-                    if(ObjectUtil.isNotEmpty(Code) && "0".equals(Code)){
-                        //更新接口表
-                        LambdaUpdateWrapper<Material> updateWrapper = new  LambdaUpdateWrapper<>();
-                        updateWrapper.eq(Material::getPalletSN,taskObj.getVehicle_code2());
-                        updateWrapper.eq(Material::getGroup_bind_material_status,GroupBindMaterialStatusEnum.BOUND.getValue());
-                        //回传状态为0的
-                        updateWrapper.eq(Material::getReturn_status,"1");
-                        updateWrapper.set(Material::getReturn_status,"2");
-                        materialMapper.update(null,updateWrapper);
-                    }
                     String code = result.getString("code");
                     if(ObjectUtil.isNotEmpty(code) && "0".equals(code)){
                         //更新接口表

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/impl/WorkorderServiceImpl.java

@@ -69,7 +69,8 @@ public class WorkorderServiceImpl extends ServiceImpl<WorkorderMapper, Workorder
         wrapper.like(StringUtils.isNotBlank(whereJson.getProductName()), Workorder::getProductName,whereJson.getProductName());
         wrapper.like(StringUtils.isNotBlank(whereJson.getSupplierCode()), Workorder::getSupplierCode,whereJson.getSupplierCode());
         wrapper.like(StringUtils.isNotBlank(whereJson.getProductDescription()), Workorder::getProductDescription,whereJson.getProductDescription());
-        wrapper.like(StringUtils.isNotBlank(whereJson.getStatus()), Workorder::getStatus,whereJson.getStatus());
+        wrapper.eq(StringUtils.isNotBlank(whereJson.getStatus()), Workorder::getStatus,whereJson.getStatus());
+        wrapper.orderByDesc(Workorder::getCreateTime);
         pages = workorderMapper.selectPage(pages, wrapper);
         return pages;
     }

lms/nladmin-ui/src/views/wms/pdm/workerordertwo/index.vue

@@ -28,11 +28,11 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item label="托号">
+          <el-form-item label="托盘号">
             <el-input
               v-model="query.palletSN"
               clearable
-              placeholder="托号"
+              placeholder="托盘号"
               class="filter-item"
               @keyup.enter.native="crud.toQuery"
             />
@@ -46,6 +46,22 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
+          <el-form-item label="工单状态">
+            <el-select
+              v-model="query.status"
+              clearable
+              size="mini"
+              placeholder="全部"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.work_order_two_status"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <rrOperation />
         </el-form>
       </div>
@@ -66,28 +82,18 @@
         <el-table-column prop="lotSN" label="晶棒号" :min-width="flexWidth('lotSN',crud.data,'晶棒号')" />
         <el-table-column prop="productName" label="物料编码" :min-width="flexWidth('productName',crud.data,'物料编码')" />
         <el-table-column prop="productDescription" label="物料描述" :min-width="flexWidth('productDescription',crud.data,'物料描述')" />
+        <el-table-column prop="status" label="工单状态" :formatter="format_work_order_two_status" :min-width="flexWidth('status',crud.data,'工单状态')" />
         <el-table-column prop="supplierCode" label="客户编码" :min-width="flexWidth('supplierCode',crud.data,'客户编码')" />
         <el-table-column prop="supplierName" label="客户名称" :min-width="flexWidth('supplierName',crud.data,'客户名称')" />
-        <el-table-column prop="createTime" label="创建日期" width="150">
+        <el-table-column prop="createTime" label="创建日期" :min-width="150">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.createTime) }}</span>
           </template>
         </el-table-column>
-        <el-table-column v-permission="[]" label="操作" width="70px" align="center" fixed="right">
-          <template slot-scope="scope">
-            <el-button
-              type="text"
-              icon="el-icon-add"
-              :disabled="scope.row.status=='1'"
-              @click="doOperate(scope.row)"
-            >工单出库</el-button>
-          </template>
-        </el-table-column>
       </el-table>
       <!--分页组件-->
       <pagination />
     </div>
-    <PointDetailDialog :dialog-show.sync="pointDetailDialog" :workorder_code="workorder_code" :productname="productname" />
   </div>
 </template>
 
@@ -97,18 +103,18 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
-import PointDetailDialog from '@/views/wms/pdm/workerordertwo/PointDetailDialog.vue'
 
 export default {
-  name: 'Workorder',
+  name: 'Workordertwo',
-  components: { PointDetailDialog, pagination, crudOperation, rrOperation, udOperation },
+  dicts: ['work_order_two_status'],
+  components: { pagination, crudOperation, rrOperation, udOperation },
   mixins: [presenter(), header(), crud()],
   cruds() {
     return CRUD({
       title: '晶棒工单管理',
       url: 'api/workorder',
       idField: 'workorder_id',
-      sort: 'workorder_id,desc',
+      sort: '',
       optShow: {
         add: false,
         edit: false,
@@ -122,16 +128,7 @@ export default {
     return {
       permission: {},
       rules: {
-      },
+      }
-      queryTypeOptions: [
-        { key: 'workorder_code', display_name: '工单编号' },
-        { key: 'point_code', display_name: '设备编码' }
-      ],
-      workorder_code: '',
-      productname: '',
-      pointList: [],
-      pointDetailDialog: false,
-      message: null
     }
   },
   created() {
@@ -141,11 +138,9 @@ export default {
     [CRUD.HOOK.beforeRefresh]() {
       return true
     },
-    doOperate(row) {
+    format_work_order_two_status(row, column) {
-      this.workorder_code = row.moname
+      return this.dict.label.work_order_two_status[row.status]
-      this.productname = row.productName
+    },
-      this.pointDetailDialog = true
-    }
   }
 }
 </script>

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

@@ -62,7 +62,7 @@
               size="mini"
               placeholder="绑定状态"
               class="filter-item"
-              @change="hand"
+              @change="crud.toQuery"
             >
               <el-option
                 v-for="item in dict.group_bind_material_status"
@@ -71,6 +71,22 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="回传状态">
+            <el-select
+              v-model="query.return_status"
+              clearable
+              size="mini"
+              placeholder="全部"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.return_status"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <rrOperation />
         </el-form>
       </div>
@@ -95,11 +111,16 @@
         <el-table-column prop="incomingLength" label="来料长度" :min-width="flexWidth('incomingLength',crud.data,'来料长度')" />
         <el-table-column prop="incomingWeight" label="来料重量" :min-width="flexWidth('incomingWeight',crud.data,'来料重量')" />
         <el-table-column prop="incomingchipping" label="来料缺陷长度" :min-width="flexWidth('incomingchipping',crud.data,'来料缺陷长度')" />
-        <el-table-column prop="group_bind_material_status" label="绑定状态" :min-width="flexWidth('group_bind_material_status',crud.data,'回温开始时间')">
+        <el-table-column prop="group_bind_material_status" label="绑定状态" :min-width="flexWidth('group_bind_material_status',crud.data,'绑定状态')">
           <template slot-scope="scope">
             {{ dict.label.group_bind_material_status[scope.row.group_bind_material_status] }}
           </template>
         </el-table-column>
+        <el-table-column prop="return_status" label="回传状态" :min-width="100">
+          <template slot-scope="scope">
+            {{ dict.label.return_status[scope.row.return_status] }}
+          </template>
+        </el-table-column>
         <el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
       </el-table>
       <!--分页组件-->
@@ -117,7 +138,7 @@ import pagination from '@crud/Pagination'
 
 export default {
   name: 'Material',
-  dicts: ['group_bind_material_status'],
+  dicts: ['group_bind_material_status','return_status'],
   components: { pagination, crudOperation, rrOperation, udOperation },
   mixins: [presenter(), header(), crud()],
   cruds() {
@@ -125,7 +146,7 @@ export default {
       title: '原材料入库管理',
       url: 'api/material',
       idField: 'group_id',
-      sort: 'vehicle_code,desc',
+      sort: '',
       optShow: {
         add: false,
         edit: false,
@@ -153,9 +174,6 @@ export default {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
     [CRUD.HOOK.beforeRefresh]() {
       return true
-    },
-    hand(value) {
-      this.crud.toQuery()
     }
   }
 }