opt: sorting交互优化,添加组盘订单,物料查询功能

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/sorting/service/impl/SortingServiceImpl.java

@@ -199,13 +199,14 @@ public class SortingServiceImpl implements SortingService {
     public List<ConnectorDto> getStructList(String jobName) {
         log.info("sorting查询组盘请求参数数据:{}", jobName);
         List<SchBaseVehiclematerialgroup> list = iSchBaseVehiclematerialgroupService.list(Wrappers.lambdaQuery(SchBaseVehiclematerialgroup.class)
-                .eq(SchBaseVehiclematerialgroup::getJob_name, jobName));
+                .eq(SchBaseVehiclematerialgroup::getJob_name, jobName)
+                .eq(SchBaseVehiclematerialgroup::getCreate_name,"Connector"));
         List<ConnectorDto> connectors = new ArrayList<>();
         for (SchBaseVehiclematerialgroup schBaseVehiclematerialgroup : list) {
             Gson gson = new Gson();
             ConnectorDto connectorDto = gson.fromJson(schBaseVehiclematerialgroup.getExtend(), ConnectorDto.class);
-            connectorDto.setDueDate(StrUtil.isNotEmpty(connectorDto.getDueDate()) ? connectorDto.getDueDate() : RegionEnum.TRUBEND_SHELVES_3_1_1.getRegion_code());
-            connectorDto.setNextOperation(StrUtil.isNotEmpty(connectorDto.getNextOperation()) ? connectorDto.getNextOperation() : DateUtil.now());
+            connectorDto.setDueDate(StrUtil.isNotEmpty(connectorDto.getDueDate()) ? connectorDto.getDueDate() : DateUtil.now() );
+            connectorDto.setNextOperation(StrUtil.isNotEmpty(connectorDto.getNextOperation()) ? connectorDto.getNextOperation() : RegionEnum.TRUBEND_SHELVES_3_1_1.getRegion_code());
             connectors.add(connectorDto);
         }
         log.info("sorting查询组盘响应参数:{}", JSONObject.toJSONString(connectors));

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

@@ -91,6 +91,12 @@
         <if test="query.region_code != null">
             AND vg.region_code = #{query.region_code}
         </if>
+        <if test="query.order_code != null">
+            AND vg.order_code like CONCAT('%', #{query.order_code}, '%')
+        </if>
+        <if test="query.material_id != null">
+            AND vg.material_id like CONCAT('%', #{query.material_id}, '%')
+        </if>
         )
         SELECT *
         FROM RankedVehicles

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

@@ -16,4 +16,6 @@ public class SchBaseVehiclematerialgroupQuery implements Serializable {
     private String workshop_code;
     private String region_code;
     private String job_name;
+    private String order_code;
+    private String material_id;
 }

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

@@ -75,6 +75,24 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
+          <el-form-item label="订单号">
+            <el-input
+              v-model="query.order_code"
+              clearable
+              style="width: 180px"
+              placeholder="订单号"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
+          <el-form-item label="物料号">
+            <el-input
+              v-model="query.material_id"
+              clearable
+              style="width: 180px"
+              placeholder="物料号"
+              @keyup.enter.native="crud.toQuery"
+            />
+          </el-form-item>
           <rrOperation />
         </el-form>
       </div>
@@ -239,7 +257,7 @@
             <el-select
               v-model="newTask.point_code2"
               size="mini"
-              placeholder="点位状态"
+              placeholder="目的地"
               class="filter-item"
               style="width: 240px;"
               clearable
@@ -292,13 +310,13 @@
         <el-table-column v-if="false" prop="update_name" label="修改人" :min-width="flexWidth('update_name',crud.data,'修改人')" />
         <el-table-column v-if="false" prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
-          <template slot-scope="scope">
+          <!-- <template slot-scope="scope">
             <udOperation
               :data="scope.row"
               :permission="permission"
             />
-          </template>
-          <!-- <template slot-scope="scope">
+          </template> -->
+          <template slot-scope="scope">
             <el-button
               v-if="!!scope.row.has_work && scope.row.theLocation != null"
               type="text"
@@ -307,7 +325,7 @@
             >
               创建任务
             </el-button>
-          </template> -->
+          </template>
         </el-table-column>
       </el-table>
       <!--分页组件-->
@@ -323,7 +341,7 @@ import crudSchBaseVehiclematerialgroup from './schBaseVehiclematerialgroup'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
+// import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import crudMdBaseWorkShop from '@/views/wms/basedata/workshop/mdBaseWorkshop'
 import MaterialDialog from '@/views/wms/sch/group/MaterialDialog.vue'
@@ -366,7 +384,7 @@ const defaultForm = {
 export default {
   name: 'VehicleMaterialGroup',
   dicts: ['group_status', 'group_bind_material_status'],
-  components: { WorkOrderDialog, MaterialDialog, pagination, crudOperation, rrOperation, udOperation },
+  components: { WorkOrderDialog, MaterialDialog, pagination, crudOperation, rrOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({