From 2698f6c8973c33ca677ce3d98590a9f177bfcb2b Mon Sep 17 00:00:00 2001 From: zhangzq Date: Tue, 23 Jan 2024 13:48:54 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"rev:=E6=B5=B7=E6=9F=94=E5=8D=8A?= =?UTF-8?q?=E6=88=90=E5=93=81=E5=BA=93=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 32afb67a --- .../java/org/nl/common/enums/AcsTaskEnum.java | 1 - .../java/org/nl/common/utils/AcsUtil.java | 10 +-- .../main/java/org/nl/config/DruidFilter.java | 5 +- .../acs/service/impl/AcsToWmsServiceImpl.java | 2 +- .../acs/service/impl/WmsToAcsServiceImpl.java | 7 +- .../dao/mapper/MdMeMaterialbaseMapper.xml | 3 - .../MdPbStoragevehicleinfoServiceImpl.java | 6 -- .../task/impl/SchBaseTaskServiceImpl.java | 10 +-- .../controller/PdaStHrBcpOrderController.java | 69 ------------------- .../pda/service/dto/PdaQuery.java | 1 - .../impl/PdaStHrBcpEmpOutServiceImpl.java | 2 +- .../service/impl/PdaStHrBcpInServiceImpl.java | 2 - .../impl/StIvtCheckmstHrBcpServiceImpl.java | 5 +- .../service/extendtask/IosHrTask.java | 2 +- .../iostorInv/dao/StIvtIostorinvHrBcp.java | 4 -- .../iostorInv/dto/HrBcpIostorOrderQuery.java | 25 ------- .../impl/StIvtIostorinvEmpBcpServiceImpl.java | 4 +- .../StIvtIostorinvHrBcpInServiceImpl.java | 22 ++---- .../StIvtIostorinvHrBcpOutServiceImpl.java | 2 - .../impl/StIvtMoveinvHrBcpServiceImpl.java | 2 +- .../impl/StIvtMoveinvdtlHrBcpServiceImpl.java | 2 +- .../structIvt/dao/StIvtStructivtHrBcp.java | 4 -- .../mapper/xml/StIvtStructivtHrBcpMapper.xml | 9 +-- .../structIvt/dto/StructIvtHrBcpQuery.java | 2 - .../impl/StIvtStructivtHrBcpServiceImpl.java | 1 - .../src/main/resources/logback-spring.xml | 30 +------- .../semiproducthrIn/AddDialog.vue | 18 ----- .../semiproducthrIn/ViewDialog.vue | 18 ----- .../semiproducthr/semiproducthrIvt/index.vue | 18 ----- 29 files changed, 28 insertions(+), 258 deletions(-) delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStHrBcpOrderController.java delete mode 100644 mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/dto/HrBcpIostorOrderQuery.java diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java index 411b0814..10a64b19 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/enums/AcsTaskEnum.java @@ -80,7 +80,6 @@ public enum AcsTaskEnum { ///api/dict/dictDetail/api/dict/dictDetail/api/dict/dictDetail AGV_SYSTEM_NB("1","诺宝机器人任务"), AGV_SYSTEM_XC("2","叉车任务"), - AGV_SYSTEM_HR("3","海柔任务任务"), ACS_TASK_TYPE_NOBLE_DOUBLE_TASK("1","诺宝双工任务"), ACS_TASK_TYPE_NOBLE_SINGLE_TASK("2","诺宝单工任务"), diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/AcsUtil.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/AcsUtil.java index ddcaaa2b..d86ec196 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/AcsUtil.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/utils/AcsUtil.java @@ -6,7 +6,6 @@ import cn.hutool.http.HttpRequest; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.nl.common.enums.StatusEnum; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.core.bean.WQLObject; @@ -37,14 +36,7 @@ public class AcsUtil { } //ACS地址：127.0.0.1:8010 - String acsUrlCode = "acs_url"; - if (list.size()>0){ - String acs = list.getJSONObject(0).getString("acs"); - if (StringUtils.isNotEmpty(acs)){ - acsUrlCode=acs; - } - } - String acsUrl = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode(acsUrlCode).getValue(); + String acsUrl = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("acs_url").getValue(); String url = acsUrl + api; try { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/config/DruidFilter.java b/mes/hd/nladmin-system/src/main/java/org/nl/config/DruidFilter.java index b5e4ff56..7bd2ace5 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/config/DruidFilter.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/config/DruidFilter.java @@ -39,13 +39,14 @@ public class DruidFilter extends FilterEventAdapter { @Override protected void statementExecuteAfter(StatementProxy statement, String sql, boolean result) { + String traceId = MDC.get("traceId"); int size = statement.getParametersSize(); String executeSql = sql; int count = 0; try { count=statement.getUpdateCount(); }catch (Exception ex){ } - if (count>0) { + if (StringUtils.isNotBlank(traceId) && count>0) { if (size > 0) { Collection values = statement.getParameters().values(); List params = new ArrayList<>(); @@ -63,6 +64,7 @@ public class DruidFilter extends FilterEventAdapter { ResultSetProxy rs = super.statement_getResultSet(chain, statement); String executeSql = statement.getLastExecuteSql(); String traceId = MDC.get("traceId"); + if (StringUtils.isNotBlank(traceId)){ int result = 0; if (rs != null) { ResultSetImpl rss = rs.getResultSetRaw().unwrap(ResultSetImpl.class); @@ -82,6 +84,7 @@ public class DruidFilter extends FilterEventAdapter { log.warn("[-SQL解析异常-][{}]",ex.getMessage()); } log.info("[----SQL----][select][执行结果:{}][ SQL: {} ]",result, executeSql); + } return rs; } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/AcsToWmsServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/AcsToWmsServiceImpl.java index 2df046b2..1fb36884 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/AcsToWmsServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/AcsToWmsServiceImpl.java @@ -406,7 +406,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{ // 调用入库分配规则 StIvtSectattr sect = sectattrService.getOne( new QueryWrapper().lambda() - .eq(StIvtSectattr::getSect_name, "三线半成品库区") + .eq(StIvtSectattr::getSect_name, "海柔半成品库区") ); JSONObject jo = new JSONObject(); jo.put("sect_id", sect.getSect_id()); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/WmsToAcsServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/WmsToAcsServiceImpl.java index 581eae23..610eddcb 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/WmsToAcsServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/WmsToAcsServiceImpl.java @@ -6,7 +6,6 @@ import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.nl.common.enums.AcsTaskEnum; import org.nl.common.enums.StatusEnum; import org.nl.common.utils.AcsUtil; import org.nl.common.utils.IdUtil; @@ -138,7 +137,6 @@ public class WmsToAcsServiceImpl implements WmsToAcsService{ @Override public Map issueTaskToAcs4(JSONArray arr) { - String HR_TASK_TYPE = "18"; JSONArray form = new JSONArray(); for (Object o : arr) { JSONObject task = (JSONObject) o; @@ -150,14 +148,13 @@ public class WmsToAcsServiceImpl implements WmsToAcsService{ , "task_group_id", task.getString("task_group_id") , "start_point_code", task.getString("point_code1") , "next_point_code", task.getString("point_code3") - , "task_type", HR_TASK_TYPE + , "task_type", "18" , "storage_task_type", task.getString("acs_task_type") , "task_group_id", StringUtils.isBlank(task.getString("task_group_id"))? IdUtil.getStringId():task.getString("task_group_id") , "priority", task.getString("priority") , "is_send", task.getBoolean("is_send")?"1":"0" , "vehicle_code", task.getString("vehicle_code") - , "agv_system_type", AcsTaskEnum.AGV_SYSTEM_HR.getCode() - , "acs", "A3_acs_url" + , "agv_system_type", task.getString("agv_system_type") )); form.add(param); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/dao/mapper/MdMeMaterialbaseMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/dao/mapper/MdMeMaterialbaseMapper.xml index 6d949e5f..641a2f40 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/dao/mapper/MdMeMaterialbaseMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/dao/mapper/MdMeMaterialbaseMapper.xml @@ -18,9 +18,6 @@ mater.material_name LIKE '%${query.material_code}%' or mater.material_spec LIKE '%${query.material_code}%') - - AND mater.product_area = #{query.product_area} - order by mater.material_code ASC diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbStoragevehicleinfoServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbStoragevehicleinfoServiceImpl.java index feb451fe..74059904 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbStoragevehicleinfoServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/vehicle/impl/MdPbStoragevehicleinfoServiceImpl.java @@ -90,9 +90,6 @@ public class MdPbStoragevehicleinfoServiceImpl extends ServiceImpl map = new HashMap<>(); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/impl/SchBaseTaskServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/impl/SchBaseTaskServiceImpl.java index 53b3fc79..ed228917 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/impl/SchBaseTaskServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/scheduler_manage/service/task/impl/SchBaseTaskServiceImpl.java @@ -20,7 +20,6 @@ import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.system.util.CodeUtil; import org.nl.modules.wql.util.SpringContextHolder; -import org.nl.wms.ext_manage.acs.service.WmsToAcsService; import org.nl.wms.ext_manage.acs.service.impl.WmsToAcsServiceImpl; import org.nl.wms.scheduler_manage.service.extendtask.manage.AbstractAcsTask; import org.nl.wms.scheduler_manage.service.extendtask.manage.TaskStatusEnum; @@ -167,14 +166,7 @@ public class SchBaseTaskServiceImpl extends ServiceImpl result; - if (task.getProduct_area().equals("A3")){ - WmsToAcsService bean = SpringContextHolder.getBean(WmsToAcsService.class); - result = bean.issueTaskToAcs4(array); - }else { - result = WmsToAcsServiceImpl.staticIssueTaskToAcs(array); - } - + Map result = WmsToAcsServiceImpl.staticIssueTaskToAcs(array); String status = String.valueOf(result.get("status")); if (!status.equals("200")) { throw new BadRequestException(result.get("message") != null ? String.valueOf(result.get("message")) : "acs反馈异常"); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStHrBcpOrderController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStHrBcpOrderController.java deleted file mode 100644 index 346c1eb0..00000000 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/controller/PdaStHrBcpOrderController.java +++ /dev/null @@ -1,69 +0,0 @@ -package org.nl.wms.storage_manage.pda.controller; - - -import cn.dev33.satoken.annotation.SaIgnore; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.github.pagehelper.PageHelper; -import org.nl.common.TableDataInfo; -import org.nl.common.anno.Log; -import org.nl.common.domain.query.PageQuery; -import org.nl.wms.storage_manage.pda.service.PdaStHrBcpInService; -import org.nl.wms.storage_manage.semimanagehr.service.iostorInv.IStIvtIostorinvOrderService; -import org.nl.wms.storage_manage.semimanagehr.service.iostorInv.dao.StIvtIostorinvOrder; -import org.nl.wms.storage_manage.semimanagehr.service.iostorInv.dto.HrBcpIostorOrderQuery; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - *

- * 手持半成品出入库顺序 前端控制器 - *

- * - * @author Liuxy - * @since 2023-08-30 - */ -@RestController -@RequestMapping("/api/pda/hrBcp/order") -public class PdaStHrBcpOrderController { - - @Autowired - protected IStIvtIostorinvOrderService iStIvtIostorinvOrderService; // 出入顺序服务 - - @GetMapping - @Log("获取出入库顺序表") - @SaIgnore - public ResponseEntity getMaterial(HrBcpIostorOrderQuery query, PageQuery page) { - Page result = iStIvtIostorinvOrderService.page(page.build(), query.build()); - return new ResponseEntity<>(TableDataInfo.build(result), HttpStatus.OK); - } - - - @PostMapping - @Log("获取出入库顺序表") - @SaIgnore - public ResponseEntity getMaterial(@RequestBody StIvtIostorinvOrder order) { - if (order!=null){ - iStIvtIostorinvOrderService.updateById(order); - } - return new ResponseEntity<>(HttpStatus.OK); - } - - @DeleteMapping - @Log("删除入库顺序表") - @SaIgnore - public ResponseEntity delete(@RequestBody Long[] ids){ - if (ids!=null && ids.length>0){ - iStIvtIostorinvOrderService.removeByIds(Arrays.asList(ids)); - } - return new ResponseEntity<>(HttpStatus.OK); - } - -} - diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/dto/PdaQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/dto/PdaQuery.java index 709d214f..5b72f50f 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/dto/PdaQuery.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/dto/PdaQuery.java @@ -15,7 +15,6 @@ public class PdaQuery extends BaseQuery { private String material_code; - private String product_area; @Override public void paramMapping() { diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStHrBcpEmpOutServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStHrBcpEmpOutServiceImpl.java index f1bdf5b9..95e50e14 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStHrBcpEmpOutServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStHrBcpEmpOutServiceImpl.java @@ -80,7 +80,7 @@ public class PdaStHrBcpEmpOutServiceImpl implements PdaStHrBcpEmpOutService { StIvtSectattr sect = sectattrService.getOne( new QueryWrapper().lambda() - .eq(StIvtSectattr::getSect_name, "三线半成品库区") + .eq(StIvtSectattr::getSect_name, "海柔半成品库区") ); List list = new ArrayList<>(); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStHrBcpInServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStHrBcpInServiceImpl.java index ea4e353d..d2a44efa 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStHrBcpInServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStHrBcpInServiceImpl.java @@ -65,12 +65,10 @@ public class PdaStHrBcpInServiceImpl implements PdaStHrBcpInService { List list1 = iMdMeMaterialbaseService.list( new QueryWrapper().lambda() .eq(MdMeMaterialbase::getMaterial_type_id, "1528555445302726656") - .eq(MdMeMaterialbase::getProduct_area, "A3") ); list = list1.subList(0, Math.min(list1.size(), size)); totalCount = list1.size(); } else { - whereJson.setProduct_area("A3"); List list1 = iMdMeMaterialbaseService.getPdaBcpGetMaterial(whereJson, pageQuery); list = list1.subList(0, Math.min(list1.size(), size)); totalCount = list1.size(); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/check/impl/StIvtCheckmstHrBcpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/check/impl/StIvtCheckmstHrBcpServiceImpl.java index d8ae6d63..15865515 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/check/impl/StIvtCheckmstHrBcpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/check/impl/StIvtCheckmstHrBcpServiceImpl.java @@ -83,10 +83,10 @@ public class StIvtCheckmstHrBcpServiceImpl extends ServiceImpl { - /** - * 载具码 - */ - private String bar_code; - /** - * 出入库类型 - */ - private String type; - -} diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/impl/StIvtIostorinvEmpBcpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/impl/StIvtIostorinvEmpBcpServiceImpl.java index 434c33f5..af606523 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/impl/StIvtIostorinvEmpBcpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/impl/StIvtIostorinvEmpBcpServiceImpl.java @@ -76,7 +76,7 @@ public class StIvtIostorinvEmpBcpServiceImpl implements IStIvtIostorinvEmpBcpSe // 1.找一个空货位 StIvtSectattr sect = sectattrService.getOne( new QueryWrapper().lambda() - .eq(StIvtSectattr::getSect_name, "三线半成品库区") + .eq(StIvtSectattr::getSect_name, "海柔半成品库区") ); JSONObject jo = new JSONObject(); @@ -173,7 +173,7 @@ public class StIvtIostorinvEmpBcpServiceImpl implements IStIvtIostorinvEmpBcpSe // 1.找一个空载具的货位 StIvtSectattr sect = sectattrService.getOne( new QueryWrapper().lambda() - .eq(StIvtSectattr::getSect_name, "三线半成品库区") + .eq(StIvtSectattr::getSect_name, "海柔半成品库区") ); JSONObject jo = new JSONObject(); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/impl/StIvtIostorinvHrBcpInServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/impl/StIvtIostorinvHrBcpInServiceImpl.java index 3970274f..ed3b7ff4 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/impl/StIvtIostorinvHrBcpInServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/impl/StIvtIostorinvHrBcpInServiceImpl.java @@ -174,7 +174,6 @@ public class StIvtIostorinvHrBcpInServiceImpl extends ServiceImpl() - .set("is_delete",true) - .eq("bar_code",mst.getStoragevehicle_code())); return null; } @@ -456,8 +450,8 @@ public class StIvtIostorinvHrBcpInServiceImpl extends ServiceImpl().lambda() + .eq(StIvtIostorinvOrder::getIn_device, device_code) .eq(StIvtIostorinvOrder::getBar_code, barcode) - .eq(StIvtIostorinvOrder::getIs_delete, false) .eq(StIvtIostorinvOrder::getType, IOSEnum.IO_TYPE.code("入库")) .orderByDesc(StIvtIostorinvOrder::getCreate_time) , false @@ -473,14 +467,12 @@ public class StIvtIostorinvHrBcpInServiceImpl extends ServiceImpl().lambda() - .set(StIvtStructattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定")) - .eq(StIvtStructattr::getStruct_id, mstDao.getStruct_id()) - ); - } + structattrService.update( + new UpdateWrapper().lambda() + .set(StIvtStructattr::getLock_type, IOSEnum.LOCK_TYPE.code("未锁定")) + .eq(StIvtStructattr::getStruct_id, mstDao.getStruct_id()) + ); // 删除任务 iSchBaseTaskService.update( diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/impl/StIvtIostorinvHrBcpOutServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/impl/StIvtIostorinvHrBcpOutServiceImpl.java index 52e61f03..933628cd 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/impl/StIvtIostorinvHrBcpOutServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/impl/StIvtIostorinvHrBcpOutServiceImpl.java @@ -468,8 +468,6 @@ public class StIvtIostorinvHrBcpOutServiceImpl extends ServiceImpl) mst::setTask_id) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/moveInv/impl/StIvtMoveinvHrBcpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/moveInv/impl/StIvtMoveinvHrBcpServiceImpl.java index 8d85b35e..912f18ac 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/moveInv/impl/StIvtMoveinvHrBcpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/moveInv/impl/StIvtMoveinvHrBcpServiceImpl.java @@ -81,7 +81,7 @@ public class StIvtMoveinvHrBcpServiceImpl extends ServiceImpl - and (mb.material_code = #{query.material_search} ORs + and (mb.material_code = #{query.material_search} OR mb.material_name = #{query.material_search} OR mb.material_spec = #{query.material_search}) and sa.sect_id = #{query.sect_id} - - and sa.sect_code = #{query.sect_code} - and (sa.struct_code = #{query.struct_search} OR sa.struct_name = #{query.struct_search}) @@ -167,13 +164,11 @@ attr.sect_code, attr.sect_name, attr.stor_name, - attr.storagevehicle_code, - wp.workprocedure_name + attr.storagevehicle_code FROM st_ivt_structivt_hr_bcp ivt LEFT JOIN md_me_materialbase mater ON ivt.material_id = mater.material_id LEFT JOIN st_ivt_structattr attr ON attr.struct_id = ivt.struct_id - LEFT JOIN pdm_bi_workprocedure wp ON wp.workprocedure_id = ivt.workprocedure_id LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = ivt.qty_unit_id attr.lock_type = '0' diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/structIvt/dto/StructIvtHrBcpQuery.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/structIvt/dto/StructIvtHrBcpQuery.java index e8feaa0b..cfaf3597 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/structIvt/dto/StructIvtHrBcpQuery.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/structIvt/dto/StructIvtHrBcpQuery.java @@ -16,8 +16,6 @@ public class StructIvtHrBcpQuery extends BaseQuery { private String sect_id; - private String sect_code; - private String struct_search; private String material_search; diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/structIvt/impl/StIvtStructivtHrBcpServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/structIvt/impl/StIvtStructivtHrBcpServiceImpl.java index e8bd1899..2d02e72b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/structIvt/impl/StIvtStructivtHrBcpServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/structIvt/impl/StIvtStructivtHrBcpServiceImpl.java @@ -51,7 +51,6 @@ public class StIvtStructivtHrBcpServiceImpl extends ServiceImpl page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); - query.setSect_code("HKQ001"); List mst_detail = this.baseMapper.getBcpIvt(query, pageQuery); TableDataInfo build = TableDataInfo.build(mst_detail); build.setTotalElements(page.getTotal()); diff --git a/mes/hd/nladmin-system/src/main/resources/logback-spring.xml b/mes/hd/nladmin-system/src/main/resources/logback-spring.xml index 7f239c50..7ef52230 100644 --- a/mes/hd/nladmin-system/src/main/resources/logback-spring.xml +++ b/mes/hd/nladmin-system/src/main/resources/logback-spring.xml @@ -112,39 +112,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + diff --git a/mes/qd/src/views/wms/storage_manage/semiproducthr/semiproducthrIn/AddDialog.vue b/mes/qd/src/views/wms/storage_manage/semiproducthr/semiproducthrIn/AddDialog.vue index c9b3577d..27d5d0fe 100644 --- a/mes/qd/src/views/wms/storage_manage/semiproducthr/semiproducthrIn/AddDialog.vue +++ b/mes/qd/src/views/wms/storage_manage/semiproducthr/semiproducthrIn/AddDialog.vue @@ -151,19 +151,6 @@ - - -