From 2f933a67097161ef7eb588cc8302944f73577e2e Mon Sep 17 00:00:00 2001 From: zhangzq Date: Wed, 24 Jan 2024 09:28:23 +0800 Subject: [PATCH] =?UTF-8?q?add:=E6=89=8B=E6=8C=81=E6=B5=B7=E6=9F=94?= =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E9=A1=BA=E5=BA=8F=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/lucene/netty/RemoteLogServer.java | 2 +- .../main/java/org/nl/config/DruidFilter.java | 6 ++-- .../acs/service/impl/AcsToWmsServiceImpl.java | 2 +- .../pda/service/dto/PdaQuery.java | 1 + .../impl/PdaStHrBcpEmpOutServiceImpl.java | 2 +- .../service/impl/PdaStHrBcpInServiceImpl.java | 2 ++ .../service/extendtask/IosHrTask.java | 6 ++-- .../iostorInv/dao/StIvtIostorinvHrBcp.java | 2 ++ .../impl/StIvtIostorinvEmpBcpServiceImpl.java | 4 +-- .../StIvtIostorinvHrBcpInServiceImpl.java | 1 + .../StIvtIostorinvHrBcpOutServiceImpl.java | 2 ++ .../impl/StIvtMoveinvHrBcpServiceImpl.java | 2 +- .../impl/StIvtMoveinvdtlHrBcpServiceImpl.java | 2 +- .../structIvt/dao/StIvtStructivtHrBcp.java | 4 +++ .../mapper/xml/StIvtStructivtHrBcpMapper.xml | 3 ++ .../structIvt/dto/StructIvtHrBcpQuery.java | 2 ++ .../impl/StIvtStructivtHrBcpServiceImpl.java | 1 + .../src/main/resources/logback-spring.xml | 26 ++++++++++++++++- .../semiproducthrIn/AddDialog.vue | 18 ++++++++++++ .../semiproducthrIn/ViewDialog.vue | 18 ++++++++++++ .../semiproducthr/semiproducthrIvt/index.vue | 20 ++++++++++++- .../semiproducthrOrder/hrorder.js | 4 +-- .../semiproducthrOrder/index.vue | 29 +++++++++++++++++-- 23 files changed, 138 insertions(+), 21 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/common/lucene/netty/RemoteLogServer.java b/mes/hd/nladmin-system/src/main/java/org/nl/common/lucene/netty/RemoteLogServer.java index cc8fb61c..ecefe3a0 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/common/lucene/netty/RemoteLogServer.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/common/lucene/netty/RemoteLogServer.java @@ -31,7 +31,7 @@ import java.util.Map; * @author ZZQ * @Date 2024/1/22 09:06 */ -@Component +//@Component public class RemoteLogServer implements SmartLifecycle { @Autowired 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 7bd2ace5..233f6152 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,14 +39,13 @@ 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 (StringUtils.isNotBlank(traceId) && count>0) { + if ( count>0) { if (size > 0) { Collection values = statement.getParameters().values(); List params = new ArrayList<>(); @@ -63,8 +62,7 @@ public class DruidFilter extends FilterEventAdapter { public ResultSetProxy statement_getResultSet(FilterChain chain, StatementProxy statement) throws SQLException { ResultSetProxy rs = super.statement_getResultSet(chain, statement); String executeSql = statement.getLastExecuteSql(); - String traceId = MDC.get("traceId"); - if (StringUtils.isNotBlank(traceId)){ + if (true){ int result = 0; if (rs != null) { ResultSetImpl rss = rs.getResultSetRaw().unwrap(ResultSetImpl.class); 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 1fb36884..2df046b2 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/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 5b72f50f..709d214f 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,6 +15,7 @@ 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 95e50e14..f1bdf5b9 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 d2a44efa..ea4e353d 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,10 +65,12 @@ 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/extendtask/IosHrTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/extendtask/IosHrTask.java index 3523757e..521e3500 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/extendtask/IosHrTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/extendtask/IosHrTask.java @@ -60,7 +60,7 @@ public class IosHrTask extends AbstractAcsTask { // 2.判断device_code2、barcode2 是否为空 if (ObjectUtil.isNotEmpty(json.getString("device_code2")) && ObjectUtil.isNotEmpty(json.getString("barcode2"))) { - param.put("device_code", json.getString("device_code2")); + param.put("device_code", json.getString("device_code1")); param.put("barcode", json.getString("barcode2")); iStIvtIostorinvHrBcpInService.fullIn(param); } @@ -78,7 +78,7 @@ public class IosHrTask extends AbstractAcsTask { // 2.判断device_code2、barcode2 是否为空 if (ObjectUtil.isNotEmpty(json.getString("device_code2")) && ObjectUtil.isNotEmpty(json.getString("barcode2"))) { - param.put("device_code", json.getString("device_code2")); + param.put("device_code", json.getString("device_code1")); param.put("barcode", json.getString("barcode2")); iStIvtIostorinvEmpBcpService.InEmp(param); } @@ -97,7 +97,7 @@ public class IosHrTask extends AbstractAcsTask { // 2.判断device_code2、barcode2 是否为空 if (ObjectUtil.isNotEmpty(json.getString("device_code2"))) { - param.put("device_code", json.getString("device_code2")); + param.put("device_code", json.getString("device_code1")); iStIvtIostorinvEmpBcpService.OutEmp(param); } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/dao/StIvtIostorinvHrBcp.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/dao/StIvtIostorinvHrBcp.java index 7545547e..e0dcdc19 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/dao/StIvtIostorinvHrBcp.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/dao/StIvtIostorinvHrBcp.java @@ -228,5 +228,7 @@ public class StIvtIostorinvHrBcp implements Serializable { */ private String point_code; + private String workprocedure_id; + } 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 af606523..434c33f5 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 ed3b7ff4..bb788292 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,6 +174,7 @@ public class StIvtIostorinvHrBcpInServiceImpl 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 912f18ac..8d85b35e 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 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}) 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 cfaf3597..e8feaa0b 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,6 +16,8 @@ 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 2d02e72b..e8bd1899 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,6 +51,7 @@ 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 7ef52230..9af22fa9 100644 --- a/mes/hd/nladmin-system/src/main/resources/logback-spring.xml +++ b/mes/hd/nladmin-system/src/main/resources/logback-spring.xml @@ -112,11 +112,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + - + 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 27d5d0fe..c9b3577d 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,6 +151,19 @@ + + +