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

优化表结构

parent 70f0dae4
Expand all Show whitespace changes
Inline Side-by-side
docs/jsh_erp.sql
View file @ a4774016
This diff is collapsed.
docs/数据库更新记录-方便升级.txt
View file @ a4774016
......@@ -48,7 +48,7 @@ INSERT INTO `jsh_functions`(`Number`, `Name`, `PNumber`, `URL`, `State`, `Sort`,
-- ----------------------------
-- 删除单据主表供应商id字段对应外键约束
-- ----------------------------
ALTER TABLE jsh_depothead DROP FOREIGN KEY jsh_depothead_ibfk_3;
ALTER TABLE jsh_depot_head DROP FOREIGN KEY jsh_depot_head_ibfk_3;
-- ----------------------------
-- 序列号表添加单据主表id字段，用于跟踪序列号流向
-- ----------------------------
......@@ -66,7 +66,7 @@ alter table jsh_serial_number change delete_Flag delete_Flag varchar(1) DEFAULT
-- ----------------------------
-- 删除单据子表单据主表id字段对应外键约束
-- ----------------------------
ALTER TABLE jsh_depotitem DROP FOREIGN KEY jsh_depotitem_ibfk_1;
ALTER TABLE jsh_depot_item DROP FOREIGN KEY jsh_depot_item_ibfk_1;
-- ----------------------------
-- 时间：2019年2月1日
-- version：1.0.2
......@@ -309,8 +309,8 @@ where Id = 5;
-- version：1.0.8
-- 改状态字段的类型，增加关联单据字段
-- ----------------------------
alter table jsh_depothead change Status Status varchar(1) DEFAULT '0' COMMENT '状态，0未审核、1已审核、2已转采购|销售';
alter table jsh_depothead add `LinkNumber` varchar(50) DEFAULT null COMMENT '关联订单号';
alter table jsh_depot_head change Status Status varchar(1) DEFAULT '0' COMMENT '状态，0未审核、1已审核、2已转采购|销售';
alter table jsh_depot_head add `LinkNumber` varchar(50) DEFAULT null COMMENT '关联订单号';
-- ----------------------------
-- 时间：2019年3月12日
-- version：1.0.9
......@@ -430,8 +430,8 @@ alter table jsh_asset add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
alter table jsh_assetcategory add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
alter table jsh_assetname add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
alter table jsh_depot add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
alter table jsh_depothead add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
alter table jsh_depotitem add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
alter table jsh_depot_head add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
alter table jsh_depot_item add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
alter table jsh_inoutitem add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
alter table jsh_log add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
alter table jsh_material add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
......@@ -487,10 +487,10 @@ alter table jsh_asset add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标
alter table jsh_assetcategory add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
-- 资产信息表 jsh_assetname
alter table jsh_assetname add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
-- 单据主表 jsh_depothead
alter table jsh_depothead add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
-- 单据子表 jsh_depotitem
alter table jsh_depotitem add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
-- 单据主表 jsh_depot_head
alter table jsh_depot_head add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
-- 单据子表 jsh_depot_item
alter table jsh_depot_item add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
-- 收支项目表 jsh_inoutitem
alter table jsh_inoutitem add delete_Flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
......@@ -529,16 +529,16 @@ ALTER TABLE jsh_assetname DROP FOREIGN KEY FKA4ADCCF866BC8AD3;
-- ----------------------------
-- 删除单据主表对应外键约束
-- ----------------------------
ALTER TABLE jsh_depothead DROP FOREIGN KEY FK2A80F214AAE50527;
ALTER TABLE jsh_depothead DROP FOREIGN KEY jsh_depothead_ibfk_1;
ALTER TABLE jsh_depothead DROP FOREIGN KEY jsh_depothead_ibfk_4;
ALTER TABLE jsh_depothead DROP FOREIGN KEY jsh_depothead_ibfk_5;
ALTER TABLE jsh_depot_head DROP FOREIGN KEY FK2A80F214AAE50527;
ALTER TABLE jsh_depot_head DROP FOREIGN KEY jsh_depot_head_ibfk_1;
ALTER TABLE jsh_depot_head DROP FOREIGN KEY jsh_depot_head_ibfk_4;
ALTER TABLE jsh_depot_head DROP FOREIGN KEY jsh_depot_head_ibfk_5;
-- ----------------------------
-- 删除单据子表对应外键约束
-- ----------------------------
ALTER TABLE jsh_depotitem DROP FOREIGN KEY FK2A819F47729F5392;
ALTER TABLE jsh_depotitem DROP FOREIGN KEY FK2A819F479485B3F5;
ALTER TABLE jsh_depotitem DROP FOREIGN KEY jsh_depotitem_ibfk_2;
ALTER TABLE jsh_depot_item DROP FOREIGN KEY FK2A819F47729F5392;
ALTER TABLE jsh_depot_item DROP FOREIGN KEY FK2A819F479485B3F5;
ALTER TABLE jsh_depot_item DROP FOREIGN KEY jsh_depot_item_ibfk_2;
-- ----------------------------
-- 删除操作日志表对应外键约束
-- ----------------------------
......@@ -732,15 +732,15 @@ ROW_FORMAT=COMPACT
-- 时间 2020-02-16
-- by jishenghua
-- ----------------------------
alter table jsh_depotitem add material_extend_id bigint(20) DEFAULT NULL COMMENT '商品扩展id' after MaterialId;
alter table jsh_depot_item add material_extend_id bigint(20) DEFAULT NULL COMMENT '商品扩展id' after MaterialId;
-- ----------------------------
-- 给单据主表删除字段ProjectId 和 AllocationProjectId
-- 时间 2020-02-18
-- by jishenghua
-- ----------------------------
alter table jsh_depothead drop column ProjectId;
alter table jsh_depothead drop column AllocationProjectId;
alter table jsh_depot_head drop column ProjectId;
alter table jsh_depot_head drop column AllocationProjectId;
-- ----------------------------
-- 给计量单位表增加基础单位、副单位、比例三个字段
......@@ -903,3 +903,111 @@ alter table jsh_serial_number change delete_Flag delete_flag varchar(1) DEFAULT
alter table jsh_serial_number change create_Time create_time datetime DEFAULT NULL COMMENT '创建时间';
alter table jsh_serial_number change update_Time update_time datetime DEFAULT NULL COMMENT '更新时间';
alter table jsh_serial_number change depothead_Id depot_head_id bigint(20) DEFAULT NULL COMMENT '单据主表id，用于跟踪序列号流向';
alter table jsh_supplier change phonenum phone_num varchar(30) DEFAULT NULL COMMENT '联系电话';
alter table jsh_supplier change AdvanceIn advance_in decimal(24,6) DEFAULT '0.000000' COMMENT '预收款';
alter table jsh_supplier change BeginNeedGet begin_need_get decimal(24,6) DEFAULT NULL COMMENT '期初应收';
alter table jsh_supplier change BeginNeedPay begin_need_pay decimal(24,6) DEFAULT NULL COMMENT '期初应付';
alter table jsh_supplier change AllNeedGet all_need_get decimal(24,6) DEFAULT NULL COMMENT '累计应收';
alter table jsh_supplier change AllNeedPay all_need_pay decimal(24,6) DEFAULT NULL COMMENT '累计应付';
alter table jsh_supplier change taxNum tax_num varchar(50) DEFAULT NULL COMMENT '纳税人识别号';
alter table jsh_supplier change bankName bank_name varchar(50) DEFAULT NULL COMMENT '开户行';
alter table jsh_supplier change accountNumber account_number varchar(50) DEFAULT NULL COMMENT '账号';
alter table jsh_supplier change taxRate tax_rate decimal(24,6) DEFAULT NULL COMMENT '税率';
alter table jsh_supplier change delete_Flag delete_flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
alter table jsh_accounthead rename to jsh_account_head;
alter table jsh_account_head change Id id bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键';
alter table jsh_account_head change Type type varchar(50) DEFAULT NULL COMMENT '类型(支出/收入/收款/付款/转账)';
alter table jsh_account_head change OrganId organ_id bigint(20) DEFAULT NULL COMMENT '单位Id(收款/付款单位)';
alter table jsh_account_head change HandsPersonId hands_person_id bigint(20) DEFAULT NULL COMMENT '经手人id';
alter table jsh_account_head change ChangeAmount change_amount decimal(24,6) DEFAULT NULL COMMENT '变动金额(优惠/收款/付款/实付)';
alter table jsh_account_head change TotalPrice total_price decimal(24,6) DEFAULT NULL COMMENT '合计金额';
alter table jsh_account_head change AccountId account_id bigint(20) DEFAULT NULL COMMENT '账户(收款/付款)';
alter table jsh_account_head change BillNo bill_no varchar(50) DEFAULT NULL COMMENT '单据编号';
alter table jsh_account_head change BillTime bill_time datetime DEFAULT NULL COMMENT '单据日期';
alter table jsh_account_head change Remark remark varchar(100) DEFAULT NULL COMMENT '备注';
alter table jsh_account_head change delete_Flag delete_flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
alter table jsh_accountitem rename to jsh_account_item;
alter table jsh_account_item change Id id bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键';
alter table jsh_account_item change HeaderId header_id bigint(20) NOT NULL COMMENT '表头Id';
alter table jsh_account_item change AccountId account_id bigint(20) DEFAULT NULL COMMENT '账户Id';
alter table jsh_account_item change InOutItemId in_out_item_id bigint(20) DEFAULT NULL COMMENT '收支项目Id';
alter table jsh_account_item change EachAmount each_amount decimal(24,6) DEFAULT NULL COMMENT '单项金额';
alter table jsh_account_item change Remark remark varchar(100) DEFAULT NULL COMMENT '单据备注';
alter table jsh_account_item change delete_Flag delete_flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
alter table jsh_material change Id id bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键';
alter table jsh_material change CategoryId category_id bigint(20) DEFAULT NULL COMMENT '产品类型id';
alter table jsh_material change Name name varchar(50) DEFAULT NULL COMMENT '名称';
alter table jsh_material change Mfrs mfrs varchar(50) DEFAULT NULL COMMENT '制造商';
alter table jsh_material change SafetyStock safety_stock decimal(24,6) DEFAULT NULL COMMENT '安全存量（KG）';
alter table jsh_material change Model model varchar(50) DEFAULT NULL COMMENT '型号';
alter table jsh_material change Standard standard varchar(50) DEFAULT NULL COMMENT '规格';
alter table jsh_material change Color color varchar(50) DEFAULT NULL COMMENT '颜色';
alter table jsh_material change Unit unit varchar(50) DEFAULT NULL COMMENT '单位-单个';
alter table jsh_material change Remark remark varchar(100) DEFAULT NULL COMMENT '备注';
alter table jsh_material change UnitId unit_id bigint(20) DEFAULT NULL COMMENT '计量单位Id';
alter table jsh_material change Enabled enabled bit(1) DEFAULT NULL COMMENT '启用 0-禁用 1-启用';
alter table jsh_material change OtherField1 other_field1 varchar(50) DEFAULT NULL COMMENT '自定义1';
alter table jsh_material change OtherField2 other_field2 varchar(50) DEFAULT NULL COMMENT '自定义2';
alter table jsh_material change OtherField3 other_field3 varchar(50) DEFAULT NULL COMMENT '自定义3';
alter table jsh_material change enableSerialNumber enable_serial_number varchar(1) DEFAULT '0' COMMENT '是否开启序列号，0否，1是';
alter table jsh_material change delete_Flag delete_flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
alter table jsh_depot_head rename to jsh_depot_head;
alter table jsh_depot_head change Id id bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键';
alter table jsh_depot_head change Type type varchar(50) DEFAULT NULL COMMENT '类型(出库/入库)';
alter table jsh_depot_head change SubType sub_type varchar(50) DEFAULT NULL COMMENT '出入库分类';
alter table jsh_depot_head change DefaultNumber default_number varchar(50) DEFAULT NULL COMMENT '初始票据号';
alter table jsh_depot_head change Number number varchar(50) DEFAULT NULL COMMENT '票据号';
alter table jsh_depot_head change OperPersonName oper_person_name varchar(50) DEFAULT NULL COMMENT '操作员名字';
alter table jsh_depot_head change CreateTime create_time datetime DEFAULT NULL COMMENT '创建时间';
alter table jsh_depot_head change OperTime oper_time datetime DEFAULT NULL COMMENT '出入库时间';
alter table jsh_depot_head change OrganId organ_id bigint(20) DEFAULT NULL COMMENT '供应商id';
alter table jsh_depot_head change HandsPersonId hands_person_id bigint(20) DEFAULT NULL COMMENT '采购/领料-经手人id';
alter table jsh_depot_head change AccountId account_id bigint(20) DEFAULT NULL COMMENT '账户id';
alter table jsh_depot_head change ChangeAmount change_amount decimal(24,6) DEFAULT NULL COMMENT '变动金额(收款/付款)';
alter table jsh_depot_head change TotalPrice total_price decimal(24,6) DEFAULT NULL COMMENT '合计金额';
alter table jsh_depot_head change PayType pay_type varchar(50) DEFAULT NULL COMMENT '付款类型(现金、记账等)';
alter table jsh_depot_head change Remark remark varchar(1000) DEFAULT NULL COMMENT '备注';
alter table jsh_depot_head change Salesman sales_man varchar(50) DEFAULT NULL COMMENT '业务员（可以多个）';
alter table jsh_depot_head change AccountIdList account_id_list varchar(50) DEFAULT NULL COMMENT '多账户ID列表';
alter table jsh_depot_head change AccountMoneyList account_money_list varchar(200) DEFAULT NULL COMMENT '多账户金额列表';
alter table jsh_depot_head change Discount discount decimal(24,6) DEFAULT NULL COMMENT '优惠率';
alter table jsh_depot_head change DiscountMoney discount_money decimal(24,6) DEFAULT NULL COMMENT '优惠金额';
alter table jsh_depot_head change DiscountLastMoney discount_last_money decimal(24,6) DEFAULT NULL COMMENT '优惠后金额';
alter table jsh_depot_head change OtherMoney other_money decimal(24,6) DEFAULT NULL COMMENT '销售或采购费用合计';
alter table jsh_depot_head change OtherMoneyList other_money_list varchar(200) DEFAULT NULL COMMENT '销售或采购费用涉及项目Id数组（包括快递、招待等）';
alter table jsh_depot_head change OtherMoneyItem other_money_item varchar(200) DEFAULT NULL COMMENT '销售或采购费用涉及项目（包括快递、招待等）';
alter table jsh_depot_head change AccountDay account_day int(10) DEFAULT NULL COMMENT '结算天数';
alter table jsh_depot_head change Status status varchar(1) DEFAULT NULL COMMENT '状态，0未审核、1已审核、2已转采购|销售';
alter table jsh_depot_head change LinkNumber link_number varchar(50) DEFAULT NULL COMMENT '关联订单号';
alter table jsh_depot_head change delete_Flag delete_flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
alter table jsh_depot_item rename to jsh_depot_item;
alter table jsh_depot_item change Id id bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键';
alter table jsh_depot_item change HeaderId header_id bigint(20) NOT NULL COMMENT '表头Id';
alter table jsh_depot_item change MaterialId material_id bigint(20) NOT NULL COMMENT '商品Id';
alter table jsh_depot_item change MUnit material_unit varchar(20) DEFAULT NULL COMMENT '商品计量单位';
alter table jsh_depot_item change OperNumber oper_number decimal(24,6) DEFAULT NULL COMMENT '数量';
alter table jsh_depot_item change BasicNumber basic_number decimal(24,6) DEFAULT NULL COMMENT '基础数量，如kg、瓶';
alter table jsh_depot_item change UnitPrice unit_price decimal(24,6) DEFAULT NULL COMMENT '单价';
alter table jsh_depot_item change TaxUnitPrice tax_unit_price decimal(24,6) DEFAULT NULL COMMENT '含税单价';
alter table jsh_depot_item change AllPrice all_price decimal(24,6) DEFAULT NULL COMMENT '金额';
alter table jsh_depot_item change Remark remark varchar(200) DEFAULT NULL COMMENT '备注';
alter table jsh_depot_item change Img img varchar(50) DEFAULT NULL COMMENT '图片';
alter table jsh_depot_item change Incidentals incidentals decimal(24,6) DEFAULT NULL COMMENT '运杂费';
alter table jsh_depot_item change DepotId depot_id bigint(20) DEFAULT NULL COMMENT '仓库ID';
alter table jsh_depot_item change AnotherDepotId another_depot_id bigint(20) DEFAULT NULL COMMENT '调拨时，对方仓库Id';
alter table jsh_depot_item change TaxRate tax_rate decimal(24,6) DEFAULT NULL COMMENT '税率';
alter table jsh_depot_item change TaxMoney tax_money decimal(24,6) DEFAULT NULL COMMENT '税额';
alter table jsh_depot_item change TaxLastMoney tax_last_money decimal(24,6) DEFAULT NULL COMMENT '价税合计';
alter table jsh_depot_item change OtherField1 other_field1 varchar(50) DEFAULT NULL COMMENT '自定义字段1-名称';
alter table jsh_depot_item change OtherField2 other_field2 varchar(50) DEFAULT NULL COMMENT '自定义字段2-型号';
alter table jsh_depot_item change OtherField3 other_field3 varchar(50) DEFAULT NULL COMMENT '自定义字段3-制造商';
alter table jsh_depot_item change OtherField4 other_field4 varchar(50) DEFAULT NULL COMMENT '自定义字段4-名称';
alter table jsh_depot_item change OtherField5 other_field5 varchar(50) DEFAULT NULL COMMENT '自定义字段5-名称';
alter table jsh_depot_item change MType material_type varchar(20) DEFAULT NULL COMMENT '商品类型';
alter table jsh_depot_item change delete_Flag delete_flag varchar(1) DEFAULT '0' COMMENT '删除标记，0未删除，1删除';
\ No newline at end of file
erp_web/js/pages/financial/financial_base.js
View file @ a4774016
......@@ -234,19 +234,19 @@
{ title: '操作',field: 'op',align:"center",width:90,
formatter:function(value,rec,index) {
var str = '';
var orgId = rec.organid ? rec.organid : 0;
var orgId = rec.organId ? rec.organId : 0;
str += '<img title="查看" src="/js/easyui/themes/icons/list.png" style="cursor: pointer;" onclick="showAccountHead(\'' + index + '\');"/>&nbsp;&nbsp;&nbsp;';
str += '<img title="编辑" src="/js/easyui/themes/icons/pencil.png" style="cursor: pointer;" onclick="editAccountHead(\'' + index + '\');"/>&nbsp;&nbsp;&nbsp;';
str += '<img title="删除" src="/js/easyui/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteAccountHead('+ rec.id +',' + orgId +',' + rec.totalprice + ');"/>';
return str;
}
},
{ field: 'organid',width:5, hidden:true},
{ title: organNameTitle,field: 'organname',width:140,hidden:organNameHidden},
{ title: '单据编号',field: 'billno',width:160},
{ title: '经手人',field: 'handspersonname',width:80},
{ field: 'organId',width:5, hidden:true},
{ title: organNameTitle,field: 'organName',width:140,hidden:organNameHidden},
{ title: '单据编号',field: 'billNo',width:160},
{ title: '经手人',field: 'handsPersonName',width:80},
{ title: '单据时间 ',field: 'billTimeStr',width:160},
{ title: '合计',field: 'totalprice',width:80},
{ title: '合计',field: 'totalPrice',width:80},
{ title: '备注',field: 'remark',width:100}
]],
toolbar:[
......@@ -699,15 +699,15 @@
//编辑信息
function editAccountHead(index){
var res = $("#tableData").datagrid("getRows")[index];
$("#BillNo").val(res.billno);
$("#BillTime").val(res.billtime);
$("#BillNo").val(res.billNo);
$("#BillTime").val(res.billTime);
$("#Remark").val(res.remark);
$("#AccountId").val(res.accountid);
$('#OrganId').combobox('setValue', res.organid);
$("#HandsPersonId").val(res.handspersonid);
$("#ChangeAmount").val(res.changeamount);
var TotalPrice = res.totalprice;
preTotalPrice = res.totalprice; //记录前一次合计金额，用于收预付款
$("#AccountId").val(res.accountId);
$('#OrganId').combobox('setValue', res.organId);
$("#HandsPersonId").val(res.handsPersonId);
$("#ChangeAmount").val(res.changeAmount);
var TotalPrice = res.totalPrice;
preTotalPrice = res.totalPrice; //记录前一次合计金额，用于收预付款
var editTitle = listTitle.replace("列表","信息");
$('#accountHeadDlg').dialog('open').dialog('setTitle','<img src="' + '/js/easyui/themes/icons/pencil.png"/>&nbsp;编辑' + editTitle);
$(".window-mask").css({ width: webW ,height: webH});
......@@ -721,14 +721,14 @@
//查看信息
function showAccountHead(index){
var res = $("#tableData").datagrid("getRows")[index];
$("#BillNoShow").text(res.billno);
$("#BillTimeShow").text(res.billtime);
$("#BillNoShow").text(res.billNo);
$("#BillTimeShow").text(res.billTime);
$("#RemarkShow").text(res.remark);
$("#AccountIdShow").text(res.accountname);
$('#OrganIdShow').text(res.organname);
$("#HandsPersonIdShow").text(res.handspersonname);
$("#ChangeAmountShow").text(res.changeamount);
var TotalPrice = res.totalprice;
$("#AccountIdShow").text(res.accountName);
$('#OrganIdShow').text(res.organName);
$("#HandsPersonIdShow").text(res.handsPersonName);
$("#ChangeAmountShow").text(res.changeAmount);
var TotalPrice = res.totalPrice;
var showTitle = listTitle.replace("列表","信息");
$('#accountHeadDlgShow').dialog('open').dialog('setTitle','<img src="/js/easyui/themes/icons/list.png"/>&nbsp;查看' + showTitle);
$(".window-mask").css({ width: webW ,height: webH});
......@@ -881,7 +881,7 @@
});
}
//保存单位信息
//保存信息
$.ajax({
type: "post",
url: url,
......
erp_web/js/pages/manage/supplier.js
View file @ a4774016
......@@ -69,14 +69,14 @@
{ title: '联系人', field: 'contacts',width:50,align:"center"},
{ title: '手机号码', field: 'telephone',width:100,align:"center"},
{ title: '电子邮箱',field: 'email',width:80,align:"center"},
{ title: '联系电话', field: 'phonenum',width:100,align:"center"},
{ title: '联系电话', field: 'phoneNum',width:100,align:"center"},
{ title: '传真', field: 'fax',width:100,align:"center"},
{ title: '预付款',field: 'advancein',width:70,align:"center"},
{ title: '期初应收',field: 'beginneedget',width:70,align:"center"},
{ title: '期初应付',field: 'beginneedpay',width:70,align:"center"},
{ title: '期末应收',field: 'allneedget',width:70,align:"center"},
{ title: '期末应付',field: 'allneedpay',width:70,align:"center"},
{ title: '税率(%)', field: 'taxrate',width:60,align:"center"},
{ title: '预付款',field: 'advanceIn',width:70,align:"center"},
{ title: '期初应收',field: 'beginNeedGet',width:70,align:"center"},
{ title: '期初应付',field: 'beginNeedPay',width:70,align:"center"},
{ title: '期末应收',field: 'allNeedGet',width:70,align:"center"},
{ title: '期末应付',field: 'allNeedPay',width:70,align:"center"},
{ title: '税率(%)', field: 'taxRate',width:60,align:"center"},
{ title: '状态',field: 'enabled',width:70,align:"center",formatter:function(value){
return value? "<span style='color:green'>启用</span>":"<span style='color:red'>禁用</span>";
}}
......@@ -558,12 +558,12 @@
function editSupplier(index) {
var res = $("#tableData").datagrid("getRows")[index];
var sId = res.id;
var beginNeedGet = res.beginneedget;
var beginNeedPay = res.beginneedpay;
var beginNeedGet = res.beginNeedGet;
var beginNeedPay = res.beginNeedPay;
var row = {
supplier : res.supplier,
contacts : res.contacts,
phonenum : res.phonenum,
phonenum : res.phoneNum,
email : res.email,
BeginNeedGet : beginNeedGet == "0"? "":beginNeedGet,
BeginNeedPay : beginNeedPay == "0"? "":beginNeedPay,
......@@ -574,10 +574,10 @@
fax : res.fax,
telephone : res.telephone,
address : res.address,
taxNum : res.taxnum,
bankName : res.bankname,
accountNumber : res.accountnumber,
taxRate : res.taxrate
taxNum : res.taxNum,
bankName : res.bankName,
accountNumber : res.accountNumber,
taxRate : res.taxRate
};
oldSupplier = res.supplier;
$('#supplierDlg').dialog('open').dialog('setTitle','<img src="/js/easyui/themes/icons/pencil.png"/>&nbsp;编辑'+listType +"信息");
......
erp_web/js/pages/materials/bill_detail.js
View file @ a4774016
......@@ -219,9 +219,9 @@
if(data.accountName){
$("#bill .AccountIdShow").text(data.accountName); //结算账户
}
else if(data.accountidlist && data.accountmoneylist) {
var accountArr = data.accountidlist.split(","); //账户id列表
var accountMoneyArr = data.accountmoneylist.split(","); //账户金额列表
else if(data.accountIdList && data.accountMoneyList) {
var accountArr = data.accountIdList.split(","); //账户id列表
var accountMoneyArr = data.accountMoneyList.split(","); //账户金额列表
var accountIdShow = "";
for (var j = 0; j < accountArr.length; j++) {
if (accountList != null) {
......@@ -241,22 +241,22 @@
$("#bill .AccountIdShow").text(accountIdShow);
}
$("#bill .OrganIdShow").text(data.organName);
$("#bill .OperTimeShow").text(data.opertimeStr);
$("#bill .OperTimeShow").text(data.operTimeStr);
$("#bill .NumberShow").text(data.number);
$("#bill .LinkNumberShow").text(data.linknumber? data.linknumber : "");
$("#bill .LinkNumberShow").text(data.linkNumber? data.linkNumber : "");
$("#bill .RemarkShow").text(data.remark);
$("#bill .DiscountShow").text(data.discount);
$("#bill .DiscountMoneyShow").text(data.discountmoney);
$("#bill .DiscountLastMoneyShow").text(data.discountlastmoney);
$("#bill .ChangeAmountShow").text(data.changeamount==null ? "":data.changeamount);
$("#bill .DebtShow").text((data.discountlastmoney+data.othermoney-data.changeamount).toFixed(2));
$("#bill .OtherMoneyShow").text(data.othermoney==null ? "": data.othermoney);
$("#bill .AccountDayShow").text(data.accountday==null ? "": data.accountday); //结算天数
if(data.othermoney && data.othermoneylist && data.othermoneyitem) {
var itemArr = data.othermoneylist.split(","); //支出项目id列表
$("#bill .DiscountMoneyShow").text(data.discountMoney);
$("#bill .DiscountLastMoneyShow").text(data.discountLastMoney);
$("#bill .ChangeAmountShow").text(data.changeAmount==null ? "":data.changeAmount);
$("#bill .DebtShow").text((data.discountLastMoney+data.otherMoney-data.changeAmount).toFixed(2));
$("#bill .OtherMoneyShow").text(data.otherMoney==null ? "": data.otherMoney);
$("#bill .AccountDayShow").text(data.accountDay==null ? "": data.accountDay); //结算天数
if(data.otherMoney && data.otherMoneyList && data.otherMoneyItem) {
var itemArr = data.otherMoneyList.split(","); //支出项目id列表
var itemMoneyArr = null;
if (data.othermoneyitem != null) {
itemMoneyArr = eval("([" + data.othermoneyitem + "])"); //支出项目金额列表
if (data.otherMoneyItem != null) {
itemMoneyArr = eval("([" + data.otherMoneyItem + "])"); //支出项目金额列表
}
var otherMoneyShow = "";
for(var j =0;j<itemArr.length; j++) {
......@@ -277,16 +277,16 @@
}
}
}
$("#bill .OtherMoneyShow:visible").text(otherMoneyShow +"总计："+ data.othermoney + "元 "); //其它费用
$("#bill .OtherMoneyShow:visible").text(otherMoneyShow +"总计："+ data.otherMoney + "元 "); //其它费用
}
$("#bill .payTypeShow").text(data.payType);
var TotalPrice = data.totalprice;
var TotalPrice = data.totalPrice;
depotHeadID = data.id;
initTableData_material_show(TotalPrice,listSubType); //商品列表-查看状态
//零售单据展示数据
if(listSubType == "零售出库" || listSubType == "零售退货入库"){
$("#bill .change-amount-show").text(data.changeamount);
$("#bill .change-amount-show").text(data.changeAmount);
var changeAccount = $("#bill .change-amount-show:visible").text() - 0;
if(manyAccountMoney!==0){
$("#bill .get-amount-show").text((manyAccountMoney).toFixed(2));
......@@ -298,7 +298,7 @@
}
}
if(listSubType === "销售出库" || listSubType === "销售退货"){
var salesManInfo = data.salesman;
var salesManInfo = data.salesMan;
if(salesManInfo){
var arr = salesManInfo.split(",");
var salesmanStr = "";
......@@ -344,14 +344,14 @@
success: function (res) {
if(res && res.code === 200){
var data = res.data;
$("#bill .BillNoShow").text(data.billno);
$("#bill .BillTimeShow").text(data.billtime);
$("#bill .BillNoShow").text(data.billNo);
$("#bill .BillTimeShow").text(data.billTime);
$("#bill .RemarkShow").text(data.remark);
$("#bill .AccountIdShow").text(data.accountname);
$('#bill .OrganIdShow').text(data.organname);
$("#bill .HandsPersonIdShow").text(data.handspersonname);
$("#bill .ChangeAmountShow").text(data.changeamount==null ? "":data.changeamount);
var totalprice = data.totalprice;
$("#bill .AccountIdShow").text(data.accountName);
$('#bill .OrganIdShow').text(data.organName);
$("#bill .HandsPersonIdShow").text(data.handsPersonName);
$("#bill .ChangeAmountShow").text(data.changeAmount==null ? "":data.changeAmount);
var totalprice = data.totalPrice;
var accountHeadID = data.id;
initTableData_account_show(totalprice, accountHeadID); //明细列表-查看状态
}
......
erp_web/js/pages/materials/in_out.js
View file @ a4774016
......@@ -459,15 +459,15 @@
}
}
},
{ title: '单据日期',field: 'opertimeStr',width:145},
{ title: '操作员',field: 'operpersonname',width:60},
{ title: '金额合计',field: 'totalprice',width:70},
{ title: '含税合计',field: 'totaltaxlastmoney',hidden:isShowLastMoneyColumn,width:70,formatter:function(value,rec){
return (rec.discountmoney + rec.discountlastmoney).toFixed(2);
{ title: '单据日期',field: 'operTimeStr',width:145},
{ title: '操作员',field: 'operPersonName',width:60},
{ title: '金额合计',field: 'totalPrice',width:70},
{ title: '含税合计',field: 'totalTaxLastMoney',hidden:isShowLastMoneyColumn,width:70,formatter:function(value,rec){
return (rec.discountMoney + rec.discountLastMoney).toFixed(2);
}
},
{ title: '优惠后金额',field: 'discountlastmoney',hidden:isShowLastMoneyColumn,width:80},
{ title: payTypeTitle,field: 'changeamount',width:50,hidden:hideType},
{ title: '优惠后金额',field: 'discountLastMoney',hidden:isShowLastMoneyColumn,width:80},
{ title: payTypeTitle,field: 'changeAmount',width:50,hidden:hideType},
{ title: '状态',field: 'status',hidden:isHiddenStatus, width:70,align:"center",formatter:function(value){
if(value === "0") {
return "<span style='color:red;'>未审核</span>";
......@@ -1334,7 +1334,7 @@
$.messager.alert('编辑提示', '已审核和已转的单据不能编辑！', 'warning');
return;
}
var TotalPrice = res.totalprice; //合计金额
var TotalPrice = res.totalPrice; //合计金额
if(pageType === "skip") { //从订单跳转过来
buildNumber(); //生成单据编号
var thisDateTime = getNowFormatDateTime(); //当前时间
......@@ -1345,21 +1345,21 @@
$("#ChangeAmount").val(TotalPrice).attr("data-changeamount", TotalPrice);
} else {
$("#Number").val(res.number).attr("data-defaultNumber",res.number);
$("#OperTime").val(res.opertimeStr);
$("#LinkNumber").val(res.linknumber); //关联订单号
$("#AccountId").val(res.accountid); //账户Id
$("#DiscountLastMoney").val(res.discountlastmoney); //优惠后金额
$("#ChangeAmount").val(res.changeamount).attr("data-changeamount", res.changeamount);
}
$('#OrganId').combobox('setValue', res.organid);
$("#HandsPersonId").val(res.handspersonid);
$("#OperTime").val(res.operTimeStr);
$("#LinkNumber").val(res.linkNumber); //关联订单号
$("#AccountId").val(res.accountId); //账户Id
$("#DiscountLastMoney").val(res.discountLastMoney); //优惠后金额
$("#ChangeAmount").val(res.changeAmount).attr("data-changeamount", res.changeAmount);
}
$('#OrganId').combobox('setValue', res.organId);
$("#HandsPersonId").val(res.handsPersonId);
$("#Remark").val(res.remark);
$("#Discount").val(res.discount?res.discount:0);
$("#DiscountMoney").val(res.discountmoney?res.discountmoney:0);
var discountlastmoney = res.discountlastmoney?res.discountlastmoney:0;
$("#Debt").val(discountlastmoney-res.changeamount);
$("#AccountDay").val(res.accountday); //结算天数
preTotalPrice = res.totalprice; //记录前一次合计金额，用于扣预付款
$("#DiscountMoney").val(res.discountMoney?res.discountMoney:0);
var discountlastmoney = res.discountLastMoney?res.discountLastMoney:0;
$("#Debt").val(discountlastmoney-res.changeAmount);
$("#AccountDay").val(res.accountDay); //结算天数
preTotalPrice = res.totalPrice; //记录前一次合计金额，用于扣预付款
oldNumber = res.number; //记录编辑前的单据编号
oldId = res.id; //记录单据Id
var editTitle = listTitle.replace("列表","信息");
......@@ -1369,7 +1369,7 @@
if(listSubType == "零售"){
var option = "";
if(res.paytype === "预付款"){
if(res.payType === "预付款"){
option = '<option value="预付款">预付款</option>';
option += '<option value="现付">现付</option>';
}
......@@ -1380,8 +1380,8 @@
}
if(listSubType === "销售" || listSubType === "销售退货" || listSubType === "销售订单"){
if(res.salesman){
var arr = res.salesman.split(",");
if(res.salesMan){
var arr = res.salesMan.split(",");
var salesmanArray = [];
for(var i=0;i<arr.length;i++){
if(arr[i]){
......@@ -1393,10 +1393,10 @@
}
//采购入库、销售出库的多账户加载
if(res.accountidlist && res.accountmoneylist){
if(res.accountIdList && res.accountMoneyList){
$("#AccountId").val("many"); //下拉框选中多账户
var accountArr = res.accountidlist.split(",");
var accountMoneyArr = res.accountmoneylist.split(",");
var accountArr = res.accountIdList.split(",");
var accountMoneyArr = res.accountMoneyList.split(",");
accountMoneyArr = changeListFmtPlus(accountMoneyArr) //将数组单个金额中的数值转为正数
if(listSubType == "零售" || listSubType == "零售退货") {
......@@ -1423,10 +1423,10 @@
}
//采购入库、销售出库的费用数据加载
if(res.othermoneylist && res.othermoneyitem){
$("#OtherMoney").val(res.othermoney); //其它费用
var itemArr = res.othermoneylist.split(",");
var itemMoneyArr = res.othermoneyitem.split(",");
if(res.otherMoneyList && res.otherMoneyItem){
$("#OtherMoney").val(res.otherMoney); //其它费用
var itemArr = res.otherMoneyList.split(",");
var itemMoneyArr = res.otherMoneyItem.split(",");
$("#OtherMoney").attr("data-itemArr",JSON.stringify(itemArr)).attr("data-itemMoneyArr",itemMoneyArr); //json数据存储
}
......@@ -1439,15 +1439,15 @@
var res = $("#tableData").datagrid("getRows")[index];
var manyAccountMoney = 0; //多账户合计-零售
$("#NumberShow").text(res.number);
$("#OperTimeShow").text(res.opertimeStr);
$("#OperTimeShow").text(res.operTimeStr);
$('#OrganIdShow').text(res.organName);
$("#HandsPersonIdShow").text(res.handsPersonName);
if(res.accountName){
$("#AccountIdShow").text(res.accountName); //结算账户
} else {
if (res.accountidlist) {
var accountArr = res.accountidlist.split(","); //账户id列表
var accountMoneyArr = res.accountmoneylist.split(","); //账户金额列表
if (res.accountIdList) {
var accountArr = res.accountIdList.split(","); //账户id列表
var accountMoneyArr = res.accountMoneyList.split(","); //账户金额列表
var accountIdShow = "";
for (var j = 0; j < accountArr.length; j++) {
if (accountList != null) {
......@@ -1467,26 +1467,26 @@
$("#AccountIdShow").text(accountIdShow);
}
}
$("#ChangeAmountShow").text(res.changeamount);
$("#ChangeAmountShow").text(res.changeAmount);
$("#RemarkShow").text(res.remark);
$("#DiscountShow").text(res.discount);
$("#DiscountMoneyShow").text(res.discountmoney);
$("#DiscountLastMoneyShow").text(res.discountlastmoney);
$("#DiscountMoneyShow").text(res.discountMoney);
$("#DiscountLastMoneyShow").text(res.discountLastMoney);
var debt = 0;
if(res.othermoney){
debt = (res.discountlastmoney+res.othermoney-res.changeamount).toFixed(2);
if(res.otherMoney){
debt = (res.discountLastMoney+res.otherMoney-res.changeAmount).toFixed(2);
} else {
debt = (res.discountlastmoney-res.changeamount).toFixed(2);
debt = (res.discountLastMoney-res.changeAmount).toFixed(2);
}
$("#DebtShow").text(debt);
$("#AccountDayShow").text(res.accountday); //结算天数
$("#LinkNumberShow").text(res.linknumber); //关联订单号
var otherMoney = res.othermoney?res.othermoney:0;
if(otherMoney!=0 && res.othermoneylist && res.othermoneyitem){
var itemArr = res.othermoneylist.split(","); //支出项目id列表
$("#AccountDayShow").text(res.accountDay); //结算天数
$("#LinkNumberShow").text(res.linkLumber); //关联订单号
var otherMoney = res.otherMoney?res.otherMoney:0;
if(otherMoney!=0 && res.otherMoneyList && res.otherMoneyItem){
var itemArr = res.otherMoneyList.split(","); //支出项目id列表
var itemMoneyArr = null;
if(res.othermoneyitem!=null) {
itemMoneyArr = eval ("(" + res.othermoneyitem + ")"); //支出项目金额列表
if(res.otherMoneyItem!=null) {
itemMoneyArr = eval ("(" + res.otherMoneyItem + ")"); //支出项目金额列表
}
var otherMoneyShow = "";
for(var j =0;j<itemArr.length; j++) {
......@@ -1512,8 +1512,8 @@
else {
$("#OtherMoneyShow").text(otherMoney); //其它费用
}
$("#payTypeShow").text(res.paytype);
var TotalPrice = res.totalprice;
$("#payTypeShow").text(res.payType);
var TotalPrice = res.totalPrice;
var showTitle = listTitle.replace("列表","信息");
$('#depotHeadDlgShow').show().dialog('open').dialog('setTitle','<img src="/js/easyui/themes/icons/list.png"/>&nbsp;查看' + showTitle);
$(".window-mask").css({ width: webW ,height: webH});
......@@ -1535,7 +1535,7 @@
}
if(listSubType === "销售" || listSubType === "销售退货" || listSubType === "销售订单"){
if(res.salesman){
var arr = res.salesman.split(",");
var arr = res.salesMan.split(",");
var salesmanStr = "";
for(var i=0;i<arr.length;i++){
if(arr[i]){
......
erp_web/pages/manage/rolePushBtn.html
View file @ a4774016
......@@ -138,7 +138,7 @@
if (res && res.code === 200) {
var ubList = res.data.userBusinessList;
userBusinessId = ubList[0].id;
roleBtnStr = ubList[0].btnstr;
roleBtnStr = ubList[0].btnStr;
var getValue = ubList[0].value;
getValue = getValue.substring(1, getValue.length - 1);
if (getValue.indexOf("][")) {
......
src/main/java/com/jsh/erp/controller/AccountItemController.java
View file @ a4774016
......@@ -86,11 +86,11 @@ public class AccountItemController {
for (AccountItemVo4List ai : dataList) {
JSONObject item = new JSONObject();
item.put("Id", ai.getId());
item.put("AccountId", ai.getAccountid());
item.put("AccountId", ai.getAccountId());
item.put("AccountName", ai.getAccountName());
item.put("InOutItemId", ai.getInoutitemid());
item.put("InOutItemId", ai.getInOutItemId());
item.put("InOutItemName", ai.getInOutItemName());
BigDecimal eachAmount = ai.getEachamount();
BigDecimal eachAmount = ai.getEachAmount();
item.put("EachAmount", (eachAmount.compareTo(BigDecimal.ZERO))==-1 ? BigDecimal.ZERO.subtract(eachAmount): eachAmount);
item.put("Remark", ai.getRemark());
dataArray.add(item);
......
src/main/java/com/jsh/erp/controller/DepotItemController.java
View file @ a4774016
......@@ -184,30 +184,30 @@ public class DepotItemController {
String materialOther = getOtherInfo(mpArr, diEx);
MaterialName = MaterialName + materialOther + ((diEx.getUnitName() == null || diEx.getUnitName().equals("")) ? "" : "(" + diEx.getUnitName() + ")") + ratio;
item.put("MaterialName", MaterialName == null ? "" : MaterialName);
BigDecimal stock = depotItemService.getStockByParam(diEx.getDepotid(),diEx.getMaterialid(),null,null,tenantId);
BigDecimal stock = depotItemService.getStockByParam(diEx.getDepotId(),diEx.getMaterialId(),null,null,tenantId);
item.put("Stock", stock);
item.put("Unit", diEx.getMunit());
item.put("currentStock", diEx.getOpernumber().add(stock));
item.put("OperNumber", diEx.getOpernumber());
item.put("BasicNumber", diEx.getBasicnumber());
item.put("UnitPrice", diEx.getUnitprice());
item.put("TaxUnitPrice", diEx.getTaxunitprice());
item.put("AllPrice", diEx.getAllprice());
item.put("Unit", diEx.getMaterialUnit());
item.put("currentStock", diEx.getOperNumber().add(stock));
item.put("OperNumber", diEx.getOperNumber());
item.put("BasicNumber", diEx.getBasicNumber());
item.put("UnitPrice", diEx.getUnitPrice());
item.put("TaxUnitPrice", diEx.getTaxUnitPrice());
item.put("AllPrice", diEx.getAllPrice());
item.put("Remark", diEx.getRemark());
item.put("Img", diEx.getImg());
item.put("DepotId", diEx.getDepotid() == null ? "" : diEx.getDepotid());
item.put("DepotName", diEx.getDepotid() == null ? "" : diEx.getDepotName());
item.put("AnotherDepotId", diEx.getAnotherdepotid() == null ? "" : diEx.getAnotherdepotid());
item.put("AnotherDepotName", diEx.getAnotherdepotid() == null ? "" : diEx.getAnotherDepotName());
item.put("TaxRate", diEx.getTaxrate());
item.put("TaxMoney", diEx.getTaxmoney());
item.put("TaxLastMoney", diEx.getTaxlastmoney());
item.put("OtherField1", diEx.getOtherfield1());
item.put("OtherField2", diEx.getOtherfield2());
item.put("OtherField3", diEx.getOtherfield3());
item.put("OtherField4", diEx.getOtherfield4());
item.put("OtherField5", diEx.getOtherfield5());
item.put("MType", diEx.getMtype());
item.put("DepotId", diEx.getDepotId() == null ? "" : diEx.getDepotId());
item.put("DepotName", diEx.getDepotId() == null ? "" : diEx.getDepotName());
item.put("AnotherDepotId", diEx.getAnotherDepotId() == null ? "" : diEx.getAnotherDepotId());
item.put("AnotherDepotName", diEx.getAnotherDepotId() == null ? "" : diEx.getAnotherDepotName());
item.put("TaxRate", diEx.getTaxRate());
item.put("TaxMoney", diEx.getTaxMoney());
item.put("TaxLastMoney", diEx.getTaxLastMoney());
item.put("OtherField1", diEx.getOtherField1());
item.put("OtherField2", diEx.getOtherField2());
item.put("OtherField3", diEx.getOtherField3());
item.put("OtherField4", diEx.getOtherField4());
item.put("OtherField5", diEx.getOtherField5());
item.put("MType", diEx.getMaterialType());
item.put("op", 1);
dataArray.add(item);
}
......@@ -332,10 +332,10 @@ public class DepotItemController {
* 导出excel表格
* @param currentPage
* @param pageSize
* @param projectId
* @param depotId
* @param monthTime
* @param headIds
* @param materialIds
* @param name
* @param model
* @param request
* @param response
* @return
......@@ -384,10 +384,10 @@ public class DepotItemController {
/**
* 统计总计金额
* @param pid
* @param depotId
* @param monthTime
* @param headIds
* @param materialIds
* @param name
* @param model
* @param request
* @return
*/
......@@ -429,8 +429,8 @@ public class DepotItemController {
* @param currentPage
* @param pageSize
* @param monthTime
* @param headIds
* @param materialIds
* @param name
* @param model
* @param mpList
* @param request
* @return
......@@ -492,8 +492,8 @@ public class DepotItemController {
* @param currentPage
* @param pageSize
* @param monthTime
* @param headIds
* @param materialIds
* @param name
* @param model
* @param mpList
* @param request
* @return
......@@ -648,7 +648,6 @@ public class DepotItemController {
* @param currentPage
* @param pageSize
* @param projectId
* @param monthTime
* @param request
* @param response
* @return
......
src/main/java/com/jsh/erp/controller/MaterialController.java
View file @ a4774016
......@@ -153,7 +153,7 @@ public class MaterialController {
JSONObject item = new JSONObject();
item.put("Id", material.getMeId()); //商品扩展表的id
String ratio; //比例
if (material.getUnitid() == null || material.getUnitid().equals("")) {
if (material.getUnitId() == null || material.getUnitId().equals("")) {
ratio = "";
} else {
ratio = material.getUnitName();
......@@ -178,13 +178,13 @@ public class MaterialController {
expand = expand + ((material.getMfrs() == null || material.getMfrs().equals("")) ? "" : "(" + material.getMfrs() + ")");
}
if (mpArr[i].equals("自定义1")) {
expand = expand + ((material.getOtherfield1() == null || material.getOtherfield1().equals("")) ? "" : "(" + material.getOtherfield1() + ")");
expand = expand + ((material.getOtherField1() == null || material.getOtherField1().equals("")) ? "" : "(" + material.getOtherField1() + ")");
}
if (mpArr[i].equals("自定义2")) {
expand = expand + ((material.getOtherfield2() == null || material.getOtherfield2().equals("")) ? "" : "(" + material.getOtherfield2() + ")");
expand = expand + ((material.getOtherField2() == null || material.getOtherField2().equals("")) ? "" : "(" + material.getOtherField2() + ")");
}
if (mpArr[i].equals("自定义3")) {
expand = expand + ((material.getOtherfield3() == null || material.getOtherfield3().equals("")) ? "" : "(" + material.getOtherfield3() + ")");
expand = expand + ((material.getOtherField3() == null || material.getOtherField3().equals("")) ? "" : "(" + material.getOtherField3() + ")");
}
}
MaterialName = MaterialName + expand + ((material.getCommodityUnit() == null || material.getCommodityUnit().equals("")) ? "" : "(" + material.getCommodityUnit() + ")") + ratio;
......@@ -229,7 +229,7 @@ public class MaterialController {
MaterialVo4Unit material = materialList.get(0);
item.put("Id", material.getMeId()); //商品扩展表的id
String ratio; //比例
if (material.getUnitid() == null || material.getUnitid().equals("")) {
if (material.getUnitId() == null || material.getUnitId().equals("")) {
ratio = "";
} else {
ratio = material.getUnitName();
......@@ -248,13 +248,13 @@ public class MaterialController {
expand = expand + ((material.getMfrs() == null || material.getMfrs().equals("")) ? "" : "(" + material.getMfrs() + ")");
}
if (mpArr[i].equals("自定义1")) {
expand = expand + ((material.getOtherfield1() == null || material.getOtherfield1().equals("")) ? "" : "(" + material.getOtherfield1() + ")");
expand = expand + ((material.getOtherField1() == null || material.getOtherField1().equals("")) ? "" : "(" + material.getOtherField1() + ")");
}
if (mpArr[i].equals("自定义2")) {
expand = expand + ((material.getOtherfield2() == null || material.getOtherfield2().equals("")) ? "" : "(" + material.getOtherfield2() + ")");
expand = expand + ((material.getOtherField2() == null || material.getOtherField2().equals("")) ? "" : "(" + material.getOtherField2() + ")");
}
if (mpArr[i].equals("自定义3")) {
expand = expand + ((material.getOtherfield3() == null || material.getOtherfield3().equals("")) ? "" : "(" + material.getOtherfield3() + ")");
expand = expand + ((material.getOtherField3() == null || material.getOtherField3().equals("")) ? "" : "(" + material.getOtherField3() + ")");
}
}
MaterialName = MaterialName + expand + ((material.getUnit() == null || material.getUnit().equals("")) ? "" : "(" + material.getUnit() + ")") + ratio;
......@@ -297,7 +297,7 @@ public class MaterialController {
objs[0] = m.getName();
objs[1] = m.getCategoryName();
objs[2] = m.getModel();
objs[3] = m.getSafetystock() == null? "" : m.getSafetystock().toString();
objs[3] = m.getSafetyStock() == null? "" : m.getSafetyStock().toString();
objs[4] = m.getCommodityUnit();
objs[5] = m.getCommodityDecimal() == null? "" : m.getCommodityDecimal().toString();
objs[6] = m.getLowDecimal() == null? "" : m.getLowDecimal().toString();
......
src/main/java/com/jsh/erp/controller/SupplierController.java
View file @ a4774016
......@@ -154,7 +154,7 @@ public class SupplierController {
item.put("id", supplier.getId());
//客户名称
item.put("supplier", supplier.getSupplier());
item.put("advanceIn", supplier.getAdvancein()); //预付款金额
item.put("advanceIn", supplier.getAdvanceIn()); //预付款金额
dataArray.add(item);
}
}
......@@ -186,11 +186,11 @@ public class SupplierController {
item.put("supplier", supplier.getSupplier());
item.put("type", supplier.getType());
item.put("contacts", supplier.getContacts());
item.put("phonenum", supplier.getPhonenum());
item.put("phonenum", supplier.getPhoneNum());
item.put("email", supplier.getEmail());
item.put("AdvanceIn", supplier.getAdvancein());
item.put("BeginNeedGet", supplier.getBeginneedget());
item.put("BeginNeedPay", supplier.getBeginneedpay());
item.put("AdvanceIn", supplier.getAdvanceIn());
item.put("BeginNeedGet", supplier.getBeginNeedGet());
item.put("BeginNeedPay", supplier.getBeginNeedPay());
/**
* 2018-01-28这里会有空指针异常
* */
......@@ -201,10 +201,10 @@ public class SupplierController {
item.put("fax", supplier.getFax());
item.put("telephone", supplier.getTelephone());
item.put("address", supplier.getAddress());
item.put("taxNum", supplier.getTaxnum());
item.put("bankName", supplier.getBankname());
item.put("accountNumber", supplier.getAccountnumber());
item.put("taxRate", supplier.getTaxrate());
item.put("taxNum", supplier.getTaxNum());
item.put("bankName", supplier.getBankName());
item.put("accountNumber", supplier.getAccountNumber());
item.put("taxRate", supplier.getTaxRate());
item.put("enabled", supplier.getEnabled());
dataArray.add(item);
}
......@@ -315,19 +315,19 @@ public class SupplierController {
objs[0] = s.getSupplier();
objs[1] = s.getType();
objs[2] = s.getContacts();
objs[3] = s.getPhonenum();
objs[3] = s.getPhoneNum();
objs[4] = s.getEmail();
objs[5] = s.getAdvancein() == null? "" : s.getAdvancein().toString();
objs[6] = s.getBeginneedget() == null? "" : s.getBeginneedget().toString();
objs[7] = s.getBeginneedpay() == null? "" : s.getBeginneedpay().toString();
objs[5] = s.getAdvanceIn() == null? "" : s.getAdvanceIn().toString();
objs[6] = s.getBeginNeedGet() == null? "" : s.getBeginNeedGet().toString();
objs[7] = s.getBeginNeedPay() == null? "" : s.getBeginNeedPay().toString();
objs[8] = s.getDescription();
objs[9] = s.getFax();
objs[10] = s.getTelephone();
objs[11] = s.getAddress();
objs[12] = s.getTaxnum();
objs[13] = s.getBankname();
objs[14] = s.getAccountnumber();
objs[15] = s.getTaxrate() == null? "" : s.getTaxrate().toString();
objs[12] = s.getTaxNum();
objs[13] = s.getBankName();
objs[14] = s.getAccountNumber();
objs[15] = s.getTaxRate() == null? "" : s.getTaxRate().toString();
objs[16] = s.getEnabled() ? "启用" : "禁用";
objects.add(objs);
}
......@@ -404,19 +404,19 @@ public class SupplierController {
s.setSupplier(ExcelUtils.getContent(src, i, 0));
s.setType(ExcelUtils.getContent(src, i, 1));
s.setContacts(ExcelUtils.getContent(src, i, 2));
s.setPhonenum(ExcelUtils.getContent(src, i, 3));
s.setPhoneNum(ExcelUtils.getContent(src, i, 3));
s.setEmail(ExcelUtils.getContent(src, i, 4));
s.setAdvancein(parseBigDecimalEx(ExcelUtils.getContent(src, i, 5)));
s.setBeginneedget(parseBigDecimalEx(ExcelUtils.getContent(src, i, 6)));
s.setBeginneedpay(parseBigDecimalEx(ExcelUtils.getContent(src, i, 7)));
s.setAdvanceIn(parseBigDecimalEx(ExcelUtils.getContent(src, i, 5)));
s.setBeginNeedGet(parseBigDecimalEx(ExcelUtils.getContent(src, i, 6)));
s.setBeginNeedPay(parseBigDecimalEx(ExcelUtils.getContent(src, i, 7)));
s.setDescription(ExcelUtils.getContent(src, i, 8));
s.setFax(ExcelUtils.getContent(src, i, 9));
s.setTelephone(ExcelUtils.getContent(src, i, 10));
s.setAddress(ExcelUtils.getContent(src, i, 11));
s.setTaxnum(ExcelUtils.getContent(src, i, 12));
s.setBankname(ExcelUtils.getContent(src, i, 13));
s.setAccountnumber(ExcelUtils.getContent(src, i, 14));
s.setTaxrate(parseBigDecimalEx(ExcelUtils.getContent(src, i, 15)));
s.setTaxNum(ExcelUtils.getContent(src, i, 12));
s.setBankName(ExcelUtils.getContent(src, i, 13));
s.setAccountNumber(ExcelUtils.getContent(src, i, 14));
s.setTaxRate(parseBigDecimalEx(ExcelUtils.getContent(src, i, 15)));
String enabled = ExcelUtils.getContent(src, i, 16);
s.setEnabled(enabled.equals("启用")? true: false);
s.setIsystem(Byte.parseByte("1"));
......
src/main/java/com/jsh/erp/datasource/entities/AccountHead.java
View file @ a4774016
......@@ -4,386 +4,122 @@ import java.math.BigDecimal;
import java.util.Date;
public class AccountHead {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.Id
*
* @mbggenerated
*/
private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.Type
*
* @mbggenerated
*/
private String type;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.OrganId
*
* @mbggenerated
*/
private Long organid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.HandsPersonId
*
* @mbggenerated
*/
private Long handspersonid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.ChangeAmount
*
* @mbggenerated
*/
private BigDecimal changeamount;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.TotalPrice
*
* @mbggenerated
*/
private BigDecimal totalprice;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.AccountId
*
* @mbggenerated
*/
private Long accountid;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.BillNo
*
* @mbggenerated
*/
private String billno;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.BillTime
*
* @mbggenerated
*/
private Date billtime;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.Remark
*
* @mbggenerated
*/
private Long organId;
private Long handsPersonId;
private BigDecimal changeAmount;
private BigDecimal totalPrice;
private Long accountId;
private String billNo;
private Date billTime;
private String remark;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.tenant_id
*
* @mbggenerated
*/
private Long tenantId;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accounthead.delete_Flag
*
* @mbggenerated
*/
private String deleteFlag;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.Id
*
* @return the value of jsh_accounthead.Id
*
* @mbggenerated
*/
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.Id
*
* @param id the value for jsh_accounthead.Id
*
* @mbggenerated
*/
public void setId(Long id) {
this.id = id;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.Type
*
* @return the value of jsh_accounthead.Type
*
* @mbggenerated
*/
public String getType() {
return type;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.Type
*
* @param type the value for jsh_accounthead.Type
*
* @mbggenerated
*/
public void setType(String type) {
this.type = type == null ? null : type.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.OrganId
*
* @return the value of jsh_accounthead.OrganId
*
* @mbggenerated
*/
public Long getOrganid() {
return organid;
public Long getOrganId() {
return organId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.OrganId
*
* @param organid the value for jsh_accounthead.OrganId
*
* @mbggenerated
*/
public void setOrganid(Long organid) {
this.organid = organid;
public void setOrganId(Long organId) {
this.organId = organId;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.HandsPersonId
*
* @return the value of jsh_accounthead.HandsPersonId
*
* @mbggenerated
*/
public Long getHandspersonid() {
return handspersonid;
public Long getHandsPersonId() {
return handsPersonId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.HandsPersonId
*
* @param handspersonid the value for jsh_accounthead.HandsPersonId
*
* @mbggenerated
*/
public void setHandspersonid(Long handspersonid) {
this.handspersonid = handspersonid;
public void setHandsPersonId(Long handsPersonId) {
this.handsPersonId = handsPersonId;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.ChangeAmount
*
* @return the value of jsh_accounthead.ChangeAmount
*
* @mbggenerated
*/
public BigDecimal getChangeamount() {
return changeamount;
public BigDecimal getChangeAmount() {
return changeAmount;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.ChangeAmount
*
* @param changeamount the value for jsh_accounthead.ChangeAmount
*
* @mbggenerated
*/
public void setChangeamount(BigDecimal changeamount) {
this.changeamount = changeamount;
public void setChangeAmount(BigDecimal changeAmount) {
this.changeAmount = changeAmount;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.TotalPrice
*
* @return the value of jsh_accounthead.TotalPrice
*
* @mbggenerated
*/
public BigDecimal getTotalprice() {
return totalprice;
public BigDecimal getTotalPrice() {
return totalPrice;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.TotalPrice
*
* @param totalprice the value for jsh_accounthead.TotalPrice
*
* @mbggenerated
*/
public void setTotalprice(BigDecimal totalprice) {
this.totalprice = totalprice;
public void setTotalPrice(BigDecimal totalPrice) {
this.totalPrice = totalPrice;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.AccountId
*
* @return the value of jsh_accounthead.AccountId
*
* @mbggenerated
*/
public Long getAccountid() {
return accountid;
public Long getAccountId() {
return accountId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.AccountId
*
* @param accountid the value for jsh_accounthead.AccountId
*
* @mbggenerated
*/
public void setAccountid(Long accountid) {
this.accountid = accountid;
public void setAccountId(Long accountId) {
this.accountId = accountId;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.BillNo
*
* @return the value of jsh_accounthead.BillNo
*
* @mbggenerated
*/
public String getBillno() {
return billno;
public String getBillNo() {
return billNo;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.BillNo
*
* @param billno the value for jsh_accounthead.BillNo
*
* @mbggenerated
*/
public void setBillno(String billno) {
this.billno = billno == null ? null : billno.trim();
public void setBillNo(String billNo) {
this.billNo = billNo == null ? null : billNo.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.BillTime
*
* @return the value of jsh_accounthead.BillTime
*
* @mbggenerated
*/
public Date getBilltime() {
return billtime;
public Date getBillTime() {
return billTime;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.BillTime
*
* @param billtime the value for jsh_accounthead.BillTime
*
* @mbggenerated
*/
public void setBilltime(Date billtime) {
this.billtime = billtime;
public void setBillTime(Date billTime) {
this.billTime = billTime;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.Remark
*
* @return the value of jsh_accounthead.Remark
*
* @mbggenerated
*/
public String getRemark() {
return remark;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.Remark
*
* @param remark the value for jsh_accounthead.Remark
*
* @mbggenerated
*/
public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.tenant_id
*
* @return the value of jsh_accounthead.tenant_id
*
* @mbggenerated
*/
public Long getTenantId() {
return tenantId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.tenant_id
*
* @param tenantId the value for jsh_accounthead.tenant_id
*
* @mbggenerated
*/
public void setTenantId(Long tenantId) {
this.tenantId = tenantId;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accounthead.delete_Flag
*
* @return the value of jsh_accounthead.delete_Flag
*
* @mbggenerated
*/
public String getDeleteFlag() {
return deleteFlag;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accounthead.delete_Flag
*
* @param deleteFlag the value for jsh_accounthead.delete_Flag
*
* @mbggenerated
*/
public void setDeleteFlag(String deleteFlag) {
this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
}
......
src/main/java/com/jsh/erp/datasource/entities/AccountHeadVo4ListEx.java
View file @ a4774016
......@@ -9,19 +9,19 @@ public class AccountHeadVo4ListEx {
private String type;
private Long organid;
private Long organId;
private Long handspersonid;
private Long handsPersonId;
private BigDecimal changeamount;
private BigDecimal changeAmount;
private BigDecimal totalprice;
private BigDecimal totalPrice;
private Long accountid;
private Long accountId;
private String billno;
private String billNo;
private Date billtime;
private Date billTime;
private String remark;
......@@ -29,11 +29,11 @@ public class AccountHeadVo4ListEx {
private String deleteFlag;
private String organname;
private String organName;
private String handspersonname;
private String handsPersonName;
private String accountname;
private String accountName;
private String billTimeStr;
......@@ -53,60 +53,60 @@ public class AccountHeadVo4ListEx {
this.type = type;
}
public Long getOrganid() {
return organid;
public Long getOrganId() {
return organId;
}
public void setOrganid(Long organid) {
this.organid = organid;
public void setOrganId(Long organId) {
this.organId = organId;
}
public Long getHandspersonid() {
return handspersonid;
public Long getHandsPersonId() {
return handsPersonId;
}
public void setHandspersonid(Long handspersonid) {
this.handspersonid = handspersonid;
public void setHandsPersonId(Long handsPersonId) {
this.handsPersonId = handsPersonId;
}
public BigDecimal getChangeamount() {
return changeamount;
public BigDecimal getChangeAmount() {
return changeAmount;
}
public void setChangeamount(BigDecimal changeamount) {
this.changeamount = changeamount;
public void setChangeAmount(BigDecimal changeAmount) {
this.changeAmount = changeAmount;
}
public BigDecimal getTotalprice() {
return totalprice;
public BigDecimal getTotalPrice() {
return totalPrice;
}
public void setTotalprice(BigDecimal totalprice) {
this.totalprice = totalprice;
public void setTotalPrice(BigDecimal totalPrice) {
this.totalPrice = totalPrice;
}
public Long getAccountid() {
return accountid;
public Long getAccountId() {
return accountId;
}
public void setAccountid(Long accountid) {
this.accountid = accountid;
public void setAccountId(Long accountId) {
this.accountId = accountId;
}
public String getBillno() {
return billno;
public String getBillNo() {
return billNo;
}
public void setBillno(String billno) {
this.billno = billno;
public void setBillNo(String billNo) {
this.billNo = billNo;
}
public Date getBilltime() {
return billtime;
public Date getBillTime() {
return billTime;
}
public void setBilltime(Date billtime) {
this.billtime = billtime;
public void setBillTime(Date billTime) {
this.billTime = billTime;
}
public String getRemark() {
......@@ -133,28 +133,28 @@ public class AccountHeadVo4ListEx {
this.deleteFlag = deleteFlag;
}
public String getOrganname() {
return organname;
public String getOrganName() {
return organName;
}
public void setOrganname(String organname) {
this.organname = organname;
public void setOrganName(String organName) {
this.organName = organName;
}
public String getHandspersonname() {
return handspersonname;
public String getHandsPersonName() {
return handsPersonName;
}
public void setHandspersonname(String handspersonname) {
this.handspersonname = handspersonname;
public void setHandsPersonName(String handsPersonName) {
this.handsPersonName = handsPersonName;
}
public String getAccountname() {
return accountname;
public String getAccountName() {
return accountName;
}
public void setAccountname(String accountname) {
this.accountname = accountname;
public void setAccountName(String accountName) {
this.accountName = accountName;
}
public String getBillTimeStr() {
......
src/main/java/com/jsh/erp/datasource/entities/AccountItem.java
View file @ a4774016
......@@ -3,258 +3,82 @@ package com.jsh.erp.datasource.entities;
import java.math.BigDecimal;
public class AccountItem {
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accountitem.Id
*
* @mbggenerated
*/
private Long id;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accountitem.HeaderId
*
* @mbggenerated
*/
private Long headerid;
private Long headerId;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accountitem.AccountId
*
* @mbggenerated
*/
private Long accountid;
private Long accountId;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accountitem.InOutItemId
*
* @mbggenerated
*/
private Long inoutitemid;
private Long inOutItemId;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accountitem.EachAmount
*
* @mbggenerated
*/
private BigDecimal eachamount;
private BigDecimal eachAmount;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accountitem.Remark
*
* @mbggenerated
*/
private String remark;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accountitem.tenant_id
*
* @mbggenerated
*/
private Long tenantId;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_accountitem.delete_Flag
*
* @mbggenerated
*/
private String deleteFlag;
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accountitem.Id
*
* @return the value of jsh_accountitem.Id
*
* @mbggenerated
*/
public Long getId() {
return id;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accountitem.Id
*
* @param id the value for jsh_accountitem.Id
*
* @mbggenerated
*/
public void setId(Long id) {
this.id = id;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accountitem.HeaderId
*
* @return the value of jsh_accountitem.HeaderId
*
* @mbggenerated
*/
public Long getHeaderid() {
return headerid;
public Long getHeaderId() {
return headerId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accountitem.HeaderId
*
* @param headerid the value for jsh_accountitem.HeaderId
*
* @mbggenerated
*/
public void setHeaderid(Long headerid) {
this.headerid = headerid;
public void setHeaderId(Long headerId) {
this.headerId = headerId;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accountitem.AccountId
*
* @return the value of jsh_accountitem.AccountId
*
* @mbggenerated
*/
public Long getAccountid() {
return accountid;
public Long getAccountId() {
return accountId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accountitem.AccountId
*
* @param accountid the value for jsh_accountitem.AccountId
*
* @mbggenerated
*/
public void setAccountid(Long accountid) {
this.accountid = accountid;
public void setAccountId(Long accountId) {
this.accountId = accountId;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accountitem.InOutItemId
*
* @return the value of jsh_accountitem.InOutItemId
*
* @mbggenerated
*/
public Long getInoutitemid() {
return inoutitemid;
public Long getInOutItemId() {
return inOutItemId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accountitem.InOutItemId
*
* @param inoutitemid the value for jsh_accountitem.InOutItemId
*
* @mbggenerated
*/
public void setInoutitemid(Long inoutitemid) {
this.inoutitemid = inoutitemid;
public void setInOutItemId(Long inOutItemId) {
this.inOutItemId = inOutItemId;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accountitem.EachAmount
*
* @return the value of jsh_accountitem.EachAmount
*
* @mbggenerated
*/
public BigDecimal getEachamount() {
return eachamount;
public BigDecimal getEachAmount() {
return eachAmount;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accountitem.EachAmount
*
* @param eachamount the value for jsh_accountitem.EachAmount
*
* @mbggenerated
*/
public void setEachamount(BigDecimal eachamount) {
this.eachamount = eachamount;
public void setEachAmount(BigDecimal eachAmount) {
this.eachAmount = eachAmount;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accountitem.Remark
*
* @return the value of jsh_accountitem.Remark
*
* @mbggenerated
*/
public String getRemark() {
return remark;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accountitem.Remark
*
* @param remark the value for jsh_accountitem.Remark
*
* @mbggenerated
*/
public void setRemark(String remark) {
this.remark = remark == null ? null : remark.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accountitem.tenant_id
*
* @return the value of jsh_accountitem.tenant_id
*
* @mbggenerated
*/
public Long getTenantId() {
return tenantId;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accountitem.tenant_id
*
* @param tenantId the value for jsh_accountitem.tenant_id
*
* @mbggenerated
*/
public void setTenantId(Long tenantId) {
this.tenantId = tenantId;
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_accountitem.delete_Flag
*
* @return the value of jsh_accountitem.delete_Flag
*
* @mbggenerated
*/
public String getDeleteFlag() {
return deleteFlag;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_accountitem.delete_Flag
*
* @param deleteFlag the value for jsh_accountitem.delete_Flag
*
* @mbggenerated
*/
public void setDeleteFlag(String deleteFlag) {
this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
}
......
src/main/java/com/jsh/erp/datasource/entities/DepotHead.java
View file @ a4774016
......@@ -8,55 +8,55 @@ public class DepotHead {
private String type;
private String subtype;
private String subType;
private String defaultnumber;
private String defaultNumber;
private String number;
private String operpersonname;
private String operPersonName;
private Date createtime;
private Date createTime;
private Date opertime;
private Date operTime;
private Long organid;
private Long organId;
private Long handspersonid;
private Long handsPersonId;
private Long accountid;
private Long accountId;
private BigDecimal changeamount;
private BigDecimal changeAmount;
private BigDecimal totalprice;
private BigDecimal totalPrice;
private String paytype;
private String payType;
private String remark;
private String salesman;
private String salesMan;
private String accountidlist;
private String accountIdList;
private String accountmoneylist;
private String accountMoneyList;
private BigDecimal discount;
private BigDecimal discountmoney;
private BigDecimal discountMoney;
private BigDecimal discountlastmoney;
private BigDecimal discountLastMoney;
private BigDecimal othermoney;
private BigDecimal otherMoney;
private String othermoneylist;
private String otherMoneyList;
private String othermoneyitem;
private String otherMoneyItem;
private Integer accountday;
private Integer accountDay;
private String status;
private String linknumber;
private String linkNumber;
private Long tenantId;
......@@ -78,20 +78,20 @@ public class DepotHead {
this.type = type == null ? null : type.trim();
}
public String getSubtype() {
return subtype;
public String getSubType() {
return subType;
}
public void setSubtype(String subtype) {
this.subtype = subtype == null ? null : subtype.trim();
public void setSubType(String subType) {
this.subType = subType == null ? null : subType.trim();
}
public String getDefaultnumber() {
return defaultnumber;
public String getDefaultNumber() {
return defaultNumber;
}
public void setDefaultnumber(String defaultnumber) {
this.defaultnumber = defaultnumber == null ? null : defaultnumber.trim();
public void setDefaultNumber(String defaultNumber) {
this.defaultNumber = defaultNumber == null ? null : defaultNumber.trim();
}
public String getNumber() {
......@@ -102,76 +102,76 @@ public class DepotHead {
this.number = number == null ? null : number.trim();
}
public String getOperpersonname() {
return operpersonname;
public String getOperPersonName() {
return operPersonName;
}
public void setOperpersonname(String operpersonname) {
this.operpersonname = operpersonname == null ? null : operpersonname.trim();
public void setOperPersonName(String operPersonName) {
this.operPersonName = operPersonName == null ? null : operPersonName.trim();
}
public Date getCreatetime() {
return createtime;
public Date getCreateTime() {
return createTime;
}
public void setCreatetime(Date createtime) {
this.createtime = createtime;
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getOpertime() {
return opertime;
public Date getOperTime() {
return operTime;
}
public void setOpertime(Date opertime) {
this.opertime = opertime;
public void setOperTime(Date operTime) {
this.operTime = operTime;
}
public Long getOrganid() {
return organid;
public Long getOrganId() {
return organId;
}
public void setOrganid(Long organid) {
this.organid = organid;
public void setOrganId(Long organId) {
this.organId = organId;
}
public Long getHandspersonid() {
return handspersonid;
public Long getHandsPersonId() {
return handsPersonId;
}
public void setHandspersonid(Long handspersonid) {
this.handspersonid = handspersonid;
public void setHandsPersonId(Long handsPersonId) {
this.handsPersonId = handsPersonId;
}
public Long getAccountid() {
return accountid;
public Long getAccountId() {
return accountId;
}
public void setAccountid(Long accountid) {
this.accountid = accountid;
public void setAccountId(Long accountId) {
this.accountId = accountId;
}
public BigDecimal getChangeamount() {
return changeamount;
public BigDecimal getChangeAmount() {
return changeAmount;
}
public void setChangeamount(BigDecimal changeamount) {
this.changeamount = changeamount;
public void setChangeAmount(BigDecimal changeAmount) {
this.changeAmount = changeAmount;
}
public BigDecimal getTotalprice() {
return totalprice;
public BigDecimal getTotalPrice() {
return totalPrice;
}
public void setTotalprice(BigDecimal totalprice) {
this.totalprice = totalprice;
public void setTotalPrice(BigDecimal totalPrice) {
this.totalPrice = totalPrice;
}
public String getPaytype() {
return paytype;
public String getPayType() {
return payType;
}
public void setPaytype(String paytype) {
this.paytype = paytype == null ? null : paytype.trim();
public void setPayType(String payType) {
this.payType = payType == null ? null : payType.trim();
}
public String getRemark() {
......@@ -182,28 +182,28 @@ public class DepotHead {
this.remark = remark == null ? null : remark.trim();
}
public String getSalesman() {
return salesman;
public String getSalesMan() {
return salesMan;
}
public void setSalesman(String salesman) {
this.salesman = salesman == null ? null : salesman.trim();
public void setSalesMan(String salesMan) {
this.salesMan = salesMan == null ? null : salesMan.trim();
}
public String getAccountidlist() {
return accountidlist;
public String getAccountIdList() {
return accountIdList;
}
public void setAccountidlist(String accountidlist) {
this.accountidlist = accountidlist == null ? null : accountidlist.trim();
public void setAccountIdList(String accountIdList) {
this.accountIdList = accountIdList == null ? null : accountIdList.trim();
}
public String getAccountmoneylist() {
return accountmoneylist;
public String getAccountMoneyList() {
return accountMoneyList;
}
public void setAccountmoneylist(String accountmoneylist) {
this.accountmoneylist = accountmoneylist == null ? null : accountmoneylist.trim();
public void setAccountMoneyList(String accountMoneyList) {
this.accountMoneyList = accountMoneyList == null ? null : accountMoneyList.trim();
}
public BigDecimal getDiscount() {
......@@ -214,52 +214,52 @@ public class DepotHead {
this.discount = discount;
}
public BigDecimal getDiscountmoney() {
return discountmoney;
public BigDecimal getDiscountMoney() {
return discountMoney;
}
public void setDiscountmoney(BigDecimal discountmoney) {
this.discountmoney = discountmoney;
public void setDiscountMoney(BigDecimal discountMoney) {
this.discountMoney = discountMoney;
}
public BigDecimal getDiscountlastmoney() {
return discountlastmoney;
public BigDecimal getDiscountLastMoney() {
return discountLastMoney;
}
public void setDiscountlastmoney(BigDecimal discountlastmoney) {
this.discountlastmoney = discountlastmoney;
public void setDiscountLastMoney(BigDecimal discountLastMoney) {
this.discountLastMoney = discountLastMoney;
}
public BigDecimal getOthermoney() {
return othermoney;
public BigDecimal getOtherMoney() {
return otherMoney;
}
public void setOthermoney(BigDecimal othermoney) {
this.othermoney = othermoney;
public void setOtherMoney(BigDecimal otherMoney) {
this.otherMoney = otherMoney;
}
public String getOthermoneylist() {
return othermoneylist;
public String getOtherMoneyList() {
return otherMoneyList;
}
public void setOthermoneylist(String othermoneylist) {
this.othermoneylist = othermoneylist == null ? null : othermoneylist.trim();
public void setOtherMoneyList(String otherMoneyList) {
this.otherMoneyList = otherMoneyList == null ? null : otherMoneyList.trim();
}
public String getOthermoneyitem() {
return othermoneyitem;
public String getOtherMoneyItem() {
return otherMoneyItem;
}
public void setOthermoneyitem(String othermoneyitem) {
this.othermoneyitem = othermoneyitem == null ? null : othermoneyitem.trim();
public void setOtherMoneyItem(String otherMoneyItem) {
this.otherMoneyItem = otherMoneyItem == null ? null : otherMoneyItem.trim();
}
public Integer getAccountday() {
return accountday;
public Integer getAccountDay() {
return accountDay;
}
public void setAccountday(Integer accountday) {
this.accountday = accountday;
public void setAccountDay(Integer accountDay) {
this.accountDay = accountDay;
}
public String getStatus() {
......@@ -270,12 +270,12 @@ public class DepotHead {
this.status = status == null ? null : status.trim();
}
public String getLinknumber() {
return linknumber;
public String getLinkNumber() {
return linkNumber;
}
public void setLinknumber(String linknumber) {
this.linknumber = linknumber == null ? null : linknumber.trim();
public void setLinkNumber(String linkNumber) {
this.linkNumber = linkNumber == null ? null : linkNumber.trim();
}
public Long getTenantId() {
......
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