From 5263bc32f64628225c492ffa57bc14d90ebd1eff Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Thu, 15 Jan 2026 12:54:31 +0800 Subject: [PATCH] =?UTF-8?q?2026-01-15=20=E7=89=A9=E6=96=99=E6=A1=A3?= =?UTF-8?q?=E6=A1=88=E7=AE=A1=E7=90=86=EF=BC=8C=E6=A0=87=E7=AD=BE=E6=A8=A1?= =?UTF-8?q?=E7=89=88=E8=AE=BE=E7=BD=AE=E9=A1=B5=E7=AD=BE=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=B7=A5=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/pms/entity/PartLabelTemplateEntity.java | 1 + src/main/resources/mapper/pms/QcBaseInfoMapper.xml | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gaotao/modules/pms/entity/PartLabelTemplateEntity.java b/src/main/java/com/gaotao/modules/pms/entity/PartLabelTemplateEntity.java index 9c13f81..54bf781 100644 --- a/src/main/java/com/gaotao/modules/pms/entity/PartLabelTemplateEntity.java +++ b/src/main/java/com/gaotao/modules/pms/entity/PartLabelTemplateEntity.java @@ -13,6 +13,7 @@ public class PartLabelTemplateEntity { private String partNo; private String labelTypeTb; private String labelType; + private String operationDesc; private String defaultFlag; private String createdBy; private Date createdDate; diff --git a/src/main/resources/mapper/pms/QcBaseInfoMapper.xml b/src/main/resources/mapper/pms/QcBaseInfoMapper.xml index 27e95d1..d849437 100644 --- a/src/main/resources/mapper/pms/QcBaseInfoMapper.xml +++ b/src/main/resources/mapper/pms/QcBaseInfoMapper.xml @@ -1616,6 +1616,7 @@ a.part_no, a.label_type_tb, a.label_type, + a.operation_desc, a.default_flag, case when a.default_flag = '1' then '默认' when a.default_flag = '0' then '非默认' else '' end as defaultFlagDesc, a.created_by, @@ -1631,8 +1632,8 @@ - INSERT INTO part_label_template (site, bu_no, part_no, label_type_tb, label_type, default_flag, created_by, created_date) - VALUES (#{site}, #{buNo}, #{partNo}, #{labelTypeTb}, #{labelType}, #{defaultFlag}, #{createdBy}, getDate()) + INSERT INTO part_label_template (site, bu_no, part_no, label_type_tb, label_type, operation_desc, default_flag, created_by, created_date) + VALUES (#{site}, #{buNo}, #{partNo}, #{labelTypeTb}, #{labelType}, #{operationDesc}, #{defaultFlag}, #{createdBy}, getDate()) @@ -1644,7 +1645,8 @@ UPDATE part_label_template - SET default_flag = #{defaultFlag} + SET default_flag = #{defaultFlag}, + operation_desc = #{operationDesc} where site = #{site} and bu_no = #{buNo} and part_no = #{partNo} AND label_type_tb = #{labelTypeTb}