给单据主表增加单据类型字段

docs/数据库更新记录-方便升级.txt

@@ -1038,4 +1038,11 @@ CREATE TABLE `jsh_platform_config` (
 ) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COMMENT='平台参数';
 
 INSERT INTO `jsh_platform_config` VALUES ('1', 'platform_name', '平台名称', '华夏ERP');
-INSERT INTO `jsh_platform_config` VALUES ('2', 'activation_code', '激活码', null);
\ No newline at end of file
+INSERT INTO `jsh_platform_config` VALUES ('2', 'activation_code', '激活码', null);
+
+-- --------------------------------------------------------
+-- 时间 2020年11月24日
+-- by jishenghua
+-- 给单据主表增加单据类型字段bill_type
+-- --------------------------------------------------------
+alter table jsh_depot_head add bill_type varchar(50) DEFAULT NULL COMMENT '单据类型' after pay_type;
\ No newline at end of file

erp_web/js/pages/bill/bill_detail.js

@@ -250,7 +250,7 @@
                             }
                             $("#bill .AccountIdShow").text(accountIdShow);
                         }
-                        $("#bill .OrganIdShow").text(data.organName);
+                        $("#bill .OrganIdShow").text(data.organName==null ? "":data.organName);
                         $("#bill .OperTimeShow").text(data.operTimeStr);
                         $("#bill .NumberShow").text(data.number);
                         $("#bill .LinkNumberShow").text(data.linkNumber? data.linkNumber : "");

erp_web/pages/bill/other_in_list.html

@@ -121,9 +121,13 @@
             <td style="padding:5px;width:140px;">
                 <span id="NumberShow"></span>
             </td>
-            <td style="width:70px;"></td>
-            <td style="padding:5px;width:140px;"></td>
-            <td style="width:100px;"></td>
+            <td style="width:70px;">关联单号：</td>
+            <td style="padding:5px;width:140px;">
+                <span id="LinkNumberShow"></span>
+            </td>
+            <td style="width:100px;">
+                <span id="billTypeShow"></span>
+            </td>
         </tr>
         <tr>
             <td colspan="9" style="width: 1130px;">
@@ -423,6 +427,7 @@
         $("#DebtShow").text(debt);
         $("#AccountDayShow").text(res.accountDay);  //结算天数
         $("#LinkNumberShow").text(res.linkNumber); //关联订单号
+        $("#billTypeShow").text(res.billType); //单据类型
         var otherMoney = res.otherMoney?res.otherMoney:0;
         if(otherMoney!=0 && res.otherMoneyList && res.otherMoneyItem){
             var itemArr = res.otherMoneyList.split(","); //支出项目id列表
@@ -700,11 +705,6 @@
                     return;
                 }
             }
-            //输入框提示
-            if(!$('#OrganId').combobox('getValue')){
-                $.messager.alert('提示','请选择往来单位！','warning');
-                return;
-            }
             //进行明细的校验
             if(depotHeadID ==0) {
                 //新增模式下

erp_web/pages/bill/other_out_list.html

@@ -115,9 +115,13 @@
             <td style="padding:5px;width:140px;">
                 <span id="NumberShow"></span>
             </td>
-            <td style="width:70px;"></td>
-            <td style="padding:5px;width:140px;"></td>
-            <td style="width:100px;"></td>
+            <td style="width:70px;">关联单号：</td>
+            <td style="padding:5px;width:140px;">
+                <span id="LinkNumberShow"></span>
+            </td>
+            <td style="width:100px;">
+                <span id="billTypeShow"></span>
+            </td>
         </tr>
         <tr>
             <td colspan="9" style="width: 1130px;">
@@ -416,6 +420,7 @@
         $("#DebtShow").text(debt);
         $("#AccountDayShow").text(res.accountDay);  //结算天数
         $("#LinkNumberShow").text(res.linkNumber); //关联订单号
+        $("#billTypeShow").text(res.billType); //单据类型
         var otherMoney = res.otherMoney?res.otherMoney:0;
         if(otherMoney!=0 && res.otherMoneyList && res.otherMoneyItem){
             var itemArr = res.otherMoneyList.split(","); //支出项目id列表
@@ -693,11 +698,6 @@
                     return;
                 }
             }
-            //输入框提示
-            if(!$('#OrganId').combobox('getValue')){
-                $.messager.alert('提示','请选择往来单位！','warning');
-                return;
-            }
             //进行明细的校验
             if(depotHeadID ==0) {
                 //新增模式下

src/main/java/com/jsh/erp/datasource/entities/DepotHead.java

@@ -32,6 +32,8 @@ public class DepotHead {
 
     private String payType;
 
+    private String billType;
+
     private String remark;
 
     private String salesMan;
@@ -174,6 +176,14 @@ public class DepotHead {
         this.payType = payType == null ? null : payType.trim();
     }
 
+    public String getBillType() {
+        return billType;
+    }
+
+    public void setBillType(String billType) {
+        this.billType = billType == null ? null : billType.trim();
+    }
+
     public String getRemark() {
         return remark;
     }

src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java

@@ -996,6 +996,76 @@ public class DepotHeadExample {
             return (Criteria) this;
         }
 
+        public Criteria andBillTypeIsNull() {
+            addCriterion("bill_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillTypeIsNotNull() {
+            addCriterion("bill_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillTypeEqualTo(String value) {
+            addCriterion("bill_type =", value, "billType");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillTypeNotEqualTo(String value) {
+            addCriterion("bill_type <>", value, "billType");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillTypeGreaterThan(String value) {
+            addCriterion("bill_type >", value, "billType");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("bill_type >=", value, "billType");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillTypeLessThan(String value) {
+            addCriterion("bill_type <", value, "billType");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillTypeLessThanOrEqualTo(String value) {
+            addCriterion("bill_type <=", value, "billType");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillTypeLike(String value) {
+            addCriterion("bill_type like", value, "billType");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillTypeNotLike(String value) {
+            addCriterion("bill_type not like", value, "billType");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillTypeIn(List<String> values) {
+            addCriterion("bill_type in", values, "billType");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillTypeNotIn(List<String> values) {
+            addCriterion("bill_type not in", values, "billType");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillTypeBetween(String value1, String value2) {
+            addCriterion("bill_type between", value1, value2, "billType");
+            return (Criteria) this;
+        }
+
+        public Criteria andBillTypeNotBetween(String value1, String value2) {
+            addCriterion("bill_type not between", value1, value2, "billType");
+            return (Criteria) this;
+        }
+
         public Criteria andRemarkIsNull() {
             addCriterion("remark is null");
             return (Criteria) this;

src/main/resources/mapper_xml/DepotHeadMapper.xml

@@ -16,6 +16,7 @@
     <result column="change_amount" jdbcType="DECIMAL" property="changeAmount" />
     <result column="total_price" jdbcType="DECIMAL" property="totalPrice" />
     <result column="pay_type" jdbcType="VARCHAR" property="payType" />
+    <result column="bill_type" jdbcType="VARCHAR" property="billType" />
     <result column="remark" jdbcType="VARCHAR" property="remark" />
     <result column="sales_man" jdbcType="VARCHAR" property="salesMan" />
     <result column="account_id_list" jdbcType="VARCHAR" property="accountIdList" />
@@ -92,9 +93,10 @@
   </sql>
   <sql id="Base_Column_List">
     id, type, sub_type, default_number, number, create_time, oper_time, organ_id, hands_person_id, 
-    creator, account_id, change_amount, total_price, pay_type, remark, sales_man, account_id_list, 
-    account_money_list, discount, discount_money, discount_last_money, other_money, other_money_list, 
-    other_money_item, account_day, status, link_number, tenant_id, delete_flag
+    creator, account_id, change_amount, total_price, pay_type, bill_type, remark, sales_man, 
+    account_id_list, account_money_list, discount, discount_money, discount_last_money, 
+    other_money, other_money_list, other_money_item, account_day, status, link_number, 
+    tenant_id, delete_flag
   </sql>
   <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample" resultMap="BaseResultMap">
     select
@@ -131,22 +133,24 @@
       default_number, number, create_time, 
       oper_time, organ_id, hands_person_id, 
       creator, account_id, change_amount, 
-      total_price, pay_type, remark, 
-      sales_man, account_id_list, account_money_list, 
-      discount, discount_money, discount_last_money, 
-      other_money, other_money_list, other_money_item, 
-      account_day, status, link_number, 
-      tenant_id, delete_flag)
+      total_price, pay_type, bill_type, 
+      remark, sales_man, account_id_list, 
+      account_money_list, discount, discount_money, 
+      discount_last_money, other_money, other_money_list, 
+      other_money_item, account_day, 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}, #{handsPersonId,jdbcType=BIGINT}, 
       #{creator,jdbcType=BIGINT}, #{accountId,jdbcType=BIGINT}, #{changeAmount,jdbcType=DECIMAL}, 
-      #{totalPrice,jdbcType=DECIMAL}, #{payType,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, 
-      #{salesMan,jdbcType=VARCHAR}, #{accountIdList,jdbcType=VARCHAR}, #{accountMoneyList,jdbcType=VARCHAR}, 
-      #{discount,jdbcType=DECIMAL}, #{discountMoney,jdbcType=DECIMAL}, #{discountLastMoney,jdbcType=DECIMAL}, 
-      #{otherMoney,jdbcType=DECIMAL}, #{otherMoneyList,jdbcType=VARCHAR}, #{otherMoneyItem,jdbcType=VARCHAR}, 
-      #{accountDay,jdbcType=INTEGER}, #{status,jdbcType=VARCHAR}, #{linkNumber,jdbcType=VARCHAR}, 
-      #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR})
+      #{totalPrice,jdbcType=DECIMAL}, #{payType,jdbcType=VARCHAR}, #{billType,jdbcType=VARCHAR}, 
+      #{remark,jdbcType=VARCHAR}, #{salesMan,jdbcType=VARCHAR}, #{accountIdList,jdbcType=VARCHAR}, 
+      #{accountMoneyList,jdbcType=VARCHAR}, #{discount,jdbcType=DECIMAL}, #{discountMoney,jdbcType=DECIMAL}, 
+      #{discountLastMoney,jdbcType=DECIMAL}, #{otherMoney,jdbcType=DECIMAL}, #{otherMoneyList,jdbcType=VARCHAR}, 
+      #{otherMoneyItem,jdbcType=VARCHAR}, #{accountDay,jdbcType=INTEGER}, #{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
@@ -193,6 +197,9 @@
       <if test="payType != null">
         pay_type,
       </if>
+      <if test="billType != null">
+        bill_type,
+      </if>
       <if test="remark != null">
         remark,
       </if>
@@ -282,6 +289,9 @@
       <if test="payType != null">
         #{payType,jdbcType=VARCHAR},
       </if>
+      <if test="billType != null">
+        #{billType,jdbcType=VARCHAR},
+      </if>
       <if test="remark != null">
         #{remark,jdbcType=VARCHAR},
       </if>
@@ -380,6 +390,9 @@
       <if test="record.payType != null">
         pay_type = #{record.payType,jdbcType=VARCHAR},
       </if>
+      <if test="record.billType != null">
+        bill_type = #{record.billType,jdbcType=VARCHAR},
+      </if>
       <if test="record.remark != null">
         remark = #{record.remark,jdbcType=VARCHAR},
       </if>
@@ -446,6 +459,7 @@
       change_amount = #{record.changeAmount,jdbcType=DECIMAL},
       total_price = #{record.totalPrice,jdbcType=DECIMAL},
       pay_type = #{record.payType,jdbcType=VARCHAR},
+      bill_type = #{record.billType,jdbcType=VARCHAR},
       remark = #{record.remark,jdbcType=VARCHAR},
       sales_man = #{record.salesMan,jdbcType=VARCHAR},
       account_id_list = #{record.accountIdList,jdbcType=VARCHAR},
@@ -507,6 +521,9 @@
       <if test="payType != null">
         pay_type = #{payType,jdbcType=VARCHAR},
       </if>
+      <if test="billType != null">
+        bill_type = #{billType,jdbcType=VARCHAR},
+      </if>
       <if test="remark != null">
         remark = #{remark,jdbcType=VARCHAR},
       </if>
@@ -570,6 +587,7 @@
       change_amount = #{changeAmount,jdbcType=DECIMAL},
       total_price = #{totalPrice,jdbcType=DECIMAL},
       pay_type = #{payType,jdbcType=VARCHAR},
+      bill_type = #{billType,jdbcType=VARCHAR},
       remark = #{remark,jdbcType=VARCHAR},
       sales_man = #{salesMan,jdbcType=VARCHAR},
       account_id_list = #{accountIdList,jdbcType=VARCHAR},

src/test/resources/generatorConfig.xml

@@ -5,7 +5,7 @@
 
 <generatorConfiguration>
     <classPathEntry
-            location="E:\maven\maven-repository\mysql\mysql-connector-java\5.1.47\mysql-connector-java-5.1.47.jar"/>
+            location="E:\maven\maven-repository\mysql\mysql-connector-java\5.1.30\mysql-connector-java-5.1.30.jar"/>
 
     <context id="DB2Tables" targetRuntime="MyBatis3" defaultModelType="flat">
         <commentGenerator>