|
@@ -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) {
//新增模式下
diff --git a/src/main/java/com/jsh/erp/datasource/entities/DepotHead.java b/src/main/java/com/jsh/erp/datasource/entities/DepotHead.java
index 63f2d014..1d06bbdf 100644
--- a/src/main/java/com/jsh/erp/datasource/entities/DepotHead.java
+++ b/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;
}
diff --git a/src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java b/src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java
index 89d87948..e3ae76fa 100644
--- a/src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java
+++ b/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 values) {
+ addCriterion("bill_type in", values, "billType");
+ return (Criteria) this;
+ }
+
+ public Criteria andBillTypeNotIn(List 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;
diff --git a/src/main/resources/mapper_xml/DepotHeadMapper.xml b/src/main/resources/mapper_xml/DepotHeadMapper.xml
index 7a5d327c..4f00a422 100644
--- a/src/main/resources/mapper_xml/DepotHeadMapper.xml
+++ b/src/main/resources/mapper_xml/DepotHeadMapper.xml
@@ -16,6 +16,7 @@
+
@@ -92,9 +93,10 @@
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
|