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}