diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java index 847697f4..9527822f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java @@ -100,6 +100,15 @@ public class AcsToWmsController { return new ResponseEntity<>(HttpStatus.OK); } + @PostMapping("/feedDeviceQty2") + @ApiOperation("反馈深坑数量") + @SaIgnore + @Log("反馈深坑数量") + public ResponseEntity feedDeviceRealQty2(@RequestBody Map param) { + acsToWmsService.feedDevQty(param); + return new ResponseEntity<>(HttpStatus.OK); + } + @PostMapping("/feedCacheLineBarcodes") @Log("向wms反馈缓存载具信息") @ApiOperation("向wms反馈缓存载具信息") diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 7055b90f..2e198fc8 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -41,6 +41,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import javax.annotation.Resource; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.math.BigDecimal; @@ -257,14 +258,17 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{ @Override @Async public void feedDevQty(Map param) { - WQLObject deviceTab = WQLObject.getWQLObject("pdm_bi_device"); if (CollectionUtils.isEmpty(param)){ return; } + log.info("反馈设备数量接口:{}", JSONObject.toJSONString(param)); Iterator iterator = param.keySet().iterator(); while (iterator.hasNext()){ String deviceCode = (String)iterator.next(); if (!StringUtils.isEmpty(deviceCode)){ + if (deviceCode.contains("SKQX")){ + continue; + } Map item = (Map)param.get(deviceCode); Object qty = item.get("qty"); Object weight = item.get("weight"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/AgvBigScreenController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/AgvBigScreenController.java index c3b8b341..91c4e64b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/AgvBigScreenController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/AgvBigScreenController.java @@ -30,14 +30,12 @@ public class AgvBigScreenController { private final AgvBigScreenService agvBigScreenService; @PostMapping("/getTask") - @Log("查询任务") @ApiOperation("查询任务") public ResponseEntity getData(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(agvBigScreenService.getTask(whereJson), HttpStatus.OK); } @PostMapping("/getAgvMsg") - @Log("查询车辆信息") @ApiOperation("查询车辆信息") public ResponseEntity getAgvMsg(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(agvBigScreenService.getAgvMsg(whereJson), HttpStatus.OK); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/BigScreenController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/BigScreenController.java index 8a0540ff..27e350ea 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/BigScreenController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/BigScreenController.java @@ -29,20 +29,17 @@ import java.util.Map; public class BigScreenController { private final BigScreenService bigScreenService; @PostMapping("/zk") - @Log("查询中控室监控大屏") @ApiOperation("查询中控室监控大屏") public ResponseEntity getData(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(bigScreenService.getData(whereJson), HttpStatus.OK); } @PostMapping("/query3Dcartoon") - @Log("查询三维动画大屏") @ApiOperation("查询三维动画大屏") public ResponseEntity query3Dcartoon(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(bigScreenService.query3Dcartoon(whereJson), HttpStatus.OK); } @PostMapping("/workScreen") - @Log("查询工序看板") @ApiOperation("查询工序看板") public ResponseEntity workScreen(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(bigScreenService.workScreen(whereJson), HttpStatus.OK); @@ -50,14 +47,12 @@ public class BigScreenController { @GetMapping("/queryInfo") - @Log("查询中控室监控大屏手动设置数据") @ApiOperation("查询中控室监控大屏手动设置数据") public ResponseEntity queryInfo(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(bigScreenService.queryInfo(whereJson,page), HttpStatus.OK); } @PostMapping("/add") - @Log("手动添加监控大屏数据") @ApiOperation("手动添加监控大屏数据") public ResponseEntity add(@RequestBody JSONObject param) throws Exception { bigScreenService.add(param); @@ -66,7 +61,6 @@ public class BigScreenController { @PutMapping("/edit") - @Log("手动修改监控大屏数据") @ApiOperation("手动修改监控大屏数据") public ResponseEntity edit(@RequestBody JSONObject param) throws Exception { bigScreenService.edit(param); @@ -74,7 +68,6 @@ public class BigScreenController { } @DeleteMapping("/del") - @Log("手动删除监控大屏数据") @ApiOperation("手动删除监控大屏数据") public ResponseEntity del(@RequestBody Long[] ids) throws Exception { bigScreenService.del(ids); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/DeviceScreenController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/DeviceScreenController.java index dd3ea843..c7a6a530 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/DeviceScreenController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/DeviceScreenController.java @@ -25,28 +25,24 @@ public class DeviceScreenController { private final DeviceScreenService deviceScreenService; @PostMapping("/deviceStatus") - @Log("设备实时状态") @ApiOperation("设备实时状态") public ResponseEntity getData(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(deviceScreenService.deviceStatus(whereJson), HttpStatus.OK); } @PostMapping("/oeeAndTeep") - @Log("设备综合效率OEE&产能利用效率TEEP") @ApiOperation("设备综合效率OEE&产能利用效率TEEP") public ResponseEntity oeeAndTeep(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(deviceScreenService.oeeAndTeep(whereJson), HttpStatus.OK); } @PostMapping("/queryDeviceByWork") - @Log("运行设备大类产能比") @ApiOperation("运行设备大类产能比") public ResponseEntity queryDeviceByWork(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(deviceScreenService.queryDeviceByWork(whereJson), HttpStatus.OK); } @PostMapping("/deviceErrorNum") - @Log("设备TOP10故障次数") @ApiOperation("设备TOP10故障次数") public ResponseEntity deviceErrorNum(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(deviceScreenService.deviceErrorNum(whereJson), HttpStatus.OK); @@ -60,35 +56,30 @@ public class DeviceScreenController { } @PostMapping("/deviceCensus") - @Log("设备综合统计") @ApiOperation("设备综合统计") public ResponseEntity deviceCensus(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(deviceScreenService.deviceCensus(whereJson), HttpStatus.OK); } @PostMapping("/deviceErrorInfo") - @Log("设备报警信息") @ApiOperation("设备报警信息") public ResponseEntity deviceErrorInfo(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(deviceScreenService.deviceErrorInfo(whereJson), HttpStatus.OK); } @PostMapping("/deviceUseRate") - @Log("设备产能利用") @ApiOperation("设备产能利用") public ResponseEntity deviceUseRate(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(deviceScreenService.deviceUseRate(whereJson), HttpStatus.OK); } @PostMapping("/deviceStatusList") - @Log("设备状态列表") @ApiOperation("设备状态列表") public ResponseEntity deviceStatusList(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(deviceScreenService.deviceStatusList(whereJson), HttpStatus.OK); } @PostMapping("/errCensus") - @Log("近30天设备故障统计") @ApiOperation("近30天设备故障统计") public ResponseEntity errCensus(@RequestBody JSONObject whereJson) { return new ResponseEntity<>(deviceScreenService.errCensus(whereJson), HttpStatus.OK); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/ProductController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/ProductController.java index c30d21a1..8669419a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/ProductController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/rest/ProductController.java @@ -29,55 +29,47 @@ import java.util.Map; @RequestMapping("/api/bigscreen/product") @SaIgnore @Slf4j -public class ProductController { +public class ProductController { private final ProductService pdaBindingService; @PostMapping("/planReached") - @Log("计划达成") @ApiOperation("计划达成") public ResponseEntity planReached(@RequestBody Map param) { return new ResponseEntity<>(pdaBindingService.planReached(param), HttpStatus.OK); } @PostMapping("/productSchedule") - @Log("今日排产生产进度跟踪") @ApiOperation("今日排产生产进度跟踪") public ResponseEntity productSchedule(@RequestBody Map param) { return new ResponseEntity<>(pdaBindingService.productSchedule(param), HttpStatus.OK); } @PostMapping("/output") - @Log("今日产量") @ApiOperation("今日产量") public ResponseEntity output(@RequestBody Map param) { return new ResponseEntity<>(pdaBindingService.output(param), HttpStatus.OK); } @PostMapping("/worksectionHarvest") - @Log("近一周工段产量") @ApiOperation("近一周工段产量") public ResponseEntity worksectionHarvest(@RequestBody Map param) { return new ResponseEntity<>(pdaBindingService.worksectionHarvest(param), HttpStatus.OK); } @PostMapping("/topHarvest") - @Log("今日Top10产量") @ApiOperation("今日Top10产量") public ResponseEntity topHarvest(@RequestBody Map param) { return new ResponseEntity<>(pdaBindingService.topHarvest(param), HttpStatus.OK); } @PostMapping("/monthHarvest") - @Log("30天产量走势") - @ApiOperation("30天产量走势") + @ApiOperation("30天产量走势") public ResponseEntity monthHarvest(@RequestBody Map param) { return new ResponseEntity<>(pdaBindingService.monthHarvest(param), HttpStatus.OK); } @PostMapping("/unfinishOrder") - @Log("今日未完成订单") @ApiOperation("今日未完成订单") public ResponseEntity unfinishOrder(@RequestBody Map param) { return new ResponseEntity<>(pdaBindingService.unfinishOrder(param), HttpStatus.OK); } @PostMapping("/monthOrder") - @Log("30天生产订单分布") @ApiOperation("30天生产订单分布") public ResponseEntity monthOrder(@RequestBody Map param) { return new ResponseEntity<>(pdaBindingService.monthOrder(param), HttpStatus.OK); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/SpecialDeviceController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/SpecialDeviceController.java index 159e64c8..0873e11b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/SpecialDeviceController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/device/SpecialDeviceController.java @@ -72,6 +72,7 @@ public class SpecialDeviceController { iDeviceService.update(new UpdateWrapper() .set("material_id",query.getString("material_id")) .set("deviceinstor_qty",query.getBigDecimal("deviceinstor_qty")) + .set("deviceinstor_weight",query.getBigDecimal("deviceinstor_weight")) .eq("device_code",device_code)); } return new ResponseEntity<>(HttpStatus.OK); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java index b5cf33bd..e81e0302 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/PdmProduceWorkorderController.java @@ -146,15 +146,27 @@ public class PdmProduceWorkorderController { @PostMapping("/reportQuery") - @Log("报工数修改") + @Log("一体机报工数修改") @ApiOperation("报工数修改") @SaIgnore public ResponseEntity reportQuery(@RequestBody ReportQuery param) { + if (!SecurityUtils.getCurrentUserId().equals("1")){ + param.setUser_id(SecurityUtils.getCurrentUserId()); + } + return new ResponseEntity<>(TableDataInfo.build(iPdmProduceWorkorderService.reportQuery(param)),HttpStatus.OK); + } + + @PostMapping("/reportQuery2") + @Log("报工数修改") + @ApiOperation("报工数修改") + @SaIgnore + public ResponseEntity reportQuery2(@RequestBody ReportQuery param) { return new ResponseEntity<>(TableDataInfo.build(iPdmProduceWorkorderService.reportQuery(param)),HttpStatus.OK); } + } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java index 62a79b47..25dee9b7 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/workorder/ProduceshiftorderController.java @@ -77,6 +77,9 @@ public class ProduceshiftorderController{ if(null == param) { throw new BizCoreException(ResultCode.VALIDATE_FAILED); } + if (!SecurityUtils.getCurrentUserId().equals("1")){ + param.put("optuser",SecurityUtils.getCurrentUserId()); + } List list = iPdmProduceWorkorderService.getOrderList(param, page); return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK); } @@ -91,7 +94,9 @@ public class ProduceshiftorderController{ } /** @see org.nl.common.enums.WorkerOrderEnum */ param.put("workorder_status","'2','3','4'"); - param.put("optuser",SecurityUtils.getCurrentUserId()); + if (!SecurityUtils.getCurrentUserId().equals("1")){ + param.put("optuser",SecurityUtils.getCurrentUserId()); + } List list = iPdmProduceWorkorderService.getOrderList(param, page); return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java index a429274c..c3a1ea7a 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeEmpTask.java @@ -113,6 +113,7 @@ public class SpeEmpTask extends AbstractAcsTask { "","product_area",one.getProduct_area(),"quantity", param.getString("quantity"),"type",AcsTaskEnum.TASK_CACHELINE_OUT.getCode(),"material_id", one.getMaterial_id())); String taskId = IdUtil.getStringId(); JSONObject task = packageParam(form, taskId); + task.put("table_fk_id",param.getString("workorder_code")); taskService.save(task.toJavaObject(SchBaseTask.class)); return taskId; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java index 4d1925b6..e118633d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/tasks/SpeMachinery/SpeFullTask.java @@ -108,9 +108,9 @@ public class SpeFullTask extends AbstractAcsTask { JSONObject form = new JSONObject(MapOf.of("start_point_code",point_code, "next_point_code","","return_point_code", empPoint.getString("point_code"),"vehicle_code", "","product_area",order.getProduct_area(),"quantity", quantity,"type",AcsTaskEnum.TASK_PRODUCT_MAC.getCode(),"material_id", order.getMaterial_id())); - String taskId = IdUtil.getStringId(); JSONObject task = packageParam(form, taskId); + task.put("table_fk_id",param.getString("workorder_code")); taskService.save(task.toJavaObject(SchBaseTask.class)); return taskId; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/wql/QSCH_TASK_01.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/wql/QSCH_TASK_01.wql index 7eaa46ef..cb9520f5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/wql/QSCH_TASK_01.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/sch/wql/QSCH_TASK_01.wql @@ -52,6 +52,9 @@ PAGEQUERY SELECT task.*, + mb.material_name, + mb.material_spec, + mb.material_code, md.class_name task_type_name, DICT.label task_status_name, reg1.region_name as point1_region_name, @@ -61,6 +64,7 @@ FROM sch_base_task task LEFT JOIN md_pb_classstandard md ON task.task_type = md.class_code + left join md_me_materialbase mb on mb.material_id = task.material_id LEFT JOIN SYS_DICT DICT ON DICT.`VALUE` = TASK.TASK_STATUS AND DICT.`CODE` = 'TASK_STATUS' LEFT JOIN SCH_BASE_Region reg1 ON reg1.region_code = ( SELECT p1.region_code FROM SCH_BASE_Point p1 WHERE p1.point_code = task.point_code1 diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.xml index 72d62b99..df9d90ee 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.xml @@ -33,25 +33,23 @@ and (pdm_bi_device.material_id = #{material_id} or pdm_bi_device.material_id is null or pdm_bi_device.material_id = '') - - and (pdm_bi_device.spec = #{spec} or pdm_bi_device.spec is null) - GROUP BY pdm_bi_device.device_code HAVING currentQty > #{qty} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dto/ReportQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dto/ReportQuery.java index 58993dec..02e621f7 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dto/ReportQuery.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dto/ReportQuery.java @@ -22,6 +22,7 @@ public class ReportQuery { private String report; private String start_time; private String end_time; + private String user_id; private Boolean is_report =false; private String report_status; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java index 290d582a..c498872c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java @@ -69,6 +69,7 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.util.*; import java.util.function.Predicate; +import java.util.regex.Pattern; import java.util.stream.Collectors; /** @@ -210,7 +211,7 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl result = wmsToAcsService.orderStatusUpdate(array); if (!HttpStatus.OK.equals(result.get("status"))) { @@ -250,7 +251,8 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl data = new ArrayList<>(); - row: + Map errorMap = new HashMap(); + row: for (int i = 0; i < read.size(); i++) { List list = read.get(i); if (ObjectUtil.isEmpty(list)) { @@ -275,7 +277,6 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl errorMap = new HashMap(); for (int j = 0; j < list.size(); j++) { String col = String.valueOf(list.get(j)); 解析cell:{ //如果是第一行 为生产日期 @@ -302,7 +303,9 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl first = material_specs.stream().filter(mdMeMaterialbase -> mdMeMaterialbase.getMaterial_code().contains("S") && !mdMeMaterialbase.getMaterial_code().contains("TH")).findFirst(); + Optional first = material_specs.stream().filter(mdMeMaterialbase -> mdMeMaterialbase.getMaterial_code().contains("S") + && Pattern.matches("^[0-9]*$", mdMeMaterialbase.getMaterial_name().substring(mdMeMaterialbase.getMaterial_name().length() - 1)) + ).findFirst(); if (!first.isPresent()) { errorMap.put("第" + i + "行" + col, "物料规格对应物料信息不存在"); } @@ -452,6 +455,12 @@ public class IPdmProduceWorkorderServiceImpl extends ServiceImpl + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue b/mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue index 6605f899..0f1a3a2f 100644 --- a/mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue +++ b/mes/qd/src/views/wms/device_manage/deviceMaterial/index.vue @@ -64,11 +64,11 @@ - + - + diff --git a/mes/qd/src/views/wms/product_manage/workorder/produceshiftorder.js b/mes/qd/src/views/wms/product_manage/workorder/produceshiftorder.js index 8f36e8bd..af73563c 100644 --- a/mes/qd/src/views/wms/product_manage/workorder/produceshiftorder.js +++ b/mes/qd/src/views/wms/product_manage/workorder/produceshiftorder.js @@ -105,7 +105,7 @@ export function getReportWork(data) { export function reportQuery(data) { return request({ - url: '/api/produceWorkorder/reportQuery', + url: '/api/produceWorkorder/reportQuery2', method: 'post', data }) diff --git a/mes/qd/src/views/wms/scheduler_manage/task/index.vue b/mes/qd/src/views/wms/scheduler_manage/task/index.vue index 3b962ae6..eec68927 100644 --- a/mes/qd/src/views/wms/scheduler_manage/task/index.vue +++ b/mes/qd/src/views/wms/scheduler_manage/task/index.vue @@ -109,7 +109,7 @@ + + + @@ -144,13 +151,14 @@ @selection-change="crud.selectionChangeHandler" > + + - @@ -273,6 +281,7 @@ export default { fullscreen: false, currentComponent: '', openParam: {}, + undo: 0, create_time: [], task_status: ['-1'], taskStatusList: [],