From 80974120a8871fef74ff5380d349ba72289c80e2 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Mon, 16 Dec 2024 17:20:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=A7=E5=93=81=E4=B8=BB=E9=94=AE?= =?UTF-8?q?=E8=B7=9F=E8=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/op/mes/domain/MesProductTrace.java | 2 +- .../resources/mapper/mes/MesReportWorkMapper.xml | 5 ++--- .../controller/ProOrderWorkorderController.java | 13 +++++++++---- .../mapper/plan/ProOrderWorkorderMapper.xml | 1 + .../quality/service/impl/QcProCheckServiceImpl.java | 7 +++++++ .../service/impl/QcStaticTableServiceImpl.java | 6 +++++- 6 files changed, 25 insertions(+), 9 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesProductTrace.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesProductTrace.java index bd0c06ea9..b47e9f5b6 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesProductTrace.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesProductTrace.java @@ -31,7 +31,7 @@ public class MesProductTrace extends BaseEntity { private String unity; @Excel(name = "检验标准") private String standarNo; - @Excel(name = "箱型") + //@Excel(name = "箱型") private String boxType; @Excel(name = "垛型") private String packType; diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml index 5b2c2793f..f229c82eb 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml +++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml @@ -1092,11 +1092,11 @@ WHERE bp.product_desc_en productDescEn, bp.mvgr5_nm batchMax, bpa.pallet_num palletNum, - concat(mb.length,'*',mb.width,'*',mb.height) spec, + concat(bp.length,'*',bp.width,'*',bp.height) spec, bp.product_group_name productGroupName, bp.umrez unity, bp.mvgr5 standarNo, - bp.box_type boxType,bpa.pack_type packType, + bpa.pack_type packType, bpa.cpk_type cpkType, dict.dict_label cpkTypeName from (select DISTINCT product_code from pro_order_workorder where parent_order = '0' and del_flag = '0' and status in('w2','w3') @@ -1105,7 +1105,6 @@ WHERE ) pow left join base_product bp on pow.product_code = bp.product_code left join base_product_attached bpa on concat('0000000',bpa.product_code) = bp.product_code - left join mes_box mb on mb.box_type = bp.box_type left join lanju_op_cloud.dbo.sys_dict_data dict on dict.dict_value = bpa.cpk_type and dict.dict_type= 'qms_category' where bp.del_flag = '0' and (bp.product_code like '00000001%' or bp.product_code like '00000002%' or bp.product_code like '00000003%' diff --git a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java index dd66c9ebd..50a71baf2 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/controller/ProOrderWorkorderController.java @@ -304,17 +304,17 @@ public class ProOrderWorkorderController extends BaseController { public AjaxResult downWorkorder(@PathVariable String[] workorderIds) { List packageTypes = proOrderWorkorderService.getPackType(workorderIds); if(CollectionUtils.isEmpty(packageTypes)){ - return AjaxResult.error("请先维护垛型箱型！"); + return AjaxResult.error("请先维护所选产品的垛型和长宽高！"); }else{ for(BaseProduct ptype:packageTypes){ if(ptype == null){ - return AjaxResult.error("请先维护垛型箱型！"); + return AjaxResult.error("请先维护"+ptype.getProductDescZh()+"("+ptype.getProductCode().substring(7)+")垛型和长宽高！"); } if(StringUtils.isEmpty(ptype.getBoxType())){ - return AjaxResult.error("请先维护箱型！"); + return AjaxResult.error("请先维护"+ptype.getProductDescZh()+"("+ptype.getProductCode().substring(7)+")箱型尺寸！"); } if(StringUtils.isEmpty(ptype.getPackType())){ - return AjaxResult.error("请先维护垛型！"); + return AjaxResult.error("请先维护"+ptype.getProductDescZh()+"("+ptype.getProductCode().substring(7)+")垛型！"); } } } @@ -397,4 +397,9 @@ public class ProOrderWorkorderController extends BaseController { int m = proOrderWorkorderService.updateWorkOrderBom(workorderCode); return toAjax(m); } + + public static void main(String args[]){ + String m = "000000010101000115"; + System.out.println(m.substring(7)); + } } diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml index becc0adea..b71a7a9af 100644 --- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml +++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml @@ -1124,6 +1124,7 @@ select pow.product_code productCode,pow.product_name productDescZh, - bp.box_type boxType, + case when bp.width is not null and bp.height is not null and bp.length is not null then '1' else '' end boxType, bpa.pack_type packType from pro_order_workorder pow left join base_product bp on bp.product_code = pow.product_code and bp.del_flag = '0'