diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/PdaWashController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/PdaWashController.java index c4acc228..191a35e1 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/PdaWashController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pda/controller/PdaWashController.java @@ -180,7 +180,7 @@ public class PdaWashController { LIMIT_WEIGHT = Double.valueOf(one.getValue()); } if (sum>LIMIT_WEIGHT){ - throw new BadRequestException("选择的储料仓必物料总重量大于"+LIMIT_WEIGHT+"公斤"); + throw new BadRequestException("选择的储料仓物料总重量大于"+LIMIT_WEIGHT+"公斤"); } return list; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workprocedure/PdmBiWorkprocedureController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workprocedure/PdmBiWorkprocedureController.java index 6f962c33..f70fdc3d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workprocedure/PdmBiWorkprocedureController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workprocedure/PdmBiWorkprocedureController.java @@ -1,11 +1,9 @@ package org.nl.wms.product_manage.controller.workprocedure; -import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.TableDataInfo; @@ -21,7 +19,6 @@ import org.springframework.web.bind.annotation.*; import java.util.Arrays; import java.util.List; -import java.util.Map; /** *

@@ -76,8 +73,8 @@ public class PdmBiWorkprocedureController { @GetMapping("/downSelect") @Log("查询工序下拉列表") //("查询工序下拉列表") - public ResponseEntity downSelect() { - return new ResponseEntity<>(pdmBiWorkprocedureService.downSelect(), HttpStatus.OK); + public ResponseEntity downSelect(String product_area) { + return new ResponseEntity<>(pdmBiWorkprocedureService.downSelect(product_area), HttpStatus.OK); } @GetMapping("/queryWorkprocedure") @Log("查询生产工序")//仓储/清洗 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workprocedure/IPdmBiWorkprocedureService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workprocedure/IPdmBiWorkprocedureService.java index a36c17bb..7b3e003b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workprocedure/IPdmBiWorkprocedureService.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workprocedure/IPdmBiWorkprocedureService.java @@ -17,8 +17,9 @@ public interface IPdmBiWorkprocedureService extends IService /** * 查询工序 * @return + * @param product_area */ - JSONArray downSelect(); + JSONArray downSelect(String product_area); void create(JSONObject form); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workprocedure/impl/PdmBiWorkprocedureServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workprocedure/impl/PdmBiWorkprocedureServiceImpl.java index f2d1f078..b23507eb 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workprocedure/impl/PdmBiWorkprocedureServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workprocedure/impl/PdmBiWorkprocedureServiceImpl.java @@ -2,13 +2,12 @@ package org.nl.wms.product_manage.service.workprocedure.impl; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.commons.lang3.StringUtils; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.wms.product_manage.service.workprocedure.IPdmBiWorkprocedureService; @@ -30,8 +29,13 @@ import java.util.List; public class PdmBiWorkprocedureServiceImpl extends ServiceImpl implements IPdmBiWorkprocedureService { @Override - public JSONArray downSelect() { - List list = this.list(new QueryWrapper().eq("is_used", true).orderByDesc("workprocedure_code")); + public JSONArray downSelect(String product_area) { + QueryWrapper wrapper = new QueryWrapper<>(); + if (!StringUtils.isEmpty(product_area)){ + wrapper.eq("product_area",product_area); + } + wrapper.eq("is_used", true).orderByDesc("workprocedure_code"); + List list = this.list(wrapper); return new JSONArray(list); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/Engrave/EngraveTranSportTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/Engrave/EngraveTranSportTask.java index dab1fe80..f13201c1 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/Engrave/EngraveTranSportTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/extendtask/Engrave/EngraveTranSportTask.java @@ -95,11 +95,12 @@ public class EngraveTranSportTask extends AbstractAcsTask { String[] to_devices_array = {"0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0"}; String[] to_weight_array = {"0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0"}; int i=0; - for (Map.Entry entry : qtyArr.entrySet()) { - to_sort_array[i] = String.valueOf(i+1); - to_devices_array[i] = String.valueOf(entry.getKey()); - to_weight_array[i] = String.valueOf(new BigDecimal(entry.getValue()).intValue()); - i++; + List sort = qtyArr.keySet().stream().sorted(Comparator.comparingInt(key -> Integer.valueOf(key.substring(key.lastIndexOf("_") + 1)))).collect(Collectors.toList()); + for (int i1 = 0; i1 < sort.size(); i1++) { + String key = sort.get(i1); + to_sort_array[i] = String.valueOf(i1+1); + to_devices_array[i] = String.valueOf(key); + to_weight_array[i] = String.valueOf(new BigDecimal(qtyArr.get(key))); } jo.put("to_sort_array", Arrays.stream(to_sort_array).collect(Collectors.joining(","))); jo.put("to_devices_array",Arrays.stream(to_devices_array).collect(Collectors.joining(","))); @@ -120,6 +121,14 @@ public class EngraveTranSportTask extends AbstractAcsTask { return null; } + public static void main(String[] args) { + String a="{\"A1_KZ_14\":\"10000\",\"A1_KZ_07\":\"110000\",\"A1_KZ_11\":\"110000\",\"A1_KZ_03\":\"110000\"}"; + Map map = JSONObject.parseObject(a, Map.class); + Set set = map.keySet(); + List collect = set.stream().sorted(Comparator.comparingInt(key -> Integer.valueOf(key.substring(key.lastIndexOf("_") + 1)))).collect(Collectors.toList()); + System.out.println(collect.toString()); + } + private SchBaseTask packageTask(Integer canuse_qty, MdMeMaterialbase material, Map taskMap) { SchBaseTask baseTask = new SchBaseTask(); baseTask.setMaterial_id(material.getMaterial_id()); diff --git a/mes/qd/src/api/wms/basedata/pdm/workProcedure.js b/mes/qd/src/api/wms/basedata/pdm/workProcedure.js index bd745543..d9d044be 100644 --- a/mes/qd/src/api/wms/basedata/pdm/workProcedure.js +++ b/mes/qd/src/api/wms/basedata/pdm/workProcedure.js @@ -24,9 +24,11 @@ export function edit(data) { }) } -export function downSelect() { +export function downSelect(params) { return request({ - url: 'api/workProcedure/downSelect' + url: 'api/workProcedure/downSelect', + method: 'get', + params }) } diff --git a/mes/qd/src/views/wms/product_manage/workorder/index.vue b/mes/qd/src/views/wms/product_manage/workorder/index.vue index 97b489e3..4b5aa458 100644 --- a/mes/qd/src/views/wms/product_manage/workorder/index.vue +++ b/mes/qd/src/views/wms/product_manage/workorder/index.vue @@ -256,6 +256,7 @@ v-model="form.product_area" placeholder="" style="width: 200px" + @change="getworkprocedureByarea(form.product_area)" > - - - - - {{ item.label }} - + + + + + + + - + { + crudWorkProcedure.downSelect().then(res => { this.workprocedureList = res }) }, + getworkprocedureByarea(area) { + const params = { product_area: area } + crudWorkProcedure.downSelect(params).then(res => { + this.workprocedureListArea = res + }) + }, // 下发 submits(rows) { var orders = []