Skip to content
GitLab
Commit 628ead90 authored by 季圣华's avatar 季圣华
Browse files

给零售增加找零字段

parent c2c9a465
Hide whitespace changes
Inline Side-by-side
jshERP-boot/docs/jsh_erp.sql
View file @ 628ead90
......@@ -10,7 +10,7 @@ Target Server Type : MYSQL
Target Server Version : 50704
File Encoding : 65001
Date: 2021-12-09 00:41:43
Date: 2021-12-12 23:29:17
*/
SET FOREIGN_KEY_CHECKS=0;
......@@ -150,6 +150,7 @@ CREATE TABLE `jsh_depot_head` (
`creator` bigint(20) DEFAULT NULL COMMENT '操作员',
`account_id` bigint(20) DEFAULT NULL COMMENT '账户id',
`change_amount` decimal(24,6) DEFAULT NULL COMMENT '变动金额(收款/付款)',
`back_amount` decimal(24,6) DEFAULT NULL COMMENT '找零金额',
`total_price` decimal(24,6) DEFAULT NULL COMMENT '合计金额',
`pay_type` varchar(50) DEFAULT NULL COMMENT '付款类型(现金、记账等)',
`bill_type` varchar(50) DEFAULT NULL COMMENT '单据类型',
......@@ -174,22 +175,22 @@ CREATE TABLE `jsh_depot_head` (
-- ----------------------------
-- Records of jsh_depot_head
-- ----------------------------
INSERT INTO `jsh_depot_head` VALUES ('258', '其它', '采购订单', 'CGDD00000000630', 'CGDD00000000630', '2021-06-02 00:21:54', '2021-06-02 00:21:44', '57', '63', null, null, '-110.000000', '现付', null, null, null, null, null, null, null, null, null, null, '2', null, '63', '0');
INSERT INTO `jsh_depot_head` VALUES ('259', '入库', '采购', 'CGRK00000000631', 'CGRK00000000631', '2021-06-02 00:22:23', '2021-06-02 00:22:05', '57', '63', '17', '-110.000000', '-110.000000', '现付', null, null, null, null, '', '', '0.000000', '0.000000', '110.000000', '0.000000', '0', 'CGDD00000000630', '63', '0');
INSERT INTO `jsh_depot_head` VALUES ('260', '出库', '采购退货', 'CGTH00000000632', 'CGTH00000000632', '2021-06-02 00:22:35', '2021-06-02 00:22:26', '57', '63', '17', '22.000000', '22.000000', '现付', null, null, null, null, null, null, '0.000000', '0.000000', '22.000000', '0.000000', '0', null, '63', '0');
INSERT INTO `jsh_depot_head` VALUES ('261', '其它', '销售订单', 'XSDD00000000633', 'XSDD00000000633', '2021-06-02 00:22:48', '2021-06-02 00:22:39', '58', '63', null, null, '44.000000', '现付', null, null, null, '', null, null, null, null, null, null, '2', null, '63', '0');
INSERT INTO `jsh_depot_head` VALUES ('262', '出库', '销售', 'XSCK00000000634', 'XSCK00000000634', '2021-06-02 00:23:03', '2021-06-02 00:22:54', '58', '63', '17', '44.000000', '44.000000', '现付', null, null, null, '', '', '', '0.000000', '0.000000', '44.000000', '0.000000', '0', 'XSDD00000000633', '63', '0');
INSERT INTO `jsh_depot_head` VALUES ('263', '入库', '销售退货', 'XSTH00000000635', 'XSTH00000000635', '2021-06-02 00:23:12', '2021-06-02 00:23:05', '71', '63', '17', '-22.000000', '-22.000000', '现付', null, null, null, '', '', '', '0.000000', '0.000000', '22.000000', '0.000000', '0', null, '63', '0');
INSERT INTO `jsh_depot_head` VALUES ('264', '出库', '零售', 'LSCK00000000636', 'LSCK00000000636', '2021-06-02 00:23:21', '2021-06-02 00:23:14', '60', '63', '17', '22.000000', '22.000000', '现付', null, null, null, null, null, null, null, null, null, null, '0', null, '63', '0');
INSERT INTO `jsh_depot_head` VALUES ('265', '入库', '零售退货', 'LSTH00000000637', 'LSTH00000000637', '2021-06-02 00:23:29', '2021-06-02 00:23:23', '60', '63', '17', '-22.000000', '-22.000000', '现付', null, null, null, null, null, null, null, null, null, null, '0', null, '63', '0');
INSERT INTO `jsh_depot_head` VALUES ('266', '入库', '其它', 'QTRK00000000638', 'QTRK00000000638', '2021-06-02 00:23:48', '2021-06-02 00:23:36', '57', '63', null, null, '55.000000', '现付', null, null, null, null, null, null, null, null, null, null, '1', null, '63', '0');
INSERT INTO `jsh_depot_head` VALUES ('267', '出库', '其它', 'QTCK00000000639', 'QTCK00000000639', '2021-06-02 00:23:59', '2021-06-02 00:23:50', '58', '63', null, null, '30.000000', '现付', null, null, null, null, null, null, null, null, null, null, '0', null, '63', '0');
INSERT INTO `jsh_depot_head` VALUES ('268', '出库', '调拨', 'DBCK00000000640', 'DBCK00000000640', '2021-06-02 00:24:09', '2021-06-02 00:24:00', null, '63', null, null, '11.000000', '现付', null, null, null, null, null, null, null, null, null, null, '0', null, '63', '0');
INSERT INTO `jsh_depot_head` VALUES ('269', '其它', '组装单', 'ZZD00000000641', 'ZZD00000000641', '2021-06-02 00:24:29', '2021-06-02 00:24:11', null, '63', null, null, '0.000000', '现付', null, null, null, null, null, null, null, null, null, null, '0', null, '63', '0');
INSERT INTO `jsh_depot_head` VALUES ('270', '其它', '拆卸单', 'CXD00000000642', 'CXD00000000642', '2021-06-02 00:24:45', '2021-06-02 00:24:32', null, '63', null, null, '0.000000', '现付', null, null, null, null, null, null, null, null, null, null, '0', null, '63', '0');
INSERT INTO `jsh_depot_head` VALUES ('271', '入库', '采购', 'CGRK00000000651', 'CGRK00000000651', '2021-07-06 23:45:20', '2021-07-06 23:44:45', '57', '63', '17', '-20.000000', '-80.000000', '现付', null, null, null, null, '', '', '0.000000', '0.000000', '80.000000', '0.000000', '0', null, '63', '0');
INSERT INTO `jsh_depot_head` VALUES ('272', '出库', '销售', 'XSCK00000000652', 'XSCK00000000652', '2021-07-06 23:46:07', '2021-07-06 23:45:24', '58', '63', '17', '8.000000', '28.000000', '现付', null, null, null, '', '', '', '0.000000', '0.000000', '28.000000', '0.000000', '0', null, '63', '0');
INSERT INTO `jsh_depot_head` VALUES ('273', '入库', '采购', 'CGRK00000000658', 'CGRK00000000658', '2021-07-28 00:58:12', '2021-07-28 00:58:02', '57', '63', '17', '-60.000000', '-60.000000', '现付', null, null, null, null, '', '', '0.000000', '0.000000', '60.000000', '0.000000', '0', null, '63', '0');
INSERT INTO `jsh_depot_head` VALUES ('258', '其它', '采购订单', 'CGDD00000000630', 'CGDD00000000630', '2021-06-02 00:21:54', '2021-06-02 00:21:44', '57', '63', null, null, null, '-110.000000', '现付', null, null, null, null, null, null, null, null, null, null, '2', null, '63', '0');
INSERT INTO `jsh_depot_head` VALUES ('259', '入库', '采购', 'CGRK00000000631', 'CGRK00000000631', '2021-06-02 00:22:23', '2021-06-02 00:22:05', '57', '63', '17', '-110.000000', null, '-110.000000', '现付', null, null, null, null, '', '', '0.000000', '0.000000', '110.000000', '0.000000', '0', 'CGDD00000000630', '63', '0');
INSERT INTO `jsh_depot_head` VALUES ('260', '出库', '采购退货', 'CGTH00000000632', 'CGTH00000000632', '2021-06-02 00:22:35', '2021-06-02 00:22:26', '57', '63', '17', '22.000000', null, '22.000000', '现付', null, null, null, null, null, null, '0.000000', '0.000000', '22.000000', '0.000000', '0', null, '63', '0');
INSERT INTO `jsh_depot_head` VALUES ('261', '其它', '销售订单', 'XSDD00000000633', 'XSDD00000000633', '2021-06-02 00:22:48', '2021-06-02 00:22:39', '58', '63', null, null, null, '44.000000', '现付', null, null, null, '', null, null, null, null, null, null, '2', null, '63', '0');
INSERT INTO `jsh_depot_head` VALUES ('262', '出库', '销售', 'XSCK00000000634', 'XSCK00000000634', '2021-06-02 00:23:03', '2021-06-02 00:22:54', '58', '63', '17', '44.000000', null, '44.000000', '现付', null, null, null, '', '', '', '0.000000', '0.000000', '44.000000', '0.000000', '0', 'XSDD00000000633', '63', '0');
INSERT INTO `jsh_depot_head` VALUES ('263', '入库', '销售退货', 'XSTH00000000635', 'XSTH00000000635', '2021-06-02 00:23:12', '2021-06-02 00:23:05', '71', '63', '17', '-22.000000', null, '-22.000000', '现付', null, null, null, '', '', '', '0.000000', '0.000000', '22.000000', '0.000000', '0', null, '63', '0');
INSERT INTO `jsh_depot_head` VALUES ('264', '出库', '零售', 'LSCK00000000636', 'LSCK00000000636', '2021-06-02 00:23:21', '2021-06-02 00:23:14', '60', '63', '17', '22.000000', null, '22.000000', '现付', null, null, null, null, null, null, null, null, null, null, '0', null, '63', '0');
INSERT INTO `jsh_depot_head` VALUES ('265', '入库', '零售退货', 'LSTH00000000637', 'LSTH00000000637', '2021-06-02 00:23:29', '2021-06-02 00:23:23', '60', '63', '17', '-22.000000', null, '-22.000000', '现付', null, null, null, null, null, null, null, null, null, null, '0', null, '63', '0');
INSERT INTO `jsh_depot_head` VALUES ('266', '入库', '其它', 'QTRK00000000638', 'QTRK00000000638', '2021-06-02 00:23:48', '2021-06-02 00:23:36', '57', '63', null, null, null, '55.000000', '现付', null, null, null, null, null, null, null, null, null, null, '1', null, '63', '0');
INSERT INTO `jsh_depot_head` VALUES ('267', '出库', '其它', 'QTCK00000000639', 'QTCK00000000639', '2021-06-02 00:23:59', '2021-06-02 00:23:50', '58', '63', null, null, null, '30.000000', '现付', null, null, null, null, null, null, null, null, null, null, '0', null, '63', '0');
INSERT INTO `jsh_depot_head` VALUES ('268', '出库', '调拨', 'DBCK00000000640', 'DBCK00000000640', '2021-06-02 00:24:09', '2021-06-02 00:24:00', null, '63', null, null, null, '11.000000', '现付', null, null, null, null, null, null, null, null, null, null, '0', null, '63', '0');
INSERT INTO `jsh_depot_head` VALUES ('269', '其它', '组装单', 'ZZD00000000641', 'ZZD00000000641', '2021-06-02 00:24:29', '2021-06-02 00:24:11', null, '63', null, null, null, '0.000000', '现付', null, null, null, null, null, null, null, null, null, null, '0', null, '63', '0');
INSERT INTO `jsh_depot_head` VALUES ('270', '其它', '拆卸单', 'CXD00000000642', 'CXD00000000642', '2021-06-02 00:24:45', '2021-06-02 00:24:32', null, '63', null, null, null, '0.000000', '现付', null, null, null, null, null, null, null, null, null, null, '0', null, '63', '0');
INSERT INTO `jsh_depot_head` VALUES ('271', '入库', '采购', 'CGRK00000000651', 'CGRK00000000651', '2021-07-06 23:45:20', '2021-07-06 23:44:45', '57', '63', '17', '-20.000000', null, '-80.000000', '现付', null, null, null, null, '', '', '0.000000', '0.000000', '80.000000', '0.000000', '0', null, '63', '0');
INSERT INTO `jsh_depot_head` VALUES ('272', '出库', '销售', 'XSCK00000000652', 'XSCK00000000652', '2021-07-06 23:46:07', '2021-07-06 23:45:24', '58', '63', '17', '8.000000', null, '28.000000', '现付', null, null, null, '', '', '', '0.000000', '0.000000', '28.000000', '0.000000', '0', null, '63', '0');
INSERT INTO `jsh_depot_head` VALUES ('273', '入库', '采购', 'CGRK00000000658', 'CGRK00000000658', '2021-07-28 00:58:12', '2021-07-28 00:58:02', '57', '63', '17', '-60.000000', null, '-60.000000', '现付', null, null, null, null, '', '', '0.000000', '0.000000', '60.000000', '0.000000', '0', null, '63', '0');
-- ----------------------------
-- Table structure for jsh_depot_item
......
jshERP-boot/docs/数据库更新记录-首次安装请勿使用.txt
View file @ 628ead90
......@@ -1322,4 +1322,11 @@ insert into `jsh_function`(`number`, `name`, `parent_number`, `url`, `component`
values ('000112', '平台配置', '0001', '/system/platform_config', '/system/PlatformConfigList', '\0', '0175', '', '电脑版', '', 'profile', '0');
insert into `jsh_platform_config`(`platform_key`, `platform_key_info`, `platform_value`)
values ('register_flag', '注册启用标记', '1');
update jsh_msg set status='2' where id=2;
\ No newline at end of file
update jsh_msg set status='2' where id=2;
-- --------------------------------------------------------
-- 时间 2021年12月12日
-- by jishenghua
-- 给单据表增加找零字段backAmount
-- --------------------------------------------------------
alter table jsh_depot_head add back_amount decimal(24,6) DEFAULT NULL COMMENT '找零金额' after change_amount;
\ No newline at end of file
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotHead.java
View file @ 628ead90
......@@ -26,6 +26,8 @@ public class DepotHead {
private BigDecimal changeAmount;
private BigDecimal backAmount;
private BigDecimal totalPrice;
private String payType;
......@@ -146,6 +148,14 @@ public class DepotHead {
this.changeAmount = changeAmount;
}
public BigDecimal getBackAmount() {
return backAmount;
}
public void setBackAmount(BigDecimal backAmount) {
this.backAmount = backAmount;
}
public BigDecimal getTotalPrice() {
return totalPrice;
}
......
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java
View file @ 628ead90
......@@ -806,6 +806,66 @@ public class DepotHeadExample {
return (Criteria) this;
}
public Criteria andBackAmountIsNull() {
addCriterion("back_amount is null");
return (Criteria) this;
}
public Criteria andBackAmountIsNotNull() {
addCriterion("back_amount is not null");
return (Criteria) this;
}
public Criteria andBackAmountEqualTo(BigDecimal value) {
addCriterion("back_amount =", value, "backAmount");
return (Criteria) this;
}
public Criteria andBackAmountNotEqualTo(BigDecimal value) {
addCriterion("back_amount <>", value, "backAmount");
return (Criteria) this;
}
public Criteria andBackAmountGreaterThan(BigDecimal value) {
addCriterion("back_amount >", value, "backAmount");
return (Criteria) this;
}
public Criteria andBackAmountGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("back_amount >=", value, "backAmount");
return (Criteria) this;
}
public Criteria andBackAmountLessThan(BigDecimal value) {
addCriterion("back_amount <", value, "backAmount");
return (Criteria) this;
}
public Criteria andBackAmountLessThanOrEqualTo(BigDecimal value) {
addCriterion("back_amount <=", value, "backAmount");
return (Criteria) this;
}
public Criteria andBackAmountIn(List<BigDecimal> values) {
addCriterion("back_amount in", values, "backAmount");
return (Criteria) this;
}
public Criteria andBackAmountNotIn(List<BigDecimal> values) {
addCriterion("back_amount not in", values, "backAmount");
return (Criteria) this;
}
public Criteria andBackAmountBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("back_amount between", value1, value2, "backAmount");
return (Criteria) this;
}
public Criteria andBackAmountNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("back_amount not between", value1, value2, "backAmount");
return (Criteria) this;
}
public Criteria andTotalPriceIsNull() {
addCriterion("total_price is null");
return (Criteria) this;
......
jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapper.xml
View file @ 628ead90
......@@ -13,6 +13,7 @@
<result column="creator" jdbcType="BIGINT" property="creator" />
<result column="account_id" jdbcType="BIGINT" property="accountId" />
<result column="change_amount" jdbcType="DECIMAL" property="changeAmount" />
<result column="back_amount" jdbcType="DECIMAL" property="backAmount" />
<result column="total_price" jdbcType="DECIMAL" property="totalPrice" />
<result column="pay_type" jdbcType="VARCHAR" property="payType" />
<result column="bill_type" jdbcType="VARCHAR" property="billType" />
......@@ -90,9 +91,9 @@
</sql>
<sql id="Base_Column_List">
id, type, sub_type, default_number, number, create_time, oper_time, organ_id, creator,
account_id, change_amount, total_price, pay_type, bill_type, remark, file_name, sales_man,
account_id_list, account_money_list, discount, discount_money, discount_last_money,
other_money, status, link_number, tenant_id, delete_flag
account_id, change_amount, back_amount, total_price, pay_type, bill_type, remark,
file_name, sales_man, account_id_list, account_money_list, discount, discount_money,
discount_last_money, other_money, status, link_number, tenant_id, delete_flag
</sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample" resultMap="BaseResultMap">
select
......@@ -128,23 +129,23 @@
insert into jsh_depot_head (id, type, sub_type,
default_number, number, create_time,
oper_time, organ_id, creator,
account_id, change_amount, total_price,
pay_type, bill_type, remark,
file_name, sales_man, account_id_list,
account_money_list, discount, discount_money,
discount_last_money, other_money, status,
link_number, tenant_id, delete_flag
)
account_id, change_amount, back_amount,
total_price, pay_type, bill_type,
remark, file_name, sales_man,
account_id_list, account_money_list, discount,
discount_money, discount_last_money, other_money,
status, link_number, tenant_id,
delete_flag)
values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{subType,jdbcType=VARCHAR},
#{defaultNumber,jdbcType=VARCHAR}, #{number,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
#{operTime,jdbcType=TIMESTAMP}, #{organId,jdbcType=BIGINT}, #{creator,jdbcType=BIGINT},
#{accountId,jdbcType=BIGINT}, #{changeAmount,jdbcType=DECIMAL}, #{totalPrice,jdbcType=DECIMAL},
#{payType,jdbcType=VARCHAR}, #{billType,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR},
#{fileName,jdbcType=VARCHAR}, #{salesMan,jdbcType=VARCHAR}, #{accountIdList,jdbcType=VARCHAR},
#{accountMoneyList,jdbcType=VARCHAR}, #{discount,jdbcType=DECIMAL}, #{discountMoney,jdbcType=DECIMAL},
#{discountLastMoney,jdbcType=DECIMAL}, #{otherMoney,jdbcType=DECIMAL}, #{status,jdbcType=VARCHAR},
#{linkNumber,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}
)
#{accountId,jdbcType=BIGINT}, #{changeAmount,jdbcType=DECIMAL}, #{backAmount,jdbcType=DECIMAL},
#{totalPrice,jdbcType=DECIMAL}, #{payType,jdbcType=VARCHAR}, #{billType,jdbcType=VARCHAR},
#{remark,jdbcType=VARCHAR}, #{fileName,jdbcType=VARCHAR}, #{salesMan,jdbcType=VARCHAR},
#{accountIdList,jdbcType=VARCHAR}, #{accountMoneyList,jdbcType=VARCHAR}, #{discount,jdbcType=DECIMAL},
#{discountMoney,jdbcType=DECIMAL}, #{discountLastMoney,jdbcType=DECIMAL}, #{otherMoney,jdbcType=DECIMAL},
#{status,jdbcType=VARCHAR}, #{linkNumber,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT},
#{deleteFlag,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.DepotHead">
insert into jsh_depot_head
......@@ -182,6 +183,9 @@
<if test="changeAmount != null">
change_amount,
</if>
<if test="backAmount != null">
back_amount,
</if>
<if test="totalPrice != null">
total_price,
</if>
......@@ -265,6 +269,9 @@
<if test="changeAmount != null">
#{changeAmount,jdbcType=DECIMAL},
</if>
<if test="backAmount != null">
#{backAmount,jdbcType=DECIMAL},
</if>
<if test="totalPrice != null">
#{totalPrice,jdbcType=DECIMAL},
</if>
......@@ -357,6 +364,9 @@
<if test="record.changeAmount != null">
change_amount = #{record.changeAmount,jdbcType=DECIMAL},
</if>
<if test="record.backAmount != null">
back_amount = #{record.backAmount,jdbcType=DECIMAL},
</if>
<if test="record.totalPrice != null">
total_price = #{record.totalPrice,jdbcType=DECIMAL},
</if>
......@@ -423,6 +433,7 @@
creator = #{record.creator,jdbcType=BIGINT},
account_id = #{record.accountId,jdbcType=BIGINT},
change_amount = #{record.changeAmount,jdbcType=DECIMAL},
back_amount = #{record.backAmount,jdbcType=DECIMAL},
total_price = #{record.totalPrice,jdbcType=DECIMAL},
pay_type = #{record.payType,jdbcType=VARCHAR},
bill_type = #{record.billType,jdbcType=VARCHAR},
......@@ -476,6 +487,9 @@
<if test="changeAmount != null">
change_amount = #{changeAmount,jdbcType=DECIMAL},
</if>
<if test="backAmount != null">
back_amount = #{backAmount,jdbcType=DECIMAL},
</if>
<if test="totalPrice != null">
total_price = #{totalPrice,jdbcType=DECIMAL},
</if>
......@@ -539,6 +553,7 @@
creator = #{creator,jdbcType=BIGINT},
account_id = #{accountId,jdbcType=BIGINT},
change_amount = #{changeAmount,jdbcType=DECIMAL},
back_amount = #{backAmount,jdbcType=DECIMAL},
total_price = #{totalPrice,jdbcType=DECIMAL},
pay_type = #{payType,jdbcType=VARCHAR},
bill_type = #{billType,jdbcType=VARCHAR},
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment