给商品表增加品牌、助记码字段
This commit is contained in:
jishenghua
parent
b2e231938f
commit
12230ad91f
@ -1603,3 +1603,11 @@ alter table jsh_material_current_stock add current_unit_price decimal(24,6) DEFA
|
||||
-- 给系统参数表增加先审核后打印启用标记，启用后，零售、采购、销售等单据，都需要先审核之后才能进行打印
|
||||
-- --------------------------------------------------------
|
||||
alter table jsh_system_config add audit_print_flag varchar(1) DEFAULT '0' COMMENT '先审核后打印启用标记，0未启用，1启用' after move_avg_price_flag;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
-- 时间 2024年9月27日
|
||||
-- by jishenghua
|
||||
-- 给商品表增加品牌、助记码字段
|
||||
-- --------------------------------------------------------
|
||||
alter table jsh_material add brand varchar(100) DEFAULT NULL COMMENT '品牌' after standard;
|
||||
alter table jsh_material add mnemonic varchar(100) DEFAULT NULL COMMENT '助记码' after brand;
|
||||
@ -15,6 +15,10 @@ public class Material {
|
||||
|
||||
private String standard;
|
||||
|
||||
private String brand;
|
||||
|
||||
private String mnemonic;
|
||||
|
||||
private String color;
|
||||
|
||||
private String unit;
|
||||
@ -95,6 +99,22 @@ public class Material {
|
||||
this.standard = standard == null ? null : standard.trim();
|
||||
}
|
||||
|
||||
public String getBrand() {
|
||||
return brand;
|
||||
}
|
||||
|
||||
public void setBrand(String brand) {
|
||||
this.brand = brand == null ? null : brand.trim();
|
||||
}
|
||||
|
||||
public String getMnemonic() {
|
||||
return mnemonic;
|
||||
}
|
||||
|
||||
public void setMnemonic(String mnemonic) {
|
||||
this.mnemonic = mnemonic == null ? null : mnemonic.trim();
|
||||
}
|
||||
|
||||
public String getColor() {
|
||||
return color;
|
||||
}
|
||||
|
||||
@ -505,6 +505,146 @@ public class MaterialExample {
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andBrandIsNull() {
|
||||
addCriterion("brand is null");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andBrandIsNotNull() {
|
||||
addCriterion("brand is not null");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andBrandEqualTo(String value) {
|
||||
addCriterion("brand =", value, "brand");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andBrandNotEqualTo(String value) {
|
||||
addCriterion("brand <>", value, "brand");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andBrandGreaterThan(String value) {
|
||||
addCriterion("brand >", value, "brand");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andBrandGreaterThanOrEqualTo(String value) {
|
||||
addCriterion("brand >=", value, "brand");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andBrandLessThan(String value) {
|
||||
addCriterion("brand <", value, "brand");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andBrandLessThanOrEqualTo(String value) {
|
||||
addCriterion("brand <=", value, "brand");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andBrandLike(String value) {
|
||||
addCriterion("brand like", value, "brand");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andBrandNotLike(String value) {
|
||||
addCriterion("brand not like", value, "brand");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andBrandIn(List<String> values) {
|
||||
addCriterion("brand in", values, "brand");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andBrandNotIn(List<String> values) {
|
||||
addCriterion("brand not in", values, "brand");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andBrandBetween(String value1, String value2) {
|
||||
addCriterion("brand between", value1, value2, "brand");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andBrandNotBetween(String value1, String value2) {
|
||||
addCriterion("brand not between", value1, value2, "brand");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andMnemonicIsNull() {
|
||||
addCriterion("mnemonic is null");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andMnemonicIsNotNull() {
|
||||
addCriterion("mnemonic is not null");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andMnemonicEqualTo(String value) {
|
||||
addCriterion("mnemonic =", value, "mnemonic");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andMnemonicNotEqualTo(String value) {
|
||||
addCriterion("mnemonic <>", value, "mnemonic");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andMnemonicGreaterThan(String value) {
|
||||
addCriterion("mnemonic >", value, "mnemonic");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andMnemonicGreaterThanOrEqualTo(String value) {
|
||||
addCriterion("mnemonic >=", value, "mnemonic");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andMnemonicLessThan(String value) {
|
||||
addCriterion("mnemonic <", value, "mnemonic");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andMnemonicLessThanOrEqualTo(String value) {
|
||||
addCriterion("mnemonic <=", value, "mnemonic");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andMnemonicLike(String value) {
|
||||
addCriterion("mnemonic like", value, "mnemonic");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andMnemonicNotLike(String value) {
|
||||
addCriterion("mnemonic not like", value, "mnemonic");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andMnemonicIn(List<String> values) {
|
||||
addCriterion("mnemonic in", values, "mnemonic");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andMnemonicNotIn(List<String> values) {
|
||||
addCriterion("mnemonic not in", values, "mnemonic");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andMnemonicBetween(String value1, String value2) {
|
||||
addCriterion("mnemonic between", value1, value2, "mnemonic");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andMnemonicNotBetween(String value1, String value2) {
|
||||
addCriterion("mnemonic not between", value1, value2, "mnemonic");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andColorIsNull() {
|
||||
addCriterion("color is null");
|
||||
return (Criteria) this;
|
||||
|
||||
@ -8,6 +8,8 @@
|
||||
<result column="mfrs" jdbcType="VARCHAR" property="mfrs" />
|
||||
<result column="model" jdbcType="VARCHAR" property="model" />
|
||||
<result column="standard" jdbcType="VARCHAR" property="standard" />
|
||||
<result column="brand" jdbcType="VARCHAR" property="brand" />
|
||||
<result column="mnemonic" jdbcType="VARCHAR" property="mnemonic" />
|
||||
<result column="color" jdbcType="VARCHAR" property="color" />
|
||||
<result column="unit" jdbcType="VARCHAR" property="unit" />
|
||||
<result column="remark" jdbcType="VARCHAR" property="remark" />
|
||||
@ -84,9 +86,9 @@
|
||||
</where>
|
||||
</sql>
|
||||
<sql id="Base_Column_List">
|
||||
id, category_id, name, mfrs, model, standard, color, unit, remark, img_name, unit_id,
|
||||
expiry_num, weight, enabled, other_field1, other_field2, other_field3, enable_serial_number,
|
||||
enable_batch_number, position, tenant_id, delete_flag
|
||||
id, category_id, name, mfrs, model, standard, brand, mnemonic, color, unit, remark,
|
||||
img_name, unit_id, expiry_num, weight, enabled, other_field1, other_field2, other_field3,
|
||||
enable_serial_number, enable_batch_number, position, tenant_id, delete_flag
|
||||
</sql>
|
||||
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.MaterialExample" resultMap="BaseResultMap">
|
||||
select
|
||||
@ -121,20 +123,22 @@
|
||||
<insert id="insert" parameterType="com.jsh.erp.datasource.entities.Material">
|
||||
insert into jsh_material (id, category_id, name,
|
||||
mfrs, model, standard,
|
||||
color, unit, remark,
|
||||
img_name, unit_id, expiry_num,
|
||||
weight, enabled, other_field1,
|
||||
other_field2, other_field3, enable_serial_number,
|
||||
enable_batch_number, position, tenant_id,
|
||||
delete_flag)
|
||||
brand, mnemonic, color,
|
||||
unit, remark, img_name,
|
||||
unit_id, expiry_num, weight,
|
||||
enabled, other_field1, other_field2,
|
||||
other_field3, enable_serial_number, enable_batch_number,
|
||||
position, tenant_id, delete_flag
|
||||
)
|
||||
values (#{id,jdbcType=BIGINT}, #{categoryId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR},
|
||||
#{mfrs,jdbcType=VARCHAR}, #{model,jdbcType=VARCHAR}, #{standard,jdbcType=VARCHAR},
|
||||
#{color,jdbcType=VARCHAR}, #{unit,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR},
|
||||
#{imgName,jdbcType=VARCHAR}, #{unitId,jdbcType=BIGINT}, #{expiryNum,jdbcType=INTEGER},
|
||||
#{weight,jdbcType=DECIMAL}, #{enabled,jdbcType=BIT}, #{otherField1,jdbcType=VARCHAR},
|
||||
#{otherField2,jdbcType=VARCHAR}, #{otherField3,jdbcType=VARCHAR}, #{enableSerialNumber,jdbcType=VARCHAR},
|
||||
#{enableBatchNumber,jdbcType=VARCHAR}, #{position,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT},
|
||||
#{deleteFlag,jdbcType=VARCHAR})
|
||||
#{brand,jdbcType=VARCHAR}, #{mnemonic,jdbcType=VARCHAR}, #{color,jdbcType=VARCHAR},
|
||||
#{unit,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{imgName,jdbcType=VARCHAR},
|
||||
#{unitId,jdbcType=BIGINT}, #{expiryNum,jdbcType=INTEGER}, #{weight,jdbcType=DECIMAL},
|
||||
#{enabled,jdbcType=BIT}, #{otherField1,jdbcType=VARCHAR}, #{otherField2,jdbcType=VARCHAR},
|
||||
#{otherField3,jdbcType=VARCHAR}, #{enableSerialNumber,jdbcType=VARCHAR}, #{enableBatchNumber,jdbcType=VARCHAR},
|
||||
#{position,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}
|
||||
)
|
||||
</insert>
|
||||
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Material">
|
||||
insert into jsh_material
|
||||
@ -157,6 +161,12 @@
|
||||
<if test="standard != null">
|
||||
standard,
|
||||
</if>
|
||||
<if test="brand != null">
|
||||
brand,
|
||||
</if>
|
||||
<if test="mnemonic != null">
|
||||
mnemonic,
|
||||
</if>
|
||||
<if test="color != null">
|
||||
color,
|
||||
</if>
|
||||
@ -225,6 +235,12 @@
|
||||
<if test="standard != null">
|
||||
#{standard,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="brand != null">
|
||||
#{brand,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="mnemonic != null">
|
||||
#{mnemonic,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="color != null">
|
||||
#{color,jdbcType=VARCHAR},
|
||||
</if>
|
||||
@ -302,6 +318,12 @@
|
||||
<if test="record.standard != null">
|
||||
standard = #{record.standard,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="record.brand != null">
|
||||
brand = #{record.brand,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="record.mnemonic != null">
|
||||
mnemonic = #{record.mnemonic,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="record.color != null">
|
||||
color = #{record.color,jdbcType=VARCHAR},
|
||||
</if>
|
||||
@ -363,6 +385,8 @@
|
||||
mfrs = #{record.mfrs,jdbcType=VARCHAR},
|
||||
model = #{record.model,jdbcType=VARCHAR},
|
||||
standard = #{record.standard,jdbcType=VARCHAR},
|
||||
brand = #{record.brand,jdbcType=VARCHAR},
|
||||
mnemonic = #{record.mnemonic,jdbcType=VARCHAR},
|
||||
color = #{record.color,jdbcType=VARCHAR},
|
||||
unit = #{record.unit,jdbcType=VARCHAR},
|
||||
remark = #{record.remark,jdbcType=VARCHAR},
|
||||
@ -401,6 +425,12 @@
|
||||
<if test="standard != null">
|
||||
standard = #{standard,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="brand != null">
|
||||
brand = #{brand,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="mnemonic != null">
|
||||
mnemonic = #{mnemonic,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="color != null">
|
||||
color = #{color,jdbcType=VARCHAR},
|
||||
</if>
|
||||
@ -459,6 +489,8 @@
|
||||
mfrs = #{mfrs,jdbcType=VARCHAR},
|
||||
model = #{model,jdbcType=VARCHAR},
|
||||
standard = #{standard,jdbcType=VARCHAR},
|
||||
brand = #{brand,jdbcType=VARCHAR},
|
||||
mnemonic = #{mnemonic,jdbcType=VARCHAR},
|
||||
color = #{color,jdbcType=VARCHAR},
|
||||
unit = #{unit,jdbcType=VARCHAR},
|
||||
remark = #{remark,jdbcType=VARCHAR},
|
||||
|
||||
@ -69,6 +69,28 @@
|
||||
<a-input placeholder="请输入颜色" v-decorator.trim="[ 'color' ]" />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :md="6" :sm="24">
|
||||
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="品牌" data-step="5" data-title="品牌"
|
||||
data-intro="请填写商品的品牌">
|
||||
<a-input placeholder="请输入品牌" v-decorator.trim="[ 'brand' ]" />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :md="6" :sm="24">
|
||||
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="助记码" data-step="5" data-title="助记码"
|
||||
data-intro="请填写商品的助记码">
|
||||
<a-input placeholder="请输入助记码" v-decorator.trim="[ 'mnemonic' ]" />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :md="6" :sm="24">
|
||||
<a-form-item :labelCol="{xs: { span: 24 },sm: { span: 4 }}" :wrapperCol="{xs: { span: 24 },sm: { span: 20 }}" label="类别"
|
||||
data-step="8" data-title="类别" data-intro="类别需要在【商品类别】页面进行录入，录入之后在此处进行调用">
|
||||
<a-tree-select style="width:100%" :dropdownStyle="{maxHeight:'200px',overflow:'auto'}" allow-clear
|
||||
:treeData="categoryTree" v-decorator="[ 'categoryId' ]" placeholder="请选择类别">
|
||||
</a-tree-select>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<a-row class="form-row" :gutter="24">
|
||||
<a-col :md="6" :sm="24">
|
||||
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="基础重量" data-step="6" data-title="基础重量"
|
||||
data-intro="请填写基本单位对应的重量，用于计算按重量分摊费用时单据中各行商品分摊的费用成本">
|
||||
@ -82,11 +104,15 @@
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :md="6" :sm="24">
|
||||
<a-form-item :labelCol="{xs: { span: 24 },sm: { span: 4 }}" :wrapperCol="{xs: { span: 24 },sm: { span: 20 }}" label="类别"
|
||||
data-step="8" data-title="类别" data-intro="类别需要在【商品类别】页面进行录入，录入之后在此处进行调用">
|
||||
<a-tree-select style="width:100%" :dropdownStyle="{maxHeight:'200px',overflow:'auto'}" allow-clear
|
||||
:treeData="categoryTree" v-decorator="[ 'categoryId' ]" placeholder="请选择类别">
|
||||
</a-tree-select>
|
||||
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="仓位货架" data-step="11" data-title="仓位货架"
|
||||
data-intro="仓位货架指的是仓库中的仓位和货架号，主要适用于仓库较大的场景，方便查找商品的准确位置">
|
||||
<a-input style="width: 100%" placeholder="请输入仓位货架" v-decorator.trim="[ 'position' ]" />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :md="6" :sm="24">
|
||||
<a-form-item :labelCol="{xs: { span: 24 },sm: { span: 4 }}" :wrapperCol="{xs: { span: 24 },sm: { span: 20 }}" label="制造商" data-step="5" data-title="制造商"
|
||||
data-intro="请填写商品的制造商，一般适用于制造行业">
|
||||
<a-input placeholder="请输入制造商" v-decorator.trim="[ 'mfrs' ]" />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
@ -113,14 +139,8 @@
|
||||
</a-tooltip>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :md="6" :sm="24">
|
||||
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="仓位货架" data-step="11" data-title="仓位货架"
|
||||
data-intro="仓位货架指的是仓库中的仓位和货架号，主要适用于仓库较大的场景，方便查找商品的准确位置">
|
||||
<a-input style="width: 100%" placeholder="请输入仓位货架" v-decorator.trim="[ 'position' ]" />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :md="6" :sm="24" v-if="!model.id">
|
||||
<a-form-item :labelCol="{xs: { span: 24 },sm: { span: 4 }}" :wrapperCol="{xs: { span: 24 },sm: { span: 20 }}" label="多属性" data-step="12" data-title="多属性"
|
||||
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="多属性" data-step="12" data-title="多属性"
|
||||
data-intro="多属性是针对的sku商品（比如服装、鞋帽行业），此处开关如果启用就可以在下方进行多sku的配置，配置具体的颜色、尺码之类的组合">
|
||||
<a-tooltip title="多属性针对服装、鞋帽等行业，需要先录入单位才能激活此处输入框">
|
||||
<a-tag class="tag-info" v-if="!manySkuStatus">需要先录入单位才能激活</a-tag>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user