gyzz/openerp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加仓位货架字段

Browse Source
This commit is contained in:
季圣华 2023-05-19 19:29:34 +08:00
parent b3b7bfadfc
commit 2e659c8a50
5 changed files with 119 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
jshERP-boot/docs/jsh_erp.sql
View File

@ -10,7 +10,7 @@ Target Server Type : MYSQL
Target Server Version : 50704
File Encoding : 65001
Date: 2023-05-10 23:21:02
Date: 2023-05-19 19:25:05
*/
SET FOREIGN_KEY_CHECKS=0;
@ -415,6 +415,7 @@ CREATE TABLE `jsh_material` (
`other_field3` varchar(50) DEFAULT NULL COMMENT '自定义3',
`enable_serial_number` varchar(1) DEFAULT '0' COMMENT '是否开启序列号，0否，1是',
`enable_batch_number` varchar(1) DEFAULT '0' COMMENT '是否开启批号，0否，1是',
`position` varchar(100) DEFAULT NULL COMMENT '仓位货架',
`tenant_id` bigint(20) DEFAULT NULL COMMENT '租户id',
`delete_flag` varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除',
PRIMARY KEY (`id`),
@ -425,15 +426,15 @@ CREATE TABLE `jsh_material` (
-- ----------------------------
-- Records of jsh_material
-- ----------------------------
INSERT INTO `jsh_material` VALUES ('568', '17', '商品1', '制1', 'sp1', '', '', '个', '', null, null, null, null, '', '', '', '', '0', '0', '63', '0');
INSERT INTO `jsh_material` VALUES ('569', '17', '商品2', '', 'sp2', '', '', '只', '', null, null, null, null, '', '', '', '', '0', '0', '63', '0');
INSERT INTO `jsh_material` VALUES ('570', '17', '商品3', '', 'sp3', '', '', '个', '', null, null, null, null, '', '', '', '', '0', '0', '63', '0');
INSERT INTO `jsh_material` VALUES ('577', null, '商品8', '', 'sp8', '', '', '', '', null, '15', null, null, '', '', '', '', '0', '0', '63', '0');
INSERT INTO `jsh_material` VALUES ('579', '21', '商品17', '', 'sp17', '', '', '', '', null, '15', null, null, '', '', '', '', '0', '0', '63', '0');
INSERT INTO `jsh_material` VALUES ('586', '17', '序列号商品测试', '', 'xlh123', '', '', '个', '', null, null, null, null, '', '', '', '', '1', '0', '63', '0');
INSERT INTO `jsh_material` VALUES ('587', '17', '商品test1', '南通中远', '', 'test1', '', '个', '', null, null, null, null, '', '', '', '', '0', '0', '63', '0');
INSERT INTO `jsh_material` VALUES ('588', '21', '商品200', 'fafda', 'weqwe', '300ml', '红色', '个', 'aaaabbbbb', null, null, null, null, '', '', '', '', '0', '0', '63', '0');
INSERT INTO `jsh_material` VALUES ('619', null, '衣服', null, null, null, null, '件', null, '', null, null, null, '', null, null, null, '0', '0', '63', '0');
INSERT INTO `jsh_material` VALUES ('568', '17', '商品1', '制1', 'sp1', '', '', '个', '', null, null, null, null, '', '', '', '', '0', '0', null, '63', '0');
INSERT INTO `jsh_material` VALUES ('569', '17', '商品2', '', 'sp2', '', '', '只', '', null, null, null, null, '', '', '', '', '0', '0', null, '63', '0');
INSERT INTO `jsh_material` VALUES ('570', '17', '商品3', '', 'sp3', '', '', '个', '', null, null, null, null, '', '', '', '', '0', '0', null, '63', '0');
INSERT INTO `jsh_material` VALUES ('577', null, '商品8', '', 'sp8', '', '', '', '', null, '15', null, null, '', '', '', '', '0', '0', null, '63', '0');
INSERT INTO `jsh_material` VALUES ('579', '21', '商品17', '', 'sp17', '', '', '', '', null, '15', null, null, '', '', '', '', '0', '0', null, '63', '0');
INSERT INTO `jsh_material` VALUES ('586', '17', '序列号商品测试', '', 'xlh123', '', '', '个', '', null, null, null, null, '', '', '', '', '1', '0', null, '63', '0');
INSERT INTO `jsh_material` VALUES ('587', '17', '商品test1', '南通中远', '', 'test1', '', '个', '', null, null, null, null, '', '', '', '', '0', '0', null, '63', '0');
INSERT INTO `jsh_material` VALUES ('588', '21', '商品200', 'fafda', 'weqwe', '300ml', '红色', '个', 'aaaabbbbb', null, null, null, null, '', '', '', '', '0', '0', null, '63', '0');
INSERT INTO `jsh_material` VALUES ('619', null, '衣服', null, null, null, null, '件', null, '', null, null, null, '', null, null, null, '0', '0', null, '63', '0');
-- ----------------------------
-- Table structure for jsh_material_attribute

9
jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt
View File

@ -1480,4 +1480,11 @@ alter table jsh_system_config add update_unit_price_flag varchar(1) DEFAULT '1'
-- by jishenghua
-- 给系统参数表增加超出关联单据启用标记
-- --------------------------------------------------------
alter table jsh_system_config add over_link_bill_flag varchar(1) DEFAULT '0' COMMENT '超出关联单据启用标记，0未启用，1启用' after update_unit_price_flag;
alter table jsh_system_config add over_link_bill_flag varchar(1) DEFAULT '0' COMMENT '超出关联单据启用标记，0未启用，1启用' after update_unit_price_flag;
-- --------------------------------------------------------
-- 时间 2023年05月19日
-- by jishenghua
-- 给商品主表增加仓位货架
-- --------------------------------------------------------
alter table jsh_material add position varchar(100) DEFAULT NULL COMMENT '仓位货架' after enable_batch_number;

10
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/Material.java
View File

@ -41,6 +41,8 @@ public class Material {
private String enableBatchNumber;
private String position;
private Long tenantId;
private String deleteFlag;
@ -197,6 +199,14 @@ public class Material {
this.enableBatchNumber = enableBatchNumber == null ? null : enableBatchNumber.trim();
}
public String getPosition() {
return position;
}
public void setPosition(String position) {
this.position = position == null ? null : position.trim();
}
public Long getTenantId() {
return tenantId;
}

70
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialExample.java
View File

@ -1375,6 +1375,76 @@ public class MaterialExample {
return (Criteria) this;
}
public Criteria andPositionIsNull() {
addCriterion("position is null");
return (Criteria) this;
}
public Criteria andPositionIsNotNull() {
addCriterion("position is not null");
return (Criteria) this;
}
public Criteria andPositionEqualTo(String value) {
addCriterion("position =", value, "position");
return (Criteria) this;
}
public Criteria andPositionNotEqualTo(String value) {
addCriterion("position <>", value, "position");
return (Criteria) this;
}
public Criteria andPositionGreaterThan(String value) {
addCriterion("position >", value, "position");
return (Criteria) this;
}
public Criteria andPositionGreaterThanOrEqualTo(String value) {
addCriterion("position >=", value, "position");
return (Criteria) this;
}
public Criteria andPositionLessThan(String value) {
addCriterion("position <", value, "position");
return (Criteria) this;
}
public Criteria andPositionLessThanOrEqualTo(String value) {
addCriterion("position <=", value, "position");
return (Criteria) this;
}
public Criteria andPositionLike(String value) {
addCriterion("position like", value, "position");
return (Criteria) this;
}
public Criteria andPositionNotLike(String value) {
addCriterion("position not like", value, "position");
return (Criteria) this;
}
public Criteria andPositionIn(List<String> values) {
addCriterion("position in", values, "position");
return (Criteria) this;
}
public Criteria andPositionNotIn(List<String> values) {
addCriterion("position not in", values, "position");
return (Criteria) this;
}
public Criteria andPositionBetween(String value1, String value2) {
addCriterion("position between", value1, value2, "position");
return (Criteria) this;
}
public Criteria andPositionNotBetween(String value1, String value2) {
addCriterion("position not between", value1, value2, "position");
return (Criteria) this;
}
public Criteria andTenantIdIsNull() {
addCriterion("tenant_id is null");
return (Criteria) this;

25
jshERP-boot/src/main/resources/mapper_xml/MaterialMapper.xml
View File

@ -21,6 +21,7 @@
<result column="other_field3" jdbcType="VARCHAR" property="otherField3" />
<result column="enable_serial_number" jdbcType="VARCHAR" property="enableSerialNumber" />
<result column="enable_batch_number" jdbcType="VARCHAR" property="enableBatchNumber" />
<result column="position" jdbcType="VARCHAR" property="position" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
<result column="delete_flag" jdbcType="VARCHAR" property="deleteFlag" />
</resultMap>
@ -85,7 +86,7 @@
<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, tenant_id, delete_flag
enable_batch_number, position, tenant_id, delete_flag
</sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.MaterialExample" resultMap="BaseResultMap">
select
@ -124,16 +125,16 @@
img_name, unit_id, expiry_num,
weight, enabled, other_field1,
other_field2, other_field3, enable_serial_number,
enable_batch_number, tenant_id, delete_flag
)
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}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,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
@ -195,6 +196,9 @@
<if test="enableBatchNumber != null">
enable_batch_number,
</if>
<if test="position != null">
position,
</if>
<if test="tenantId != null">
tenant_id,
</if>
@ -260,6 +264,9 @@
<if test="enableBatchNumber != null">
#{enableBatchNumber,jdbcType=VARCHAR},
</if>
<if test="position != null">
#{position,jdbcType=VARCHAR},
</if>
<if test="tenantId != null">
#{tenantId,jdbcType=BIGINT},
</if>
@ -334,6 +341,9 @@
<if test="record.enableBatchNumber != null">
enable_batch_number = #{record.enableBatchNumber,jdbcType=VARCHAR},
</if>
<if test="record.position != null">
position = #{record.position,jdbcType=VARCHAR},
</if>
<if test="record.tenantId != null">
tenant_id = #{record.tenantId,jdbcType=BIGINT},
</if>
@ -366,6 +376,7 @@
other_field3 = #{record.otherField3,jdbcType=VARCHAR},
enable_serial_number = #{record.enableSerialNumber,jdbcType=VARCHAR},
enable_batch_number = #{record.enableBatchNumber,jdbcType=VARCHAR},
position = #{record.position,jdbcType=VARCHAR},
tenant_id = #{record.tenantId,jdbcType=BIGINT},
delete_flag = #{record.deleteFlag,jdbcType=VARCHAR}
<if test="_parameter != null">
@ -429,6 +440,9 @@
<if test="enableBatchNumber != null">
enable_batch_number = #{enableBatchNumber,jdbcType=VARCHAR},
</if>
<if test="position != null">
position = #{position,jdbcType=VARCHAR},
</if>
<if test="tenantId != null">
tenant_id = #{tenantId,jdbcType=BIGINT},
</if>
@ -458,6 +472,7 @@
other_field3 = #{otherField3,jdbcType=VARCHAR},
enable_serial_number = #{enableSerialNumber,jdbcType=VARCHAR},
enable_batch_number = #{enableBatchNumber,jdbcType=VARCHAR},
position = #{position,jdbcType=VARCHAR},
tenant_id = #{tenantId,jdbcType=BIGINT},
delete_flag = #{deleteFlag,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT}