Skip to content
GitLab
"src/vscode:/vscode.git/clone" did not exist on "edc5404dae76f0f75a4de707f6e781dc77e3dd20"
Commit 0d6f1449 authored by qiankunpingtai's avatar qiankunpingtai
Browse files

从远程仓库更新

parents c868c071 2195b8bf
Expand all Show whitespace changes
Inline Side-by-side
erp_web/js/pages/materials/bill_detail.js
View file @ 0d6f1449
...@@ -210,6 +210,7 @@ ...@@ -210,6 +210,7 @@
$("#bill .OrganIdShow").text(data.organName); $("#bill .OrganIdShow").text(data.organName);
$("#bill .OperTimeShow").text(data.opertimeStr); $("#bill .OperTimeShow").text(data.opertimeStr);
$("#bill .NumberShow").text(data.number); $("#bill .NumberShow").text(data.number);
$("#bill .LinkNumberShow").text(data.linknumber? data.linknumber : "");
$("#bill .RemarkShow").text(data.remark); $("#bill .RemarkShow").text(data.remark);
$("#bill .DiscountShow").text(data.discount); $("#bill .DiscountShow").text(data.discount);
$("#bill .DiscountMoneyShow").text(data.discountmoney); $("#bill .DiscountMoneyShow").text(data.discountmoney);
......
erp_web/js/pages/materials/in_out.js
View file @ 0d6f1449
//初始化界面 //初始化界面
var kid = sessionStorage.getItem("userId"); var kid = sessionStorage.getItem("userId");
var pageType = getUrlParam('t'); //获取页面类型传值
var depotList = null; var depotList = null;
var depotID = null; var depotID = null;
var supplierList = null; var supplierList = null;
...@@ -447,6 +448,10 @@ ...@@ -447,6 +448,10 @@
//初始化表格数据 //初始化表格数据
function initTableData(){ function initTableData(){
if(pageType === "skip") {
var oldRowInfo = sessionStorage.getItem("rowInfo");
editDepotHead(oldRowInfo); //自动弹出编辑框，带缓存数据
}
var hideType = undefined; var hideType = undefined;
var isHiddenStatus = true; var isHiddenStatus = true;
if(payTypeTitle === "隐藏"){ if(payTypeTitle === "隐藏"){
...@@ -515,6 +520,18 @@ ...@@ -515,6 +520,18 @@
organNameTitle = "会员卡号"; organNameTitle = "会员卡号";
} }
} }
var opWidth = 90; //操作宽度
var isShowSkip = false; //是否显示跳转按钮
var opTitle = ""; //跳转按钮的标题
if(listTitle == "采购订单列表") {
opWidth = 120;
isShowSkip = true;
opTitle = "转采购入库";
} else if(listTitle == "销售订单列表") {
opWidth = 120;
isShowSkip = true;
opTitle = "转销售出库";
}
$('#tableData').datagrid({ $('#tableData').datagrid({
height:heightInfo, height:heightInfo,
rownumbers: false, rownumbers: false,
...@@ -531,7 +548,7 @@ ...@@ -531,7 +548,7 @@
pageList: initPageNum, pageList: initPageNum,
columns:[[ columns:[[
{ field: 'id',width:35,align:"center",checkbox:true}, { field: 'id',width:35,align:"center",checkbox:true},
{ title: '操作',field: 'op',align:"center",width:90, { title: '操作',field: 'op',align:"center",width:opWidth,
formatter:function(value,rec) { formatter:function(value,rec) {
var str = ''; var str = '';
var rowInfo = rec.id + 'AaBb' + rec.projectid+ 'AaBb' + rec.number+ 'AaBb' + rec.operpersonname var rowInfo = rec.id + 'AaBb' + rec.projectid+ 'AaBb' + rec.number+ 'AaBb' + rec.operpersonname
...@@ -542,18 +559,29 @@ ...@@ -542,18 +559,29 @@
+ 'AaBb' + rec.allocationProjectName + 'AaBb' + rec.paytype + 'AaBb' + rec.salesman + 'AaBb' + rec.allocationProjectName + 'AaBb' + rec.paytype + 'AaBb' + rec.salesman
+ 'AaBb' + rec.discount + 'AaBb' + rec.discountmoney + 'AaBb' + rec.discountlastmoney + 'AaBb' + rec.discount + 'AaBb' + rec.discountmoney + 'AaBb' + rec.discountlastmoney
+ 'AaBb' + rec.accountidlist + 'AaBb' + rec.accountmoneylist + 'AaBb' + rec.accountidlist + 'AaBb' + rec.accountmoneylist
+ 'AaBb' + rec.othermoney + 'AaBb' + rec.othermoneylist + 'AaBb' + rec.othermoneyitem + 'AaBb' + rec.accountday; + 'AaBb' + rec.othermoney + 'AaBb' + rec.othermoneylist + 'AaBb' + rec.othermoneyitem
+ 'AaBb' + rec.accountday + 'AaBb' + rec.linknumber;
rowInfo = rowInfo.replace(/\"/g, ""); rowInfo = rowInfo.replace(/\"/g, "");
rowInfo = rowInfo.replace(/\[|]/g,""); rowInfo = rowInfo.replace(/\[|]/g,"");
var orgId = rec.organid? rec.organid:0; var orgId = rec.organid? rec.organid:0;
str += '<img title="查看" src="/js/easyui-1.3.5/themes/icons/list.png" style="cursor: pointer;" onclick="showDepotHead(\'' + rowInfo + '\');"/>&nbsp;&nbsp;&nbsp;'; str += '<img title="查看" src="/js/easyui-1.3.5/themes/icons/list.png" style="cursor: pointer;" onclick="showDepotHead(\'' + rowInfo + '\');"/>&nbsp;&nbsp;&nbsp;';
str += '<img title="编辑" src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editDepotHead(\'' + rowInfo + '\''+',' + rec.status + ');"/>&nbsp;&nbsp;&nbsp;'; str += '<img title="编辑" src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editDepotHead(\'' + rowInfo + '\''+',' + rec.status + ');"/>&nbsp;&nbsp;&nbsp;';
str += '<img title="删除" src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteDepotHead('+ rec.id +',' + orgId +',' + rec.totalprice+',' + rec.status + ');"/>'; str += '<img title="删除" src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteDepotHead('+ rec.id +',' + orgId +',' + rec.totalprice+',' + rec.status + ');"/>';
if(isShowSkip) {
str += '&nbsp;&nbsp;&nbsp;<img title="' + opTitle + '" src="/js/easyui-1.3.5/themes/icons/redo.png" style="cursor: pointer;" onclick="skipDepotHead(\'' + rowInfo + '\''+',' + rec.status + ');"/>';
}
return str; return str;
} }
}, },
{ title: organNameTitle, field: 'organName',width:120, hidden:isShowOrganNameColumn}, { title: organNameTitle, field: 'organName',width:120, hidden:isShowOrganNameColumn},
{ title: '单据编号',field: 'number',width:125}, { title: '单据编号',field: 'number',width:135, formatter:function (value,rec) {
if(rec.linknumber) {
return value + "[转]";
} else {
return value;
}
}
},
{ title: '商品信息',field: 'materialsList',width:180,formatter:function(value){ { title: '商品信息',field: 'materialsList',width:180,formatter:function(value){
if(value) { if(value) {
return value.replace(",","，"); return value.replace(",","，");
...@@ -570,7 +598,17 @@ ...@@ -570,7 +598,17 @@
{ title: '优惠后金额',field: 'discountlastmoney',hidden:isShowLastMoneyColumn,width:80}, { title: '优惠后金额',field: 'discountlastmoney',hidden:isShowLastMoneyColumn,width:80},
{ title: payTypeTitle,field: 'changeamount',width:50,hidden:hideType}, { title: payTypeTitle,field: 'changeamount',width:50,hidden:hideType},
{ title: '状态',field: 'status',hidden:isHiddenStatus, width:70,align:"center",formatter:function(value){ { title: '状态',field: 'status',hidden:isHiddenStatus, width:70,align:"center",formatter:function(value){
return value? "<span style='color:green;'>已审核</span>":"<span style='color:red;'>未审核</span>"; if(value === "0") {
return "<span style='color:red;'>未审核</span>";
} else if(value === "1") {
return "<span style='color:green;'>已审核</span>";
} else if(value === "2") {
if(listTitle == "采购订单列表") {
return "<span style='color:blue;'>已转采购</span>";
} else if(listTitle == "销售订单列表") {
return "<span style='color:blue;'>已转销售</span>";
}
}
} }
} }
]], ]],
...@@ -1110,6 +1148,16 @@ ...@@ -1110,6 +1148,16 @@
}); });
data.footer = array; data.footer = array;
$("#materialData").datagrid('loadData',data); $("#materialData").datagrid('loadData',data);
//如果是订单跳转到采购或销售
if(pageType === "skip") {
var skipList = $("#depotHeadFM .datagrid-body tr");
//逐条自动点击每行数据
skipList.each(function (i) {
setTimeout(function () {
skipList.eq(i).find("[field='Stock']").click();
},(i+1)*1000);
});
}
} }
}, },
error:function() { error:function() {
...@@ -1232,8 +1280,8 @@ ...@@ -1232,8 +1280,8 @@
//删除单据信息 //删除单据信息
function deleteDepotHead(depotHeadID, thisOrganId, totalPrice, status){ function deleteDepotHead(depotHeadID, thisOrganId, totalPrice, status){
if(status) { if(status == "1" || status == "2") {
$.messager.alert('删除提示','已审核的单据不能删除！','warning'); $.messager.alert('删除提示','已审核和已转的单据不能删除！','warning');
return; return;
} }
$.messager.confirm('删除确认','确定要删除此单据信息吗？',function(r) { $.messager.confirm('删除确认','确定要删除此单据信息吗？',function(r) {
...@@ -1285,6 +1333,20 @@ ...@@ -1285,6 +1333,20 @@
}); });
} }
//订单转采购或销售
function skipDepotHead(rowInfo, status){
if(status == "0" || status == "2") {
$.messager.alert('提示','未审核和已转的单据禁止操作！','warning');
} else {
sessionStorage.setItem("rowInfo", rowInfo); //将单据信息存入缓存中
if(listTitle == "采购订单列表") {
parent.addTab("订单转采购", "../materials/purchase_in_list.html?t=skip", "");
} else if(listTitle == "销售订单列表") {
parent.addTab("订单转销售", "../materials/sale_out_list.html?t=skip", "");
}
}
}
//批量删除单据信息 //批量删除单据信息
function batDeleteDepotHead(){ function batDeleteDepotHead(){
var row = $('#tableData').datagrid('getChecked'); var row = $('#tableData').datagrid('getChecked');
...@@ -1297,37 +1359,36 @@ ...@@ -1297,37 +1359,36 @@
{ {
$.messager.confirm('删除确认','确定要删除选中的' + row.length + '条单据信息吗？',function(r) $.messager.confirm('删除确认','确定要删除选中的' + row.length + '条单据信息吗？',function(r)
{ {
if (r) if (r) {
{
var ids = ""; var ids = "";
for(var i = 0;i < row.length; i++) for (var i = 0; i < row.length; i++) {
{ if (i == row.length - 1) {
if(i == row.length-1) if (row[i].status == 0) {
{
ids += row[i].id; ids += row[i].id;
}
break; break;
} }
//alert(row[i].id);
ids += row[i].id + ","; ids += row[i].id + ",";
} }
if (ids) {
//批量更新会员的预收款信息 //批量更新会员的预收款信息
for(var i = 0;i < row.length; i ++) { for (var i = 0; i < row.length; i++) {
if(listSubType === "零售") { if (listSubType === "零售") {
$.ajax({ $.ajax({
type:"post", type: "post",
url: "/supplier/updateAdvanceIn", url: "/supplier/updateAdvanceIn",
dataType: "json", dataType: "json",
data:{ data: {
supplierId: row[i].organid, //会员id supplierId: row[i].organid, //会员id
advanceIn: row[i].totalprice //删除时同时返还用户的预付款 advanceIn: row[i].totalprice //删除时同时返还用户的预付款
}, },
success: function(res){ success: function (res) {
if(res && res.code === 200) { if (res && res.code === 200) {
//保存会员预收款成功 //保存会员预收款成功
} }
}, },
error: function(){ error: function () {
$.messager.alert('提示','保存信息异常，请稍后再试！','error'); $.messager.alert('提示', '保存信息异常，请稍后再试！', 'error');
return; return;
} }
}); });
...@@ -1335,16 +1396,16 @@ ...@@ -1335,16 +1396,16 @@
} }
//批量删除 //批量删除
$.ajax({ $.ajax({
type:"post", type: "post",
// url: "/depotHead/batchDelete", // url: "/depotHead/batchDelete",
url: "/depotHead/batchDeleteDepotHeadAndDetail", url: "/depotHead/batchDeleteDepotHeadAndDetail",
dataType: "json", dataType: "json",
async : false, async: false,
data: ({ data: ({
ids : ids ids: ids
}), }),
success: function (res) { success: function (res) {
if(res && res.code === 200) { if (res && res.code === 200) {
$("#searchBtn").click(); $("#searchBtn").click();
$(":checkbox").attr("checked", false); $(":checkbox").attr("checked", false);
} else { } else {
...@@ -1352,11 +1413,14 @@ ...@@ -1352,11 +1413,14 @@
} }
}, },
//此处添加错误处理 //此处添加错误处理
error:function() { error: function () {
$.messager.alert('删除提示','删除单据信息异常，请稍后再试！','error'); $.messager.alert('删除提示', '删除单据信息异常，请稍后再试！', 'error');
return; return;
} }
}); });
} else {
$.messager.alert('删除提示','没有能删除的单据！','warning');
}
} }
}); });
} }
...@@ -1379,18 +1443,21 @@ ...@@ -1379,18 +1443,21 @@
{ {
if(i == row.length-1) if(i == row.length-1)
{ {
if(row[i].status != "2") {
ids += row[i].id; ids += row[i].id;
}
break; break;
} }
ids += row[i].id + ","; ids += row[i].id + ",";
} }
if(ids) {
$.ajax({ $.ajax({
type:"post", type:"post",
url: "/depotHead/batchSetStatus", url: "/depotHead/batchSetStatus",
dataType: "json", dataType: "json",
async : false, async : false,
data: ({ data: ({
status: true, status: "1",
depotHeadIDs : ids depotHeadIDs : ids
}), }),
success: function (res) { success: function (res) {
...@@ -1407,6 +1474,9 @@ ...@@ -1407,6 +1474,9 @@
return; return;
} }
}); });
} else {
$.messager.alert('审核提示','没有能审核的单据！','warning');
}
} }
}); });
} }
...@@ -1431,22 +1501,25 @@ ...@@ -1431,22 +1501,25 @@
{ {
if(i == row.length-1) if(i == row.length-1)
{ {
if(row[i].status != "2") {
ids += row[i].id; ids += row[i].id;
}
break; break;
} }
ids += row[i].id + ","; ids += row[i].id + ",";
} }
if(ids) {
$.ajax({ $.ajax({
type:"post", type: "post",
url: "/depotHead/batchSetStatus", url: "/depotHead/batchSetStatus",
dataType: "json", dataType: "json",
async : false, async: false,
data: ({ data: ({
status: false, status: "0",
depotHeadIDs : ids depotHeadIDs: ids
}), }),
success: function (res) { success: function (res) {
if(res && res.code === 200) { if (res && res.code === 200) {
$("#searchBtn").click(); $("#searchBtn").click();
$(":checkbox").attr("checked", false); $(":checkbox").attr("checked", false);
} else { } else {
...@@ -1454,40 +1527,29 @@ ...@@ -1454,40 +1527,29 @@
} }
}, },
//此处添加错误处理 //此处添加错误处理
error:function() { error: function () {
$.messager.alert('反审核提示','反审核信息异常，请稍后再试！','error'); $.messager.alert('反审核提示', '反审核信息异常，请稍后再试！', 'error');
return; return;
} }
}); });
} else {
$.messager.alert('反审核提示','没有能反审核的单据！','warning');
}
} }
}); });
} }
} }
//新增信息
function addDepotHead(){
$('#depotHeadFM').form('clear');
var thisDateTime = getNowFormatDateTime(); //当前时间
$("#OperTime").val(thisDateTime);
var thisNumber = getNowFormatDateNum(); //根据时间生成编号
var thisDate = getNowFormatDate(); //当前日期
var beginTime = thisDate + " 00:00:00";
var endTime = thisDate + " 23:59:59";
//生成单据编号 //生成单据编号
function buildNumber() {
$.ajax({ $.ajax({
type: "get", type: "get",
url: "/depotHead/buildNumber", url: "/depotHead/buildNumber",
data: {
type: listType,
subType: listSubType,
beginTime: beginTime,
endTime: endTime
},
success:function(res){ success:function(res){
if(res && res.code === 200){ if(res && res.code === 200){
var obj = res.data; var obj = res.data;
var defaultNumber = obj.DefaultNumber; var defaultNumber = obj.DefaultNumber;
var newNumber = amountNum + defaultNumber var newNumber = amountNum + defaultNumber;
$("#Number").val(newNumber).attr("data-defaultNumber",newNumber); $("#Number").val(newNumber).attr("data-defaultNumber",newNumber);
} }
}, },
...@@ -1495,6 +1557,14 @@ ...@@ -1495,6 +1557,14 @@
$.messager.alert('提示','生成单据编号失败！','error'); $.messager.alert('提示','生成单据编号失败！','error');
} }
}); });
}
//新增信息
function addDepotHead(){
$('#depotHeadFM').form('clear');
var thisDateTime = getNowFormatDateTime(); //当前时间
$("#OperTime").val(thisDateTime);
buildNumber(); //生成单据编号
//初始化优惠率、优惠金额、优惠后金额、本次付|收款、本次欠款 为0 //初始化优惠率、优惠金额、优惠后金额、本次付|收款、本次欠款 为0
$("#Discount").val(0); $("#Discount").val(0);
$("#DiscountMoney").val(0); $("#DiscountMoney").val(0);
...@@ -1561,8 +1631,8 @@ ...@@ -1561,8 +1631,8 @@
//编辑信息 //编辑信息
function editDepotHead(depotHeadTotalInfo, status){ function editDepotHead(depotHeadTotalInfo, status){
if(status) { if(status == "1" || status == "2") {
$.messager.alert('编辑提示','已审核的单据不能编辑！','warning'); $.messager.alert('编辑提示','已审核和已转的单据不能编辑！','warning');
return; return;
} }
var depotHeadInfo = depotHeadTotalInfo.split("AaBb"); var depotHeadInfo = depotHeadTotalInfo.split("AaBb");
...@@ -1572,20 +1642,30 @@ ...@@ -1572,20 +1642,30 @@
initSystemData_person(ProjectId); initSystemData_person(ProjectId);
initSelectInfo_person(); initSelectInfo_person();
} }
var TotalPrice = depotHeadInfo[14]; //合计金额
if(pageType === "skip") { //从订单跳转过来
buildNumber(); //生成单据编号
var thisDateTime = getNowFormatDateTime(); //当前时间
$("#OperTime").val(thisDateTime);
$("#LinkNumber").val(depotHeadInfo[2]); //关联订单号
$("#AccountId").val(defaultAccountId); //初始化默认的账户Id
$("#DiscountLastMoney").val(TotalPrice); //优惠后金额
$("#ChangeAmount").val(TotalPrice).attr("data-changeamount", TotalPrice);
} else {
$("#Number").val(depotHeadInfo[2]).attr("data-defaultNumber",depotHeadInfo[2]); $("#Number").val(depotHeadInfo[2]).attr("data-defaultNumber",depotHeadInfo[2]);
$("#OperTime").val(depotHeadInfo[4]); $("#OperTime").val(depotHeadInfo[4]);
$("#LinkNumber").val(depotHeadInfo[28].replace("undefined","")); //关联订单号
$("#AccountId").val(depotHeadInfo[7]); //账户Id
$("#DiscountLastMoney").val(depotHeadInfo[21].replace("undefined","0.00")); //优惠后金额
$("#ChangeAmount").val(depotHeadInfo[8]).attr("data-changeamount", depotHeadInfo[8]);
}
$('#OrganId').combobox('setValue', depotHeadInfo[5]=='undefined'?'':depotHeadInfo[5]); $('#OrganId').combobox('setValue', depotHeadInfo[5]=='undefined'?'':depotHeadInfo[5]);
$("#HandsPersonId").val(depotHeadInfo[6]); $("#HandsPersonId").val(depotHeadInfo[6]);
$("#AccountId").val(depotHeadInfo[7]);
$("#ChangeAmount").val(depotHeadInfo[8]);
$("#ChangeAmount").attr("data-changeamount", depotHeadInfo[8]);
$("#Remark").val(depotHeadInfo[9]); $("#Remark").val(depotHeadInfo[9]);
$("#Discount").val(depotHeadInfo[19]); $("#Discount").val(depotHeadInfo[19].replace("undefined","0"));
$("#DiscountMoney").val(depotHeadInfo[20]); $("#DiscountMoney").val(depotHeadInfo[20].replace("undefined","0.00"));
$("#DiscountLastMoney").val(depotHeadInfo[21]); $("#Debt").val((depotHeadInfo[21].replace("undefined","0.00")-depotHeadInfo[8]).toFixed(2));
$("#Debt").val((depotHeadInfo[21]-depotHeadInfo[8]).toFixed(2));
$("#AccountDay").val(depotHeadInfo[27].replace("undefined","")); //结算天数 $("#AccountDay").val(depotHeadInfo[27].replace("undefined","")); //结算天数
var TotalPrice = depotHeadInfo[14];
preTotalPrice = depotHeadInfo[14]; //记录前一次合计金额，用于扣预付款 preTotalPrice = depotHeadInfo[14]; //记录前一次合计金额，用于扣预付款
$("#AllocationProjectId").val(depotHeadInfo[15]); $("#AllocationProjectId").val(depotHeadInfo[15]);
oldNumber = depotHeadInfo[2]; //记录编辑前的单据编号 oldNumber = depotHeadInfo[2]; //记录编辑前的单据编号
...@@ -1658,7 +1738,13 @@ ...@@ -1658,7 +1738,13 @@
initTableData_material("edit",TotalPrice); //商品列表 initTableData_material("edit",TotalPrice); //商品列表
reject(); //撤销下、刷新商品列表 reject(); //撤销下、刷新商品列表
url = '/depotHead/updateDepotHeadAndDetail?id=' + depotHeadInfo[0]; if(pageType === "skip") {
url = '/depotHead/addDepotHeadAndDetail'; //如果是从订单跳转过来，则此处为新增的接口
//jshjshjsh
$("#depotHeadFM .datagrid-body").find("[field='DepotId']").click();
} else {
url = '/depotHead/updateDepotHeadAndDetail?id=' + depotHeadInfo[0]; //更新接口
}
} }
//查看信息 //查看信息
...@@ -1700,6 +1786,7 @@ ...@@ -1700,6 +1786,7 @@
$("#DiscountLastMoneyShow").text(depotHeadInfo[21]); $("#DiscountLastMoneyShow").text(depotHeadInfo[21]);
$("#DebtShow").text((depotHeadInfo[21]-depotHeadInfo[8]).toFixed(2)); $("#DebtShow").text((depotHeadInfo[21]-depotHeadInfo[8]).toFixed(2));
$("#AccountDayShow").text(depotHeadInfo[27].replace("undefined","")); //结算天数 $("#AccountDayShow").text(depotHeadInfo[27].replace("undefined","")); //结算天数
$("#LinkNumberShow").text(depotHeadInfo[28].replace("undefined","")); //关联订单号
if(depotHeadInfo[25] && depotHeadInfo[26]){ if(depotHeadInfo[25] && depotHeadInfo[26]){
var itemArr = depotHeadInfo[25].split(","); //支出项目id列表 var itemArr = depotHeadInfo[25].split(","); //支出项目id列表
var itemMoneyArr = depotHeadInfo[26].split(","); //支出项目金额列表 var itemMoneyArr = depotHeadInfo[26].split(","); //支出项目金额列表
...@@ -2027,6 +2114,7 @@ ...@@ -2027,6 +2114,7 @@
AllocationProjectId: AllocationProjectId, AllocationProjectId: AllocationProjectId,
DefaultNumber: $.trim($("#Number").attr("data-defaultNumber")),//初始编号 DefaultNumber: $.trim($("#Number").attr("data-defaultNumber")),//初始编号
Number: $.trim($("#Number").val()), Number: $.trim($("#Number").val()),
LinkNumber: $.trim($("#LinkNumber").val()),
OperTime: $("#OperTime").val(), OperTime: $("#OperTime").val(),
OrganId: OrganId, OrganId: OrganId,
HandsPersonId: $.trim($("#HandsPersonId").val()), HandsPersonId: $.trim($("#HandsPersonId").val()),
...@@ -2970,7 +3058,12 @@ ...@@ -2970,7 +3058,12 @@
* 新增单据主表及单据子表 * 新增单据主表及单据子表
* */ * */
function addDepotHeadAndDetail(url,infoStr){ function addDepotHeadAndDetail(url,infoStr){
var inserted = $("#materialData").datagrid('getChanges', "inserted"); var inserted = null;
if(pageType === "skip") {
inserted = $("#materialData").datagrid('getChanges', "updated");
} else {
inserted = $("#materialData").datagrid('getChanges', "inserted");
}
var deleted = $("#materialData").datagrid('getChanges', "deleted"); var deleted = $("#materialData").datagrid('getChanges', "deleted");
var updated = $("#materialData").datagrid('getChanges', "updated"); var updated = $("#materialData").datagrid('getChanges', "updated");
$.ajax({ $.ajax({
......
erp_web/js/print/print.js
View file @ 0d6f1449
...@@ -21,11 +21,9 @@ function CreateFormPage(strPrintName, printDatagrid) { ...@@ -21,11 +21,9 @@ function CreateFormPage(strPrintName, printDatagrid) {
if (res && res.code === 200) { if (res && res.code === 200) {
if(res.data && res.data.page) { if(res.data && res.data.page) {
var array = res.data.page.rows; var array = res.data.page.rows;
for (var i = 0; i < array.length; i++) { if(array.length > 0) {
var name = array[i].name; var info = array[0];
if (name === "company_name") { companyName = info.companyName;
companyName = array[i].value;
}
} }
} }
} }
......
erp_web/pages/manage/systemConfig.html
View file @ 0d6f1449
This diff is collapsed.
erp_web/pages/materials/bill_detail.html
View file @ 0d6f1449
...@@ -173,8 +173,10 @@ ...@@ -173,8 +173,10 @@
<td style="padding:5px;width:140px;"> <td style="padding:5px;width:140px;">
<span class="NumberShow"></span> <span class="NumberShow"></span>
</td> </td>
<td style="width:70px;"></td> <td style="width:70px;">关联订单：</td>
<td style="padding:5px;width:140px;"></td> <td style="padding:5px;width:130px;">
<span class="LinkNumberShow"></span>
</td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
...@@ -222,10 +224,8 @@ ...@@ -222,10 +224,8 @@
<td style="padding:5px"> <td style="padding:5px">
<span class="OtherMoneyShow"></span> <span class="OtherMoneyShow"></span>
</td> </td>
<td>结算天数：</td> <td></td>
<td style="padding:5px"> <td style="padding:5px"></td>
<span class="AccountDayShow"></span>
</td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
</table> </table>
...@@ -312,18 +312,18 @@ ...@@ -312,18 +312,18 @@
<td style="padding:5px;width:130px;"> <td style="padding:5px;width:130px;">
<span class="OrganIdShow"></span> <span class="OrganIdShow"></span>
</td> </td>
<td style="width:70px;">销售人员：</td> <td style="width:70px;">单据日期：</td>
<td style="padding:5px;width:130px;">
<span class="SalesmanShow"></span>
</td>
<td style="width:80px;">单据日期：</td>
<td style="padding:5px;width:140px;"> <td style="padding:5px;width:140px;">
<span class="OperTimeShow"></span> <span class="OperTimeShow"></span>
</td> </td>
<td style="width:70px;">单据编号：</td> <td style="width:80px;">单据编号：</td>
<td style="padding:5px;width:140px;"> <td style="padding:5px;width:140px;">
<span class="NumberShow"></span> <span class="NumberShow"></span>
</td> </td>
<td style="width:70px;">关联订单：</td>
<td style="padding:5px;width:130px;">
<span class="LinkNumberShow"></span>
</td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
...@@ -371,9 +371,9 @@ ...@@ -371,9 +371,9 @@
<td style="padding:5px"> <td style="padding:5px">
<span class="OtherMoneyShow"></span> <span class="OtherMoneyShow"></span>
</td> </td>
<td>结算天数：</td> <td>销售人员：</td>
<td style="padding:5px"> <td style="padding:5px">
<span class="AccountDayShow"></span> <span class="SalesmanShow"></span>
</td> </td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
...@@ -388,10 +388,6 @@ ...@@ -388,10 +388,6 @@
<td style="padding:5px;width:130px;"> <td style="padding:5px;width:130px;">
<span class="OrganIdShow"></span> <span class="OrganIdShow"></span>
</td> </td>
<td style="width:70px;">销售人员：</td>
<td style="padding:5px;width:130px;">
<span class="SalesmanShow"></span>
</td>
<td style="width:80px;">单据日期：</td> <td style="width:80px;">单据日期：</td>
<td style="padding:5px;width:140px;"> <td style="padding:5px;width:140px;">
<span class="OperTimeShow"></span> <span class="OperTimeShow"></span>
...@@ -400,6 +396,8 @@ ...@@ -400,6 +396,8 @@
<td style="padding:5px;width:140px;"> <td style="padding:5px;width:140px;">
<span class="NumberShow"></span> <span class="NumberShow"></span>
</td> </td>
<td style="width:70px;"></td>
<td style="padding:5px;width:130px;"></td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
...@@ -447,8 +445,9 @@ ...@@ -447,8 +445,9 @@
<td style="padding:5px"> <td style="padding:5px">
<span class="OtherMoneyShow"></span> <span class="OtherMoneyShow"></span>
</td> </td>
<td></td> <td>销售人员：</td>
<td style="padding:5px"> <td style="padding:5px">
<span class="SalesmanShow"></span>
</td> </td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
......
erp_web/pages/materials/purchase_in_list.html
View file @ 0d6f1449
...@@ -82,8 +82,9 @@ ...@@ -82,8 +82,9 @@
<input name="Number" id="Number" class="easyui-validatebox" <input name="Number" id="Number" class="easyui-validatebox"
data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/> data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/>
</td> </td>
<td style="width:70px;"></td> <td style="width:70px;">关联订单：</td>
<td style="padding:5px"> <td style="padding:5px">
<input name="LinkNumber" id="LinkNumber" class="easyui-validatebox" style="width: 150px;" readonly/>
</td> </td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
...@@ -135,10 +136,8 @@ ...@@ -135,10 +136,8 @@
<input id="OtherMoney" name="OtherMoney" style="width:120px;" readonly="readonly"/> <input id="OtherMoney" name="OtherMoney" style="width:120px;" readonly="readonly"/>
<img class="other-money-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg"/> <img class="other-money-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg"/>
</td> </td>
<td>结算天数：</td> <td></td>
<td style="padding:5px"> <td style="padding:5px">
<input id="AccountDay" name="AccountDay" class="easyui-validatebox"
data-options="validType:'length[1,3]'" style="width:120px;"/>
</td> </td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
...@@ -167,8 +166,10 @@ ...@@ -167,8 +166,10 @@
<td style="padding:5px;width:140px;"> <td style="padding:5px;width:140px;">
<span id="NumberShow"></span> <span id="NumberShow"></span>
</td> </td>
<td style="width:70px;"></td> <td style="width:70px;">关联订单：</td>
<td style="padding:5px;width:140px;"></td> <td style="padding:5px;width:140px;">
<span id="LinkNumberShow"></span>
</td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
...@@ -216,10 +217,8 @@ ...@@ -216,10 +217,8 @@
<td style="padding:5px"> <td style="padding:5px">
<span id="OtherMoneyShow"></span> <span id="OtherMoneyShow"></span>
</td> </td>
<td>结算天数：</td> <td></td>
<td style="padding:5px"> <td style="padding:5px"></td>
<span id="AccountDayShow"></span>
</td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
</table> </table>
......
erp_web/pages/materials/sale_back_list.html
View file @ 0d6f1449
...@@ -65,10 +65,6 @@ ...@@ -65,10 +65,6 @@
<td style="padding:5px"> <td style="padding:5px">
<input id="OrganId" name="OrganId" style="width:110px;"/> <input id="OrganId" name="OrganId" style="width:110px;"/>
</td> </td>
<td style="width:70px;">销售人员：</td>
<td style="padding:5px">
<input id="Salesman" name="Salesman" style="width:130px;"/>
</td>
<td>单据日期：</td> <td>单据日期：</td>
<td style="padding:5px"> <td style="padding:5px">
<input type="text" name="OperTime" id="OperTime" <input type="text" name="OperTime" id="OperTime"
...@@ -80,6 +76,8 @@ ...@@ -80,6 +76,8 @@
<input name="Number" id="Number" class="easyui-validatebox" <input name="Number" id="Number" class="easyui-validatebox"
data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/> data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/>
</td> </td>
<td style="width:70px;"></td>
<td style="padding:5px"></td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
...@@ -130,8 +128,9 @@ ...@@ -130,8 +128,9 @@
<input id="OtherMoney" name="OtherMoney" style="width:120px;" readonly="readonly"/> <input id="OtherMoney" name="OtherMoney" style="width:120px;" readonly="readonly"/>
<img class="other-money-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg"/> <img class="other-money-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg"/>
</td> </td>
<td></td> <td>销售人员：</td>
<td style="padding:5px"> <td style="padding:5px">
<input id="Salesman" name="Salesman" style="width:130px;"/>
</td> </td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
...@@ -151,10 +150,6 @@ ...@@ -151,10 +150,6 @@
<td style="padding:5px;width:130px;"> <td style="padding:5px;width:130px;">
<span id="OrganIdShow"></span> <span id="OrganIdShow"></span>
</td> </td>
<td style="width:70px;">销售人员：</td>
<td style="padding:5px;width:130px;">
<span id="SalesmanShow"></span>
</td>
<td style="width:80px;">单据日期：</td> <td style="width:80px;">单据日期：</td>
<td style="padding:5px;width:140px;"> <td style="padding:5px;width:140px;">
<span id="OperTimeShow"></span> <span id="OperTimeShow"></span>
...@@ -163,6 +158,8 @@ ...@@ -163,6 +158,8 @@
<td style="padding:5px;width:140px;"> <td style="padding:5px;width:140px;">
<span id="NumberShow"></span> <span id="NumberShow"></span>
</td> </td>
<td style="width:70px;"></td>
<td style="padding:5px;width:130px;"></td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
...@@ -210,8 +207,9 @@ ...@@ -210,8 +207,9 @@
<td style="padding:5px"> <td style="padding:5px">
<span id="OtherMoneyShow"></span> <span id="OtherMoneyShow"></span>
</td> </td>
<td></td> <td>销售人员：</td>
<td style="padding:5px"> <td style="padding:5px">
<span id="SalesmanShow"></span>
</td> </td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
......
erp_web/pages/materials/sale_orders_list.html
View file @ 0d6f1449
...@@ -65,21 +65,21 @@ ...@@ -65,21 +65,21 @@
<td style="padding:5px"> <td style="padding:5px">
<input id="OrganId" name="OrganId" style="width:130px;"/> <input id="OrganId" name="OrganId" style="width:130px;"/>
</td> </td>
<td style="width:70px;">销售人员：</td> <td style="width:70px;">单据日期：</td>
<td style="padding:5px">
<input id="Salesman" name="Salesman" style="width:130px;"/>
</td>
<td style="width:80px;">单据日期：</td>
<td style="padding:5px"> <td style="padding:5px">
<input type="text" name="OperTime" id="OperTime" <input type="text" name="OperTime" id="OperTime"
onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate" onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
style="width:140px;" readonly/> style="width:140px;" readonly/>
</td> </td>
<td style="width:70px;">单据编号：</td> <td style="width:80px;">单据编号：</td>
<td style="padding:5px"> <td style="padding:5px">
<input name="Number" id="Number" class="easyui-validatebox" <input name="Number" id="Number" class="easyui-validatebox"
data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/> data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/>
</td> </td>
<td style="width:70px;">销售人员：</td>
<td style="padding:5px">
<input id="Salesman" name="Salesman" style="width:130px;"/>
</td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
...@@ -110,18 +110,18 @@ ...@@ -110,18 +110,18 @@
<td style="padding:5px;width:130px;"> <td style="padding:5px;width:130px;">
<span id="OrganIdShow"></span> <span id="OrganIdShow"></span>
</td> </td>
<td style="width:70px;">销售人员：</td> <td style="width:70px;">单据日期：</td>
<td style="padding:5px;width:130px;">
<span id="SalesmanShow"></span>
</td>
<td style="width:80px;">单据日期：</td>
<td style="padding:5px;width:140px;"> <td style="padding:5px;width:140px;">
<span id="OperTimeShow"></span> <span id="OperTimeShow"></span>
</td> </td>
<td style="width:70px;">单据编号：</td> <td style="width:80px;">单据编号：</td>
<td style="padding:5px;width:140px;"> <td style="padding:5px;width:140px;">
<span id="NumberShow"></span> <span id="NumberShow"></span>
</td> </td>
<td style="width:70px;">销售人员：</td>
<td style="padding:5px;width:130px;">
<span id="SalesmanShow"></span>
</td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
......
erp_web/pages/materials/sale_out_list.html
View file @ 0d6f1449
...@@ -65,21 +65,21 @@ ...@@ -65,21 +65,21 @@
<td style="padding:5px"> <td style="padding:5px">
<input id="OrganId" name="OrganId" style="width:130px;"/> <input id="OrganId" name="OrganId" style="width:130px;"/>
</td> </td>
<td style="width:70px;">销售人员：</td> <td style="width:70px;">单据日期：</td>
<td style="padding:5px">
<input id="Salesman" name="Salesman" style="width:130px;"/>
</td>
<td style="width:80px;">单据日期：</td>
<td style="padding:5px"> <td style="padding:5px">
<input type="text" name="OperTime" id="OperTime" <input type="text" name="OperTime" id="OperTime"
onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate" onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
style="width:140px;" readonly/> style="width:140px;" readonly/>
</td> </td>
<td style="width:70px;">单据编号：</td> <td style="width:80px;">单据编号：</td>
<td style="padding:5px"> <td style="padding:5px">
<input name="Number" id="Number" class="easyui-validatebox" <input name="Number" id="Number" class="easyui-validatebox"
data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/> data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/>
</td> </td>
<td style="width:70px;">关联订单：</td>
<td style="padding:5px">
<input name="LinkNumber" id="LinkNumber" class="easyui-validatebox" style="width: 150px;" readonly/>
</td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
...@@ -130,10 +130,9 @@ ...@@ -130,10 +130,9 @@
<input id="OtherMoney" name="OtherMoney" style="width:120px;" readonly="readonly"/> <input id="OtherMoney" name="OtherMoney" style="width:120px;" readonly="readonly"/>
<img class="other-money-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg"/> <img class="other-money-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg"/>
</td> </td>
<td>结算天数：</td> <td>销售人员：</td>
<td style="padding:5px"> <td style="padding:5px">
<input id="AccountDay" name="AccountDay" class="easyui-numberbox" <input id="Salesman" name="Salesman" style="width:130px;"/>
data-options="validType:'length[1,3]'" style="width:120px;"/>
</td> </td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
...@@ -153,18 +152,18 @@ ...@@ -153,18 +152,18 @@
<td style="padding:5px;width:130px;"> <td style="padding:5px;width:130px;">
<span id="OrganIdShow"></span> <span id="OrganIdShow"></span>
</td> </td>
<td style="width:70px;">销售人员：</td> <td style="width:70px;">单据日期：</td>
<td style="padding:5px;width:130px;">
<span id="SalesmanShow"></span>
</td>
<td style="width:80px;">单据日期：</td>
<td style="padding:5px;width:140px;"> <td style="padding:5px;width:140px;">
<span id="OperTimeShow"></span> <span id="OperTimeShow"></span>
</td> </td>
<td style="width:70px;">单据编号：</td> <td style="width:80px;">单据编号：</td>
<td style="padding:5px;width:140px;"> <td style="padding:5px;width:140px;">
<span id="NumberShow"></span> <span id="NumberShow"></span>
</td> </td>
<td style="width:70px;">关联订单：</td>
<td style="padding:5px;width:130px;">
<span id="LinkNumberShow"></span>
</td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
...@@ -212,9 +211,9 @@ ...@@ -212,9 +211,9 @@
<td style="padding:5px"> <td style="padding:5px">
<span id="OtherMoneyShow"></span> <span id="OtherMoneyShow"></span>
</td> </td>
<td>结算天数：</td> <td>销售人员：</td>
<td style="padding:5px"> <td style="padding:5px">
<span id="AccountDayShow"></span> <span id="SalesmanShow"></span>
</td> </td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
......
erp_web/pages/reports/customer_account.html
View file @ 0d6f1449
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
<td>&nbsp;</td> <td>&nbsp;</td>
<td> <td>
期初应收：<span class="first-total">0</span>&nbsp;&nbsp; 期初应收：<span class="first-total">0</span>&nbsp;&nbsp;
期末应收：<span class="last-total">0</span> 期末应收：<span class="last-total">0</span><span id="pleaseSelect">（请选择客户）</span>
</td> </td>
</tr> </tr>
</table> </table>
...@@ -241,7 +241,7 @@ ...@@ -241,7 +241,7 @@
supType: "customer" supType: "customer"
}), }),
success: function (res) { success: function (res) {
if (res && res.code === 200 && res.data && res.data.rows && res.data.rows.getAllMoney) { if (res && res.code === 200 && res.data && res.data.rows) {
var moneyA = res.data.rows.getAllMoney.toFixed(2) - 0; var moneyA = res.data.rows.getAllMoney.toFixed(2) - 0;
$.ajax({ $.ajax({
type: "get", type: "get",
...@@ -254,13 +254,14 @@ ...@@ -254,13 +254,14 @@
supType: "customer" supType: "customer"
}), }),
success: function (res) { success: function (res) {
if (res && res.code === 200 && res.data && res.data.rows && res.data.rows.getAllMoney) { if (res && res.code === 200 && res.data && res.data.rows) {
var moneyB = res.data.rows.getAllMoney.toFixed(2) - 0; var moneyB = res.data.rows.getAllMoney.toFixed(2) - 0;
var money = moneyA + moneyB; var money = moneyA + moneyB;
var moneyBeginNeedGet = beginNeedGet - 0; //期初应收 var moneyBeginNeedGet = beginNeedGet - 0; //期初应收
var moneyBeginNeedPay = beginNeedPay - 0; //期初应付 var moneyBeginNeedPay = beginNeedPay - 0; //期初应付
money = (money + moneyBeginNeedGet - moneyBeginNeedPay).toFixed(2); money = (money + moneyBeginNeedGet - moneyBeginNeedPay).toFixed(2);
$(".first-total").text(money); //期初结存 $(".first-total").text(money); //期初结存
$("#pleaseSelect").hide();
} }
}, },
error: function () { error: function () {
...@@ -289,7 +290,7 @@ ...@@ -289,7 +290,7 @@
supType: "customer" supType: "customer"
}), }),
success: function (res) { success: function (res) {
if (res && res.code === 200 && res.data && res.data.rows && res.data.rows.getAllMoney) { if (res && res.code === 200 && res.data && res.data.rows) {
var moneyA = res.data.rows.getAllMoney.toFixed(2) - 0; var moneyA = res.data.rows.getAllMoney.toFixed(2) - 0;
$.ajax({ $.ajax({
type: "get", type: "get",
...@@ -302,13 +303,14 @@ ...@@ -302,13 +303,14 @@
supType: "customer" supType: "customer"
}), }),
success: function (res) { success: function (res) {
if (res && res.code === 200 && res.data && res.data.rows && res.data.rows.getAllMoney) { if (res && res.code === 200 && res.data && res.data.rows) {
var moneyB = res.data.rows.getAllMoney.toFixed(2) - 0; var moneyB = res.data.rows.getAllMoney.toFixed(2) - 0;
var money = moneyA + moneyB; var money = moneyA + moneyB;
var moneyBeginNeedGet = beginNeedGet - 0; //期初应收 var moneyBeginNeedGet = beginNeedGet - 0; //期初应收
var moneyBeginNeedPay = beginNeedPay - 0; //期初应付 var moneyBeginNeedPay = beginNeedPay - 0; //期初应付
money = (money + moneyBeginNeedGet - moneyBeginNeedPay).toFixed(2); money = (money + moneyBeginNeedGet - moneyBeginNeedPay).toFixed(2);
$(".last-total").text(money); //期末合计 $(".last-total").text(money); //期末合计
$("#pleaseSelect").hide();
} }
}, },
error: function () { error: function () {
......
erp_web/pages/reports/vendor_account.html
View file @ 0d6f1449
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
<td>&nbsp;</td> <td>&nbsp;</td>
<td> <td>
期初应付：<span class="first-total">0</span>&nbsp;&nbsp; 期初应付：<span class="first-total">0</span>&nbsp;&nbsp;
期末应付：<span class="last-total">0</span> 期末应付：<span class="last-total">0</span><span id="pleaseSelect">（请选择供应商）</span>
</td> </td>
</tr> </tr>
</table> </table>
...@@ -240,7 +240,7 @@ ...@@ -240,7 +240,7 @@
supType: "vendor" supType: "vendor"
}), }),
success: function (res) { success: function (res) {
if (res && res.code === 200 && res.data && res.data.rows && res.data.rows.getAllMoney) { if (res && res.code === 200 && res.data && res.data.rows) {
var moneyA = res.data.rows.getAllMoney.toFixed(2) - 0; var moneyA = res.data.rows.getAllMoney.toFixed(2) - 0;
$.ajax({ $.ajax({
type: "get", type: "get",
...@@ -253,13 +253,14 @@ ...@@ -253,13 +253,14 @@
supType: "vendor" supType: "vendor"
}), }),
success: function (res) { success: function (res) {
if (res && res.code === 200 && res.data && res.data.rows && res.data.rows.getAllMoney) { if (res && res.code === 200 && res.data && res.data.rows) {
var moneyB = res.data.rows.getAllMoney.toFixed(2) - 0; var moneyB = res.data.rows.getAllMoney.toFixed(2) - 0;
var money = moneyA + moneyB; var money = moneyA + moneyB;
var moneyBeginNeedGet = beginNeedGet - 0; //期初应收 var moneyBeginNeedGet = beginNeedGet - 0; //期初应收
var moneyBeginNeedPay = beginNeedPay - 0; //期初应付 var moneyBeginNeedPay = beginNeedPay - 0; //期初应付
money = (money + moneyBeginNeedPay - moneyBeginNeedGet).toFixed(2); money = (money + moneyBeginNeedPay - moneyBeginNeedGet).toFixed(2);
$(".first-total").text(money); //期初结存 $(".first-total").text(money); //期初结存
$("#pleaseSelect").hide();
} }
}, },
error: function () { error: function () {
...@@ -288,7 +289,7 @@ ...@@ -288,7 +289,7 @@
supType: "vendor" supType: "vendor"
}), }),
success: function (res) { success: function (res) {
if (res && res.code === 200 && res.data && res.data.rows && res.data.rows.getAllMoney) { if (res && res.code === 200 && res.data && res.data.rows) {
var moneyA = res.data.rows.getAllMoney.toFixed(2) - 0; var moneyA = res.data.rows.getAllMoney.toFixed(2) - 0;
$.ajax({ $.ajax({
type: "get", type: "get",
...@@ -301,13 +302,14 @@ ...@@ -301,13 +302,14 @@
supType: "vendor" supType: "vendor"
}), }),
success: function (res) { success: function (res) {
if (res && res.code === 200 && res.data && res.data.rows && res.data.rows.getAllMoney) { if (res && res.code === 200 && res.data && res.data.rows) {
var moneyB = res.data.rows.getAllMoney.toFixed(2) - 0; var moneyB = res.data.rows.getAllMoney.toFixed(2) - 0;
var money = moneyA + moneyB; var money = moneyA + moneyB;
var moneyBeginNeedGet = beginNeedGet - 0; //期初应收 var moneyBeginNeedGet = beginNeedGet - 0; //期初应收
var moneyBeginNeedPay = beginNeedPay - 0; //期初应付 var moneyBeginNeedPay = beginNeedPay - 0; //期初应付
money = (money + moneyBeginNeedPay - moneyBeginNeedGet).toFixed(2); money = (money + moneyBeginNeedPay - moneyBeginNeedGet).toFixed(2);
$(".last-total").text(money); //期末合计 $(".last-total").text(money); //期末合计
$("#pleaseSelect").hide();
} }
}, },
error: function () { error: function () {
......
sql/jsh_erp.sql
View file @ 0d6f1449
...@@ -1307,10 +1307,57 @@ INSERT INTO `jsh_functions`(`Number`, `Name`, `PNumber`, `URL`, `State`, `Sort`, ...@@ -1307,10 +1307,57 @@ INSERT INTO `jsh_functions`(`Number`, `Name`, `PNumber`, `URL`, `State`, `Sort`,
-- 添加根机构 -- 添加根机构
-- ---------------------------- -- ----------------------------
INSERT INTO `jsh_organization`(`org_no`, `org_full_name`, `org_abr`, `org_tpcd`, `org_stcd`, `org_parent_no`, `sort`, `remark`, `create_time`, `creator`, `update_time`, `updater`, `org_create_time`, `org_stop_time`) VALUES ('01', '根机构', '根机构', NULL, '2', '-1', '1', '根机构，初始化存在', NULL, NULL, NULL, NULL, NULL, NULL); INSERT INTO `jsh_organization`(`org_no`, `org_full_name`, `org_abr`, `org_tpcd`, `org_stcd`, `org_parent_no`, `sort`, `remark`, `create_time`, `creator`, `update_time`, `updater`, `org_create_time`, `org_stop_time`) VALUES ('01', '根机构', '根机构', NULL, '2', '-1', '1', '根机构，初始化存在', NULL, NULL, NULL, NULL, NULL, NULL);
-- ---------------------------- -- ----------------------------
-- 时间：2019年3月8日 -- 时间：2019年3月9日
-- version：1.0.6 -- version：1.0.6
-- 此次更新 -- 此次更新
-- 整改jsh_systemconfig表的字段
-- ----------------------------
alter table jsh_systemconfig drop type;
alter table jsh_systemconfig drop name;
alter table jsh_systemconfig drop value;
alter table jsh_systemconfig drop description;
alter table jsh_systemconfig add company_name varchar(50) DEFAULT null COMMENT '公司名称';
alter table jsh_systemconfig add company_contacts varchar(20) DEFAULT null COMMENT '公司联系人';
alter table jsh_systemconfig add company_address varchar(50) DEFAULT null COMMENT '公司地址';
alter table jsh_systemconfig add company_tel varchar(20) DEFAULT null COMMENT '公司电话';
alter table jsh_systemconfig add company_fax varchar(20) DEFAULT null COMMENT '公司传真';
alter table jsh_systemconfig add company_post_code varchar(20) DEFAULT null COMMENT '公司邮编';
delete from jsh_systemconfig;
insert into jsh_systemconfig (`company_name`, `company_contacts`, `company_address`, `company_tel`, `company_fax`, `company_post_code`) values("南通jshERP公司","张三","南通市通州区某某路","0513-10101010","0513-18181818","226300");
-- ----------------------------
-- 时间：2019年3月9日
-- version：1.0.7
-- 改管理员的功能权限
-- ----------------------------
update jsh_userbusiness SET
Value = '[13][12][16][243][14][15][234][236][22][23][220][240][25][217][218][26][194][195][31][59][207][208][209][226][227][228][229][235][237][210][211][241][33][199][242][41][200][201][202][40][232][233][197][203][204][205][206][212]'
where Id = 5;
-- ----------------------------
-- 给订单功能加审核和反审核的功能按钮权限
-- ----------------------------
update jsh_functions SET PushBtn = '3' where Number = '050202' and PNumber = '0502';
update jsh_functions SET PushBtn = '3' where Number = '060301' and PNumber = '0603';
-- ----------------------------
-- 改管理员的按钮权限
-- ----------------------------
update jsh_userbusiness SET
BtnStr = '[{"funId":"25","btnStr":"1"},{"funId":"217","btnStr":"1"},{"funId":"218","btnStr":"1"},{"funId":"241","btnStr":"3"},{"funId":"242","btnStr":"3"}]'
where Id = 5;
-- ----------------------------
-- 时间：2019年3月10日
-- 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 '关联订单号';
-- ----------------------------
-- 时间：2019年3月12日
-- version：1.0.9
-- 此次更新
-- 1、根据本地用户表中现有部门生成机构表数据，同时重建机构和用户的关联关系 -- 1、根据本地用户表中现有部门生成机构表数据，同时重建机构和用户的关联关系
-- 特别提醒：之后的sql都是在之前基础上迭代，可以对已存在的系统进行数据保留更新 -- 特别提醒：之后的sql都是在之前基础上迭代，可以对已存在的系统进行数据保留更新
-- ---------------------------- -- ----------------------------
......
src/main/java/com/jsh/erp/constants/BusinessConstants.java
View file @ 0d6f1449
...@@ -51,6 +51,12 @@ public class BusinessConstants { ...@@ -51,6 +51,12 @@ public class BusinessConstants {
* */ * */
public static final String ENABLE_SERIAL_NUMBER_ENABLED = "1"; public static final String ENABLE_SERIAL_NUMBER_ENABLED = "1";
public static final String ENABLE_SERIAL_NUMBER_NOT_ENABLED = "0"; public static final String ENABLE_SERIAL_NUMBER_NOT_ENABLED = "0";
/**
* 单据状态 billsStatus '0'未审核 '1'审核 '2'已转采购|销售
* */
public static final String BILLS_STATUS_UN_AUDIT = "0";
public static final String BILLS_STATUS_AUDIT = "1";
public static final String BILLS_STATUS_SKIP = "2";
/** /**
* 出入库分类 * 出入库分类
*采购、采购退货、其它、零售、销售、调拨 *采购、采购退货、其它、零售、销售、调拨
......
src/main/java/com/jsh/erp/controller/DepotHeadController.java
View file @ 0d6f1449
...@@ -51,7 +51,7 @@ public class DepotHeadController { ...@@ -51,7 +51,7 @@ public class DepotHeadController {
* @return * @return
*/ */
@PostMapping(value = "/batchSetStatus") @PostMapping(value = "/batchSetStatus")
public String batchSetStatus(@RequestParam("status") Boolean status, public String batchSetStatus(@RequestParam("status") String status,
@RequestParam("depotHeadIDs") String depotHeadIDs, @RequestParam("depotHeadIDs") String depotHeadIDs,
HttpServletRequest request) { HttpServletRequest request) {
Map<String, Object> objectMap = new HashMap<String, Object>(); Map<String, Object> objectMap = new HashMap<String, Object>();
...@@ -64,20 +64,12 @@ public class DepotHeadController { ...@@ -64,20 +64,12 @@ public class DepotHeadController {
} }
/** /**
* 单据编号生成接口，规则：查找当前类型单据下的当天最大的单据号，并加1 * 单据编号生成接口
* @param type
* @param subType
* @param beginTime
* @param endTime
* @param request * @param request
* @return * @return
*/ */
@GetMapping(value = "/buildNumber") @GetMapping(value = "/buildNumber")
public BaseResponseInfo buildNumber(@RequestParam("type") String type, public BaseResponseInfo buildNumber(HttpServletRequest request) {
@RequestParam("subType") String subType,
@RequestParam("beginTime") String beginTime,
@RequestParam("endTime") String endTime,
HttpServletRequest request) {
BaseResponseInfo res = new BaseResponseInfo(); BaseResponseInfo res = new BaseResponseInfo();
Map<String, Object> map = new HashMap<String, Object>(); Map<String, Object> map = new HashMap<String, Object>();
try { try {
......
src/main/java/com/jsh/erp/datasource/entities/DepotHead.java
View file @ 0d6f1449
...@@ -226,7 +226,15 @@ public class DepotHead { ...@@ -226,7 +226,15 @@ public class DepotHead {
* *
* @mbggenerated * @mbggenerated
*/ */
private Boolean status; private String status;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_depothead.LinkNumber
*
* @mbggenerated
*/
private String linknumber;
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
...@@ -884,7 +892,7 @@ public class DepotHead { ...@@ -884,7 +892,7 @@ public class DepotHead {
* *
* @mbggenerated * @mbggenerated
*/ */
public Boolean getStatus() { public String getStatus() {
return status; return status;
} }
...@@ -896,7 +904,31 @@ public class DepotHead { ...@@ -896,7 +904,31 @@ public class DepotHead {
* *
* @mbggenerated * @mbggenerated
*/ */
public void setStatus(Boolean status) { public void setStatus(String status) {
this.status = status; this.status = status == null ? null : status.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_depothead.LinkNumber
*
* @return the value of jsh_depothead.LinkNumber
*
* @mbggenerated
*/
public String getLinknumber() {
return linknumber;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_depothead.LinkNumber
*
* @param linknumber the value for jsh_depothead.LinkNumber
*
* @mbggenerated
*/
public void setLinknumber(String linknumber) {
this.linknumber = linknumber == null ? null : linknumber.trim();
} }
} }
\ No newline at end of file
src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java
View file @ 0d6f1449
...@@ -1946,55 +1946,135 @@ public class DepotHeadExample { ...@@ -1946,55 +1946,135 @@ public class DepotHeadExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andStatusEqualTo(Boolean value) { public Criteria andStatusEqualTo(String value) {
addCriterion("Status =", value, "status"); addCriterion("Status =", value, "status");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andStatusNotEqualTo(Boolean value) { public Criteria andStatusNotEqualTo(String value) {
addCriterion("Status <>", value, "status"); addCriterion("Status <>", value, "status");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andStatusGreaterThan(Boolean value) { public Criteria andStatusGreaterThan(String value) {
addCriterion("Status >", value, "status"); addCriterion("Status >", value, "status");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andStatusGreaterThanOrEqualTo(Boolean value) { public Criteria andStatusGreaterThanOrEqualTo(String value) {
addCriterion("Status >=", value, "status"); addCriterion("Status >=", value, "status");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andStatusLessThan(Boolean value) { public Criteria andStatusLessThan(String value) {
addCriterion("Status <", value, "status"); addCriterion("Status <", value, "status");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andStatusLessThanOrEqualTo(Boolean value) { public Criteria andStatusLessThanOrEqualTo(String value) {
addCriterion("Status <=", value, "status"); addCriterion("Status <=", value, "status");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andStatusIn(List<Boolean> values) { public Criteria andStatusLike(String value) {
addCriterion("Status like", value, "status");
return (Criteria) this;
}
public Criteria andStatusNotLike(String value) {
addCriterion("Status not like", value, "status");
return (Criteria) this;
}
public Criteria andStatusIn(List<String> values) {
addCriterion("Status in", values, "status"); addCriterion("Status in", values, "status");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andStatusNotIn(List<Boolean> values) { public Criteria andStatusNotIn(List<String> values) {
addCriterion("Status not in", values, "status"); addCriterion("Status not in", values, "status");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andStatusBetween(Boolean value1, Boolean value2) { public Criteria andStatusBetween(String value1, String value2) {
addCriterion("Status between", value1, value2, "status"); addCriterion("Status between", value1, value2, "status");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andStatusNotBetween(Boolean value1, Boolean value2) { public Criteria andStatusNotBetween(String value1, String value2) {
addCriterion("Status not between", value1, value2, "status"); addCriterion("Status not between", value1, value2, "status");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andLinknumberIsNull() {
addCriterion("LinkNumber is null");
return (Criteria) this;
}
public Criteria andLinknumberIsNotNull() {
addCriterion("LinkNumber is not null");
return (Criteria) this;
}
public Criteria andLinknumberEqualTo(String value) {
addCriterion("LinkNumber =", value, "linknumber");
return (Criteria) this;
}
public Criteria andLinknumberNotEqualTo(String value) {
addCriterion("LinkNumber <>", value, "linknumber");
return (Criteria) this;
}
public Criteria andLinknumberGreaterThan(String value) {
addCriterion("LinkNumber >", value, "linknumber");
return (Criteria) this;
}
public Criteria andLinknumberGreaterThanOrEqualTo(String value) {
addCriterion("LinkNumber >=", value, "linknumber");
return (Criteria) this;
}
public Criteria andLinknumberLessThan(String value) {
addCriterion("LinkNumber <", value, "linknumber");
return (Criteria) this;
}
public Criteria andLinknumberLessThanOrEqualTo(String value) {
addCriterion("LinkNumber <=", value, "linknumber");
return (Criteria) this;
}
public Criteria andLinknumberLike(String value) {
addCriterion("LinkNumber like", value, "linknumber");
return (Criteria) this;
}
public Criteria andLinknumberNotLike(String value) {
addCriterion("LinkNumber not like", value, "linknumber");
return (Criteria) this;
}
public Criteria andLinknumberIn(List<String> values) {
addCriterion("LinkNumber in", values, "linknumber");
return (Criteria) this;
}
public Criteria andLinknumberNotIn(List<String> values) {
addCriterion("LinkNumber not in", values, "linknumber");
return (Criteria) this;
}
public Criteria andLinknumberBetween(String value1, String value2) {
addCriterion("LinkNumber between", value1, value2, "linknumber");
return (Criteria) this;
}
public Criteria andLinknumberNotBetween(String value1, String value2) {
addCriterion("LinkNumber not between", value1, value2, "linknumber");
return (Criteria) this;
}
} }
/** /**
......
src/main/java/com/jsh/erp/datasource/entities/SystemConfig.java
View file @ 0d6f1449
...@@ -11,35 +11,51 @@ public class SystemConfig { ...@@ -11,35 +11,51 @@ public class SystemConfig {
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_systemconfig.type * This field corresponds to the database column jsh_systemconfig.company_name
* *
* @mbggenerated * @mbggenerated
*/ */
private String type; private String companyName;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_systemconfig.name * This field corresponds to the database column jsh_systemconfig.company_contacts
* *
* @mbggenerated * @mbggenerated
*/ */
private String name; private String companyContacts;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_systemconfig.value * This field corresponds to the database column jsh_systemconfig.company_address
* *
* @mbggenerated * @mbggenerated
*/ */
private String value; private String companyAddress;
/** /**
* This field was generated by MyBatis Generator. * This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_systemconfig.description * This field corresponds to the database column jsh_systemconfig.company_tel
* *
* @mbggenerated * @mbggenerated
*/ */
private String description; private String companyTel;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_systemconfig.company_fax
*
* @mbggenerated
*/
private String companyFax;
/**
* This field was generated by MyBatis Generator.
* This field corresponds to the database column jsh_systemconfig.company_post_code
*
* @mbggenerated
*/
private String companyPostCode;
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
...@@ -67,97 +83,145 @@ public class SystemConfig { ...@@ -67,97 +83,145 @@ public class SystemConfig {
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_systemconfig.type * This method returns the value of the database column jsh_systemconfig.company_name
*
* @return the value of jsh_systemconfig.company_name
*
* @mbggenerated
*/
public String getCompanyName() {
return companyName;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_systemconfig.company_name
*
* @param companyName the value for jsh_systemconfig.company_name
*
* @mbggenerated
*/
public void setCompanyName(String companyName) {
this.companyName = companyName == null ? null : companyName.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_systemconfig.company_contacts
*
* @return the value of jsh_systemconfig.company_contacts
*
* @mbggenerated
*/
public String getCompanyContacts() {
return companyContacts;
}
/**
* This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_systemconfig.company_contacts
*
* @param companyContacts the value for jsh_systemconfig.company_contacts
*
* @mbggenerated
*/
public void setCompanyContacts(String companyContacts) {
this.companyContacts = companyContacts == null ? null : companyContacts.trim();
}
/**
* This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_systemconfig.company_address
* *
* @return the value of jsh_systemconfig.type * @return the value of jsh_systemconfig.company_address
* *
* @mbggenerated * @mbggenerated
*/ */
public String getType() { public String getCompanyAddress() {
return type; return companyAddress;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_systemconfig.type * This method sets the value of the database column jsh_systemconfig.company_address
* *
* @param type the value for jsh_systemconfig.type * @param companyAddress the value for jsh_systemconfig.company_address
* *
* @mbggenerated * @mbggenerated
*/ */
public void setType(String type) { public void setCompanyAddress(String companyAddress) {
this.type = type == null ? null : type.trim(); this.companyAddress = companyAddress == null ? null : companyAddress.trim();
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_systemconfig.name * This method returns the value of the database column jsh_systemconfig.company_tel
* *
* @return the value of jsh_systemconfig.name * @return the value of jsh_systemconfig.company_tel
* *
* @mbggenerated * @mbggenerated
*/ */
public String getName() { public String getCompanyTel() {
return name; return companyTel;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_systemconfig.name * This method sets the value of the database column jsh_systemconfig.company_tel
* *
* @param name the value for jsh_systemconfig.name * @param companyTel the value for jsh_systemconfig.company_tel
* *
* @mbggenerated * @mbggenerated
*/ */
public void setName(String name) { public void setCompanyTel(String companyTel) {
this.name = name == null ? null : name.trim(); this.companyTel = companyTel == null ? null : companyTel.trim();
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_systemconfig.value * This method returns the value of the database column jsh_systemconfig.company_fax
* *
* @return the value of jsh_systemconfig.value * @return the value of jsh_systemconfig.company_fax
* *
* @mbggenerated * @mbggenerated
*/ */
public String getValue() { public String getCompanyFax() {
return value; return companyFax;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_systemconfig.value * This method sets the value of the database column jsh_systemconfig.company_fax
* *
* @param value the value for jsh_systemconfig.value * @param companyFax the value for jsh_systemconfig.company_fax
* *
* @mbggenerated * @mbggenerated
*/ */
public void setValue(String value) { public void setCompanyFax(String companyFax) {
this.value = value == null ? null : value.trim(); this.companyFax = companyFax == null ? null : companyFax.trim();
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method returns the value of the database column jsh_systemconfig.description * This method returns the value of the database column jsh_systemconfig.company_post_code
* *
* @return the value of jsh_systemconfig.description * @return the value of jsh_systemconfig.company_post_code
* *
* @mbggenerated * @mbggenerated
*/ */
public String getDescription() { public String getCompanyPostCode() {
return description; return companyPostCode;
} }
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
* This method sets the value of the database column jsh_systemconfig.description * This method sets the value of the database column jsh_systemconfig.company_post_code
* *
* @param description the value for jsh_systemconfig.description * @param companyPostCode the value for jsh_systemconfig.company_post_code
* *
* @mbggenerated * @mbggenerated
*/ */
public void setDescription(String description) { public void setCompanyPostCode(String companyPostCode) {
this.description = description == null ? null : description.trim(); this.companyPostCode = companyPostCode == null ? null : companyPostCode.trim();
} }
} }
\ No newline at end of file
src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapper.java
View file @ 0d6f1449
...@@ -2,14 +2,7 @@ package com.jsh.erp.datasource.mappers; ...@@ -2,14 +2,7 @@ package com.jsh.erp.datasource.mappers;
import com.jsh.erp.datasource.entities.DepotHead; import com.jsh.erp.datasource.entities.DepotHead;
import com.jsh.erp.datasource.entities.DepotHeadExample; import com.jsh.erp.datasource.entities.DepotHeadExample;
import java.math.BigDecimal;
import java.util.List; import java.util.List;
import com.jsh.erp.datasource.vo.DepotHeadVo4InDetail;
import com.jsh.erp.datasource.vo.DepotHeadVo4InOutMCount;
import com.jsh.erp.datasource.vo.DepotHeadVo4List;
import com.jsh.erp.datasource.vo.DepotHeadVo4StatementAccount;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
public interface DepotHeadMapper { public interface DepotHeadMapper {
......
src/main/java/com/jsh/erp/datasource/mappers/SystemConfigMapperEx.java
View file @ 0d6f1449
...@@ -9,8 +9,10 @@ import java.util.List; ...@@ -9,8 +9,10 @@ import java.util.List;
public interface SystemConfigMapperEx { public interface SystemConfigMapperEx {
List<SystemConfig> selectByConditionSystemConfig( List<SystemConfig> selectByConditionSystemConfig(
@Param("companyName") String companyName,
@Param("offset") Integer offset, @Param("offset") Integer offset,
@Param("rows") Integer rows); @Param("rows") Integer rows);
Long countsBySystemConfig(); Long countsBySystemConfig(
@Param("companyName") String companyName);
} }
\ No newline at end of file
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