从远程仓库更新
This commit is contained in:
qiankunpingtai
@@ -210,6 +210,7 @@
|
||||
$("#bill .OrganIdShow").text(data.organName);
|
||||
$("#bill .OperTimeShow").text(data.opertimeStr);
|
||||
$("#bill .NumberShow").text(data.number);
|
||||
$("#bill .LinkNumberShow").text(data.linknumber? data.linknumber : "");
|
||||
$("#bill .RemarkShow").text(data.remark);
|
||||
$("#bill .DiscountShow").text(data.discount);
|
||||
$("#bill .DiscountMoneyShow").text(data.discountmoney);
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
//初始化界面
|
||||
var kid = sessionStorage.getItem("userId");
|
||||
var pageType = getUrlParam('t'); //获取页面类型传值
|
||||
var depotList = null;
|
||||
var depotID = null;
|
||||
var supplierList = null;
|
||||
@@ -447,6 +448,10 @@
|
||||
|
||||
//初始化表格数据
|
||||
function initTableData(){
|
||||
if(pageType === "skip") {
|
||||
var oldRowInfo = sessionStorage.getItem("rowInfo");
|
||||
editDepotHead(oldRowInfo); //自动弹出编辑框，带缓存数据
|
||||
}
|
||||
var hideType = undefined;
|
||||
var isHiddenStatus = true;
|
||||
if(payTypeTitle === "隐藏"){
|
||||
@@ -515,6 +520,18 @@
|
||||
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({
|
||||
height:heightInfo,
|
||||
rownumbers: false,
|
||||
@@ -531,7 +548,7 @@
|
||||
pageList: initPageNum,
|
||||
columns:[[
|
||||
{ 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) {
|
||||
var str = '';
|
||||
var rowInfo = rec.id + 'AaBb' + rec.projectid+ 'AaBb' + rec.number+ 'AaBb' + rec.operpersonname
|
||||
@@ -542,18 +559,29 @@
|
||||
+ 'AaBb' + rec.allocationProjectName + 'AaBb' + rec.paytype + 'AaBb' + rec.salesman
|
||||
+ 'AaBb' + rec.discount + 'AaBb' + rec.discountmoney + 'AaBb' + rec.discountlastmoney
|
||||
+ '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,"");
|
||||
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 + '\');"/> ';
|
||||
str += '<img title="编辑" src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editDepotHead(\'' + rowInfo + '\''+',' + 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 += ' <img title="' + opTitle + '" src="/js/easyui-1.3.5/themes/icons/redo.png" style="cursor: pointer;" onclick="skipDepotHead(\'' + rowInfo + '\''+',' + rec.status + ');"/>';
|
||||
}
|
||||
return str;
|
||||
}
|
||||
},
|
||||
{ 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){
|
||||
if(value) {
|
||||
return value.replace(",","，");
|
||||
@@ -570,7 +598,17 @@
|
||||
{ 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){
|
||||
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 @@
|
||||
});
|
||||
data.footer = array;
|
||||
$("#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() {
|
||||
@@ -1232,8 +1280,8 @@
|
||||
|
||||
//删除单据信息
|
||||
function deleteDepotHead(depotHeadID, thisOrganId, totalPrice, status){
|
||||
if(status) {
|
||||
$.messager.alert('删除提示','已审核的单据不能删除！','warning');
|
||||
if(status == "1" || status == "2") {
|
||||
$.messager.alert('删除提示','已审核和已转的单据不能删除！','warning');
|
||||
return;
|
||||
}
|
||||
$.messager.confirm('删除确认','确定要删除此单据信息吗？',function(r) {
|
||||
@@ -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(){
|
||||
var row = $('#tableData').datagrid('getChecked');
|
||||
@@ -1297,67 +1359,69 @@
|
||||
{
|
||||
$.messager.confirm('删除确认','确定要删除选中的' + row.length + '条单据信息吗？',function(r)
|
||||
{
|
||||
if (r)
|
||||
{
|
||||
var ids = "";
|
||||
for(var i = 0;i < row.length; i++)
|
||||
{
|
||||
if(i == row.length-1)
|
||||
{
|
||||
ids += row[i].id;
|
||||
break;
|
||||
}
|
||||
//alert(row[i].id);
|
||||
ids += row[i].id + ",";
|
||||
}
|
||||
//批量更新会员的预收款信息
|
||||
for(var i = 0;i < row.length; i ++) {
|
||||
if(listSubType === "零售") {
|
||||
$.ajax({
|
||||
type:"post",
|
||||
url: "/supplier/updateAdvanceIn",
|
||||
dataType: "json",
|
||||
data:{
|
||||
supplierId: row[i].organid, //会员id
|
||||
advanceIn: row[i].totalprice //删除时同时返还用户的预付款
|
||||
},
|
||||
success: function(res){
|
||||
if(res && res.code === 200) {
|
||||
//保存会员预收款成功
|
||||
}
|
||||
},
|
||||
error: function(){
|
||||
$.messager.alert('提示','保存信息异常，请稍后再试！','error');
|
||||
return;
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
//批量删除
|
||||
$.ajax({
|
||||
type:"post",
|
||||
// url: "/depotHead/batchDelete",
|
||||
url: "/depotHead/batchDeleteDepotHeadAndDetail",
|
||||
dataType: "json",
|
||||
async : false,
|
||||
data: ({
|
||||
ids : ids
|
||||
}),
|
||||
success: function (res) {
|
||||
if(res && res.code === 200) {
|
||||
$("#searchBtn").click();
|
||||
$(":checkbox").attr("checked", false);
|
||||
} else {
|
||||
$.messager.alert('删除提示', '删除单据信息失败，请稍后再试！', 'error');
|
||||
if (r) {
|
||||
var ids = "";
|
||||
for (var i = 0; i < row.length; i++) {
|
||||
if (i == row.length - 1) {
|
||||
if (row[i].status == 0) {
|
||||
ids += row[i].id;
|
||||
}
|
||||
},
|
||||
//此处添加错误处理
|
||||
error:function() {
|
||||
$.messager.alert('删除提示','删除单据信息异常，请稍后再试！','error');
|
||||
return;
|
||||
}
|
||||
});
|
||||
}
|
||||
break;
|
||||
}
|
||||
ids += row[i].id + ",";
|
||||
}
|
||||
if (ids) {
|
||||
//批量更新会员的预收款信息
|
||||
for (var i = 0; i < row.length; i++) {
|
||||
if (listSubType === "零售") {
|
||||
$.ajax({
|
||||
type: "post",
|
||||
url: "/supplier/updateAdvanceIn",
|
||||
dataType: "json",
|
||||
data: {
|
||||
supplierId: row[i].organid, //会员id
|
||||
advanceIn: row[i].totalprice //删除时同时返还用户的预付款
|
||||
},
|
||||
success: function (res) {
|
||||
if (res && res.code === 200) {
|
||||
//保存会员预收款成功
|
||||
}
|
||||
},
|
||||
error: function () {
|
||||
$.messager.alert('提示', '保存信息异常，请稍后再试！', 'error');
|
||||
return;
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
//批量删除
|
||||
$.ajax({
|
||||
type: "post",
|
||||
// url: "/depotHead/batchDelete",
|
||||
url: "/depotHead/batchDeleteDepotHeadAndDetail",
|
||||
dataType: "json",
|
||||
async: false,
|
||||
data: ({
|
||||
ids: ids
|
||||
}),
|
||||
success: function (res) {
|
||||
if (res && res.code === 200) {
|
||||
$("#searchBtn").click();
|
||||
$(":checkbox").attr("checked", false);
|
||||
} else {
|
||||
$.messager.alert('删除提示', '删除单据信息失败，请稍后再试！', 'error');
|
||||
}
|
||||
},
|
||||
//此处添加错误处理
|
||||
error: function () {
|
||||
$.messager.alert('删除提示', '删除单据信息异常，请稍后再试！', 'error');
|
||||
return;
|
||||
}
|
||||
});
|
||||
} else {
|
||||
$.messager.alert('删除提示','没有能删除的单据！','warning');
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -1379,34 +1443,40 @@
|
||||
{
|
||||
if(i == row.length-1)
|
||||
{
|
||||
ids += row[i].id;
|
||||
if(row[i].status != "2") {
|
||||
ids += row[i].id;
|
||||
}
|
||||
break;
|
||||
}
|
||||
ids += row[i].id + ",";
|
||||
}
|
||||
$.ajax({
|
||||
type:"post",
|
||||
url: "/depotHead/batchSetStatus",
|
||||
dataType: "json",
|
||||
async : false,
|
||||
data: ({
|
||||
status: true,
|
||||
depotHeadIDs : ids
|
||||
}),
|
||||
success: function (res) {
|
||||
if(res && res.code === 200) {
|
||||
$("#searchBtn").click();
|
||||
$(":checkbox").attr("checked", false);
|
||||
} else {
|
||||
$.messager.alert('审核提示', '审核信息失败，请稍后再试！', 'error');
|
||||
if(ids) {
|
||||
$.ajax({
|
||||
type:"post",
|
||||
url: "/depotHead/batchSetStatus",
|
||||
dataType: "json",
|
||||
async : false,
|
||||
data: ({
|
||||
status: "1",
|
||||
depotHeadIDs : ids
|
||||
}),
|
||||
success: function (res) {
|
||||
if(res && res.code === 200) {
|
||||
$("#searchBtn").click();
|
||||
$(":checkbox").attr("checked", false);
|
||||
} else {
|
||||
$.messager.alert('审核提示', '审核信息失败，请稍后再试！', 'error');
|
||||
}
|
||||
},
|
||||
//此处添加错误处理
|
||||
error:function() {
|
||||
$.messager.alert('审核提示','审核信息异常，请稍后再试！','error');
|
||||
return;
|
||||
}
|
||||
},
|
||||
//此处添加错误处理
|
||||
error:function() {
|
||||
$.messager.alert('审核提示','审核信息异常，请稍后再试！','error');
|
||||
return;
|
||||
}
|
||||
});
|
||||
});
|
||||
} else {
|
||||
$.messager.alert('审核提示','没有能审核的单据！','warning');
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -1431,70 +1501,70 @@
|
||||
{
|
||||
if(i == row.length-1)
|
||||
{
|
||||
ids += row[i].id;
|
||||
if(row[i].status != "2") {
|
||||
ids += row[i].id;
|
||||
}
|
||||
break;
|
||||
}
|
||||
ids += row[i].id + ",";
|
||||
}
|
||||
$.ajax({
|
||||
type:"post",
|
||||
url: "/depotHead/batchSetStatus",
|
||||
dataType: "json",
|
||||
async : false,
|
||||
data: ({
|
||||
status: false,
|
||||
depotHeadIDs : ids
|
||||
}),
|
||||
success: function (res) {
|
||||
if(res && res.code === 200) {
|
||||
$("#searchBtn").click();
|
||||
$(":checkbox").attr("checked", false);
|
||||
} else {
|
||||
$.messager.alert('反审核提示', '反审核信息失败，请稍后再试！', 'error');
|
||||
if(ids) {
|
||||
$.ajax({
|
||||
type: "post",
|
||||
url: "/depotHead/batchSetStatus",
|
||||
dataType: "json",
|
||||
async: false,
|
||||
data: ({
|
||||
status: "0",
|
||||
depotHeadIDs: ids
|
||||
}),
|
||||
success: function (res) {
|
||||
if (res && res.code === 200) {
|
||||
$("#searchBtn").click();
|
||||
$(":checkbox").attr("checked", false);
|
||||
} else {
|
||||
$.messager.alert('反审核提示', '反审核信息失败，请稍后再试！', 'error');
|
||||
}
|
||||
},
|
||||
//此处添加错误处理
|
||||
error: function () {
|
||||
$.messager.alert('反审核提示', '反审核信息异常，请稍后再试！', 'error');
|
||||
return;
|
||||
}
|
||||
},
|
||||
//此处添加错误处理
|
||||
error:function() {
|
||||
$.messager.alert('反审核提示','反审核信息异常，请稍后再试！','error');
|
||||
return;
|
||||
}
|
||||
});
|
||||
});
|
||||
} else {
|
||||
$.messager.alert('反审核提示','没有能反审核的单据！','warning');
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
//生成单据编号
|
||||
function buildNumber() {
|
||||
$.ajax({
|
||||
type: "get",
|
||||
url: "/depotHead/buildNumber",
|
||||
success:function(res){
|
||||
if(res && res.code === 200){
|
||||
var obj = res.data;
|
||||
var defaultNumber = obj.DefaultNumber;
|
||||
var newNumber = amountNum + defaultNumber;
|
||||
$("#Number").val(newNumber).attr("data-defaultNumber",newNumber);
|
||||
}
|
||||
},
|
||||
error:function(){
|
||||
$.messager.alert('提示','生成单据编号失败！','error');
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
//新增信息
|
||||
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";
|
||||
//生成单据编号
|
||||
$.ajax({
|
||||
type: "get",
|
||||
url: "/depotHead/buildNumber",
|
||||
data: {
|
||||
type: listType,
|
||||
subType: listSubType,
|
||||
beginTime: beginTime,
|
||||
endTime: endTime
|
||||
},
|
||||
success:function(res){
|
||||
if(res && res.code === 200){
|
||||
var obj = res.data;
|
||||
var defaultNumber = obj.DefaultNumber;
|
||||
var newNumber = amountNum + defaultNumber
|
||||
$("#Number").val(newNumber).attr("data-defaultNumber",newNumber);
|
||||
}
|
||||
},
|
||||
error:function(){
|
||||
$.messager.alert('提示','生成单据编号失败！','error');
|
||||
}
|
||||
});
|
||||
buildNumber(); //生成单据编号
|
||||
//初始化优惠率、优惠金额、优惠后金额、本次付|收款、本次欠款 为0
|
||||
$("#Discount").val(0);
|
||||
$("#DiscountMoney").val(0);
|
||||
@@ -1561,8 +1631,8 @@
|
||||
|
||||
//编辑信息
|
||||
function editDepotHead(depotHeadTotalInfo, status){
|
||||
if(status) {
|
||||
$.messager.alert('编辑提示','已审核的单据不能编辑！','warning');
|
||||
if(status == "1" || status == "2") {
|
||||
$.messager.alert('编辑提示','已审核和已转的单据不能编辑！','warning');
|
||||
return;
|
||||
}
|
||||
var depotHeadInfo = depotHeadTotalInfo.split("AaBb");
|
||||
@@ -1572,20 +1642,30 @@
|
||||
initSystemData_person(ProjectId);
|
||||
initSelectInfo_person();
|
||||
}
|
||||
$("#Number").val(depotHeadInfo[2]).attr("data-defaultNumber",depotHeadInfo[2]);
|
||||
$("#OperTime").val(depotHeadInfo[4]);
|
||||
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]);
|
||||
$("#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]);
|
||||
$("#HandsPersonId").val(depotHeadInfo[6]);
|
||||
$("#AccountId").val(depotHeadInfo[7]);
|
||||
$("#ChangeAmount").val(depotHeadInfo[8]);
|
||||
$("#ChangeAmount").attr("data-changeamount", depotHeadInfo[8]);
|
||||
$("#Remark").val(depotHeadInfo[9]);
|
||||
$("#Discount").val(depotHeadInfo[19]);
|
||||
$("#DiscountMoney").val(depotHeadInfo[20]);
|
||||
$("#DiscountLastMoney").val(depotHeadInfo[21]);
|
||||
$("#Debt").val((depotHeadInfo[21]-depotHeadInfo[8]).toFixed(2));
|
||||
$("#Discount").val(depotHeadInfo[19].replace("undefined","0"));
|
||||
$("#DiscountMoney").val(depotHeadInfo[20].replace("undefined","0.00"));
|
||||
$("#Debt").val((depotHeadInfo[21].replace("undefined","0.00")-depotHeadInfo[8]).toFixed(2));
|
||||
$("#AccountDay").val(depotHeadInfo[27].replace("undefined","")); //结算天数
|
||||
var TotalPrice = depotHeadInfo[14];
|
||||
preTotalPrice = depotHeadInfo[14]; //记录前一次合计金额，用于扣预付款
|
||||
$("#AllocationProjectId").val(depotHeadInfo[15]);
|
||||
oldNumber = depotHeadInfo[2]; //记录编辑前的单据编号
|
||||
@@ -1657,8 +1737,14 @@
|
||||
}
|
||||
|
||||
initTableData_material("edit",TotalPrice); //商品列表
|
||||
reject(); //撤销下、刷新商品列表
|
||||
url = '/depotHead/updateDepotHeadAndDetail?id=' + depotHeadInfo[0];
|
||||
reject(); //撤销下、刷新商品列表
|
||||
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 @@
|
||||
$("#DiscountLastMoneyShow").text(depotHeadInfo[21]);
|
||||
$("#DebtShow").text((depotHeadInfo[21]-depotHeadInfo[8]).toFixed(2));
|
||||
$("#AccountDayShow").text(depotHeadInfo[27].replace("undefined","")); //结算天数
|
||||
$("#LinkNumberShow").text(depotHeadInfo[28].replace("undefined","")); //关联订单号
|
||||
if(depotHeadInfo[25] && depotHeadInfo[26]){
|
||||
var itemArr = depotHeadInfo[25].split(","); //支出项目id列表
|
||||
var itemMoneyArr = depotHeadInfo[26].split(","); //支出项目金额列表
|
||||
@@ -2027,6 +2114,7 @@
|
||||
AllocationProjectId: AllocationProjectId,
|
||||
DefaultNumber: $.trim($("#Number").attr("data-defaultNumber")),//初始编号
|
||||
Number: $.trim($("#Number").val()),
|
||||
LinkNumber: $.trim($("#LinkNumber").val()),
|
||||
OperTime: $("#OperTime").val(),
|
||||
OrganId: OrganId,
|
||||
HandsPersonId: $.trim($("#HandsPersonId").val()),
|
||||
@@ -2970,7 +3058,12 @@
|
||||
* 新增单据主表及单据子表
|
||||
* */
|
||||
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 updated = $("#materialData").datagrid('getChanges', "updated");
|
||||
$.ajax({
|
||||
|
||||
@@ -21,11 +21,9 @@ function CreateFormPage(strPrintName, printDatagrid) {
|
||||
if (res && res.code === 200) {
|
||||
if(res.data && res.data.page) {
|
||||
var array = res.data.page.rows;
|
||||
for (var i = 0; i < array.length; i++) {
|
||||
var name = array[i].name;
|
||||
if (name === "company_name") {
|
||||
companyName = array[i].value;
|
||||
}
|
||||
if(array.length > 0) {
|
||||
var info = array[0];
|
||||
companyName = info.companyName;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,128 +16,418 @@
|
||||
<script type="text/javascript" src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
|
||||
<script type="text/javascript" src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
|
||||
<script type="text/javascript" src="/js/common/common.js"></script>
|
||||
<script>
|
||||
$(function () {
|
||||
//加载信息
|
||||
function loadInfo() {
|
||||
$.ajax({
|
||||
type: "get",
|
||||
url: "/systemConfig/list",
|
||||
dataType: "json",
|
||||
data: ({
|
||||
currentPage: 1,
|
||||
pageSize: 100
|
||||
}),
|
||||
success: function (res) {
|
||||
if (res && res.code === 200) {
|
||||
if(res.data && res.data.page) {
|
||||
var array = res.data.page.rows;
|
||||
for (var i = 0; i < array.length; i++) {
|
||||
var name = array[i].name;
|
||||
$("." + name).val(array[i].value).attr("data-value", array[i].value).attr("data-id", array[i].id);
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
//此处添加错误处理
|
||||
error: function () {
|
||||
$.messager.alert('查询失败', '查询系统配置信息异常，请稍后再试！', 'error');
|
||||
return;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
loadInfo(); //加载信息
|
||||
|
||||
$("#saveSystemConfig").off("click").on("click", function () {
|
||||
var status = false;
|
||||
$("#searchTable input").each(function () {
|
||||
var thisId = $(this).attr("data-id");
|
||||
var thisValue = $(this).attr("data-value");
|
||||
if ($(this).val() != thisValue) {
|
||||
//更新修改过的单行信息
|
||||
$.ajax({
|
||||
type: "post",
|
||||
url: "/systemConfig/update?id=" + thisId,
|
||||
dataType: "json",
|
||||
data: {
|
||||
info: JSON.stringify({
|
||||
value: $(this).val()
|
||||
})
|
||||
},
|
||||
success: function (res) {
|
||||
if (res && res.code === 200) {
|
||||
status = true;
|
||||
}
|
||||
},
|
||||
//此处添加错误处理
|
||||
error: function () {
|
||||
$.messager.alert('保存失败', '保存系统配置信息失败，请稍后再试！', 'error');
|
||||
return;
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
setTimeout(function () {
|
||||
if (status) {
|
||||
$.messager.alert('保存成功', '保存系统配置信息成功！', 'info');
|
||||
loadInfo(); //加载信息
|
||||
}
|
||||
else {
|
||||
$.messager.alert('提示', '信息未修改，无需保存！', 'info');
|
||||
}
|
||||
}, 1000);
|
||||
});
|
||||
})
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div class="system-config">
|
||||
<!-- 查询 -->
|
||||
<div id="searchPanel" class="easyui-panel" style="padding:10px;" title="查询窗口" iconCls="icon-search" collapsible="true"
|
||||
closable="false">
|
||||
<table id="searchTable">
|
||||
<tr>
|
||||
<td>公司名称：</td>
|
||||
<td>
|
||||
<input type="text" class="company_name easyui-validatebox"
|
||||
data-options="required:true,validType:'length[2,30]'" style="width:250px;"/>
|
||||
<input type="text" name="searchCompanyName" id="searchCompanyName" style="width:100px;"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>联系人：</td>
|
||||
<td> </td>
|
||||
<td> </td>
|
||||
<td>
|
||||
<input type="text" class="company_contacts" style="width:250px;"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>公司地址：</td>
|
||||
<td>
|
||||
<input type="text" class="company_address" style="width:250px;"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>公司电话：</td>
|
||||
<td>
|
||||
<input type="text" class="company_tel" style="width:250px;"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>公司传真：</td>
|
||||
<td>
|
||||
<input type="text" class="company_fax" style="width:250px;"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>公司邮编：</td>
|
||||
<td>
|
||||
<input type="text" class="company_post_code" style="width:250px;"/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td></td>
|
||||
<td>
|
||||
<a href="javascript:void(0)" id="saveSystemConfig" class="easyui-linkbutton" iconCls="icon-ok">保存信息</a>
|
||||
</td>
|
||||
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<!-- 数据显示table -->
|
||||
<div id="tablePanel" class="easyui-panel" style="padding:1px;top:300px;" title="系统配置" iconCls="icon-list"
|
||||
collapsible="true" closable="false">
|
||||
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
|
||||
</div>
|
||||
|
||||
<div id="systemConfigDlg" class="easyui-dialog" style="width:380px;padding:10px 20px"
|
||||
closed="true" buttons="#dlg-buttons" modal="true" collapsible="false" closable="true">
|
||||
<form id="systemConfigFM" method="post" novalidate>
|
||||
<div class="fitem" style="padding:5px">
|
||||
<label id="companyNameLabel">公司名称 </label>
|
||||
<input name="companyName" id="companyName" class="easyui-validatebox"
|
||||
data-options="required:true,validType:'length[2,15]'" style="width: 220px;height: 20px"/>
|
||||
</div>
|
||||
<div class="fitem" style="padding:5px">
|
||||
<label id="companyContactsLabel">联系人 </label>
|
||||
<input name="companyContacts" id="companyContacts" style="width: 220px;height: 20px"/>
|
||||
</div>
|
||||
<div class="fitem" style="padding:5px">
|
||||
<label id="companyAddressLabel">公司地址 </label>
|
||||
<input name="companyAddress" id="companyAddress" style="width: 220px;height: 20px"/>
|
||||
</div>
|
||||
<div class="fitem" style="padding:5px">
|
||||
<label id="companyTelLabel">公司电话 </label>
|
||||
<input name="companyTel" id="companyTel" style="width: 220px;height: 20px"/>
|
||||
</div>
|
||||
<div class="fitem" style="padding:5px">
|
||||
<label id="companyFaxLabel">公司传真 </label>
|
||||
<input name="companyFax" id="companyFax" style="width: 220px;height: 20px"/>
|
||||
</div>
|
||||
<div class="fitem" style="padding:5px">
|
||||
<label id="companyPostCodeLabel">公司邮编 </label>
|
||||
<input name="companyPostCode" id="companyPostCode" style="width: 220px;height: 20px"/>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<div id="dlg-buttons">
|
||||
<a href="javascript:void(0)" id="saveSystemConfig" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
|
||||
<a href="javascript:void(0)" id="cancelSystemConfig" class="easyui-linkbutton" iconCls="icon-cancel"
|
||||
onclick="javascript:$('#systemConfigDlg').dialog('close')">取消</a>
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
//初始化界面
|
||||
$(function () {
|
||||
initTableData();
|
||||
ininPager();
|
||||
});
|
||||
|
||||
//初始化表格数据
|
||||
function initTableData() {
|
||||
$('#tableData').datagrid({
|
||||
height: heightInfo,
|
||||
nowrap: false,
|
||||
rownumbers: false,
|
||||
//动画效果
|
||||
animate: false,
|
||||
//选中单行
|
||||
singleSelect: true,
|
||||
collapsible: false,
|
||||
pagination: true,
|
||||
//交替出现背景
|
||||
striped: true,
|
||||
pageSize: initPageSize,
|
||||
pageList: initPageNum,
|
||||
columns: [[
|
||||
{field: 'id', width: 35, align: "center", checkbox:true},
|
||||
{title: '公司名称', field: 'companyName', width: 150},
|
||||
{title: '联系人', field: 'companyContacts', width: 80, align: "center"},
|
||||
{title: '公司地址', field: 'companyAddress', width: 150, align: "center"},
|
||||
{title: '公司电话', field: 'companyTel', width: 120, align: "center"},
|
||||
{title: '公司传真', field: 'companyFax', width: 120, align: "center"},
|
||||
{title: '公司邮编', field: 'companyPostCode', width: 80, align: "center"},
|
||||
{
|
||||
title: '操作', field: 'op', width: 160, formatter: function (value, rec) {
|
||||
var str = '';
|
||||
var rowInfo = rec.id + 'AaBb' + rec.companyName + 'AaBb' + rec.companyContacts + 'AaBb' + rec.companyAddress
|
||||
+ 'AaBb' + rec.companyTel + 'AaBb' + rec.companyFax + 'AaBb' + rec.companyPostCode;
|
||||
str += '<img src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editSystemConfig(\'' + rowInfo + '\');"/> <a onclick="editSystemConfig(\'' + rowInfo + '\');" style="text-decoration:none;color:black;" href="javascript:void(0)">编辑</a> ';
|
||||
str += '<img src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteSystemConfig(' + rec.id + ');"/> <a onclick="deleteSystemConfig(' + rec.id + ');" style="text-decoration:none;color:black;" href="javascript:void(0)">删除</a> ';
|
||||
return str;
|
||||
}
|
||||
}
|
||||
]],
|
||||
toolbar: [
|
||||
{
|
||||
id: 'addSystemConfig',
|
||||
text: '增加',
|
||||
iconCls: 'icon-add',
|
||||
handler: function () {
|
||||
addSystemConfig();
|
||||
}
|
||||
},
|
||||
{
|
||||
id: 'deleteSystemConfig',
|
||||
text: '删除',
|
||||
iconCls: 'icon-remove',
|
||||
handler: function () {
|
||||
batDeleteSystemConfig();
|
||||
}
|
||||
}
|
||||
],
|
||||
onLoadError: function () {
|
||||
$.messager.alert('页面加载提示', '页面加载异常，请稍后再试！', 'error');
|
||||
return;
|
||||
}
|
||||
});
|
||||
showSystemConfigDetails(1, initPageSize);
|
||||
}
|
||||
|
||||
//初始化键盘enter事件
|
||||
$(document).keydown(function (event) {
|
||||
//兼容 IE和firefox 事件
|
||||
var e = window.event || event;
|
||||
var k = e.keyCode || e.which || e.charCode;
|
||||
//兼容 IE,firefox 兼容
|
||||
var obj = e.srcElement ? e.srcElement : e.target;
|
||||
//绑定键盘事件为 id是指定的输入框才可以触发键盘事件 13键盘事件
|
||||
if (k == "13" && (obj.id == "companyName" || obj.id == "companyContacts" || obj.id == "companyAddress"
|
||||
|| obj.id == "companyTel" || obj.id == "companyFax" || obj.id == "companyPostCode")) {
|
||||
$("#saveSystemConfig").click();
|
||||
}
|
||||
|
||||
//搜索按钮添加快捷键
|
||||
if (k == "13" && (obj.id == "searchCompanyName")) {
|
||||
$("#searchBtn").click();
|
||||
}
|
||||
});
|
||||
|
||||
//分页信息处理
|
||||
function ininPager() {
|
||||
try {
|
||||
var opts = $("#tableData").datagrid('options');
|
||||
var pager = $("#tableData").datagrid('getPager');
|
||||
pager.pagination({
|
||||
onSelectPage: function (pageNum, pageSize) {
|
||||
opts.pageNumber = pageNum;
|
||||
opts.pageSize = pageSize;
|
||||
pager.pagination('refresh', {
|
||||
pageNumber: pageNum,
|
||||
pageSize: pageSize
|
||||
});
|
||||
showSystemConfigDetails(pageNum, pageSize);
|
||||
}
|
||||
});
|
||||
}
|
||||
catch (e) {
|
||||
$.messager.alert('异常处理提示', "分页信息异常 : " + e.name + ": " + e.message, 'error');
|
||||
}
|
||||
}
|
||||
|
||||
//删除系统配置信息
|
||||
function deleteSystemConfig(systemConfigId) {
|
||||
$.messager.confirm('删除确认', '确定要删除此系统配置信息吗？', function (r) {
|
||||
if (r) {
|
||||
$.ajax({
|
||||
type: "post",
|
||||
url: "/systemConfig/" + systemConfigId + "/delete",
|
||||
dataType: "json",
|
||||
success: function (res) {
|
||||
if(res && res.code == 200) {
|
||||
$("#searchBtn").click();
|
||||
} else {
|
||||
$.messager.alert('删除提示', '删除系统配置信息失败，请稍后再试！', 'error');
|
||||
}
|
||||
},
|
||||
//此处添加错误处理
|
||||
error: function () {
|
||||
$.messager.alert('删除提示', '删除系统配置信息异常，请稍后再试！', 'error');
|
||||
return;
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
//批量删除系统配置
|
||||
function batDeleteSystemConfig() {
|
||||
var row = $('#tableData').datagrid('getChecked');
|
||||
if (row.length == 0) {
|
||||
$.messager.alert('删除提示', '没有记录被选中！', 'warning');
|
||||
return;
|
||||
}
|
||||
if (row.length > 0) {
|
||||
$.messager.confirm('删除确认', '确定要删除选中的' + row.length + '条系统配置信息吗？', function (r) {
|
||||
if (r) {
|
||||
var ids = "";
|
||||
for (var i = 0; i < row.length; i++) {
|
||||
if (i == row.length - 1) {
|
||||
ids += row[i].id;
|
||||
break;
|
||||
}
|
||||
ids += row[i].id + ",";
|
||||
}
|
||||
if(row[i].loginame == "jsh"){
|
||||
$.messager.alert('提示', '管理员jsh不能删除！', 'warning');
|
||||
return;
|
||||
} else {
|
||||
$.ajax({
|
||||
type: "post",
|
||||
url: "/systemConfig/batchDelete",
|
||||
dataType: "json",
|
||||
async: false,
|
||||
data: ({
|
||||
ids: ids
|
||||
}),
|
||||
success: function (res) {
|
||||
if(res && res.code === 200) {
|
||||
$("#searchBtn").click();
|
||||
$(":checkbox").attr("checked", false);
|
||||
} else {
|
||||
$.messager.alert('删除提示', '删除系统配置信息失败，请稍后再试！', 'error');
|
||||
}
|
||||
},
|
||||
//此处添加错误处理
|
||||
error: function () {
|
||||
$.messager.alert('删除提示', '删除系统配置信息异常，请稍后再试！', 'error');
|
||||
return;
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
//增加系统配置
|
||||
var url;
|
||||
var systemConfigId = 0;
|
||||
//保存编辑前的名称
|
||||
var oldCompanyName = "";
|
||||
var pageTotal = 0; //数据总量
|
||||
|
||||
function addSystemConfig() {
|
||||
if(pageTotal>=1) {
|
||||
$.messager.alert('提示', '只能填写一条系统配置信息', 'warning');
|
||||
} else {
|
||||
$('#systemConfigDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/> 增加系统配置');
|
||||
$(".window-mask").css({width: webW, height: webH});
|
||||
$('#systemConfigFM').form('clear');
|
||||
var row = {};
|
||||
$('#systemConfigFM').form('load', row);
|
||||
$("#companyName").focus();
|
||||
oldCompanyName = "";
|
||||
systemConfigId = 0;
|
||||
url = '/systemConfig/add';
|
||||
}
|
||||
}
|
||||
|
||||
//保存系统配置信息
|
||||
$("#saveSystemConfig").off("click").on("click", function () {
|
||||
if (checkCompanyName()) {
|
||||
return;
|
||||
}
|
||||
var companyName = $.trim($("#companyName").val());
|
||||
if (!companyName) {
|
||||
$.messager.alert('提示', '公司名称不能为空', 'warning');
|
||||
$("#companyName").val("").focus();
|
||||
return;
|
||||
}
|
||||
$.ajax({
|
||||
url: url,
|
||||
type: "post",
|
||||
dataType: "json",
|
||||
data: {
|
||||
info: JSON.stringify($("#systemConfigFM").serializeObject())
|
||||
},
|
||||
success: function(res) {
|
||||
if(res && res.code === 200) {
|
||||
$('#systemConfigDlg').dialog('close');
|
||||
//加载完以后重新初始化
|
||||
var opts = $("#tableData").datagrid('options');
|
||||
showSystemConfigDetails(opts.pageNumber, opts.pageSize);
|
||||
}
|
||||
},
|
||||
//此处添加错误处理
|
||||
error: function () {
|
||||
$.messager.alert('提示', '网络异常，请稍后再试！', 'error');
|
||||
return;
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
//编辑系统配置信息
|
||||
function editSystemConfig(systemConfigTotalInfo) {
|
||||
var systemConfigInfo = systemConfigTotalInfo.split("AaBb");
|
||||
var row = {
|
||||
companyName: systemConfigInfo[1],
|
||||
companyContacts: systemConfigInfo[2],
|
||||
companyAddress: systemConfigInfo[3],
|
||||
companyTel: systemConfigInfo[4],
|
||||
companyFax: systemConfigInfo[5],
|
||||
companyPostCode: systemConfigInfo[6]
|
||||
};
|
||||
oldCompanyName = systemConfigInfo[1];
|
||||
$('#systemConfigDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/pencil.png"/> 编辑系统配置信息');
|
||||
$(".window-mask").css({width: webW, height: webH});
|
||||
$('#systemConfigFM').form('load', row);
|
||||
systemConfigId = systemConfigInfo[0];
|
||||
//焦点在名称输入框==定焦在输入文字后面
|
||||
$("#companyName").val("").focus().val(systemConfigInfo[1]);
|
||||
url = '/systemConfig/update?id=' + systemConfigInfo[0];
|
||||
}
|
||||
|
||||
//检查系统配置 名称是否存在 ++ 重名无法提示问题需要跟进
|
||||
function checkCompanyName() {
|
||||
var companyName = $.trim($("#companyName").val());
|
||||
//表示是否存在 true == 存在 false = 不存在
|
||||
var flag = false;
|
||||
//开始ajax名称检验，不能重名
|
||||
if (companyName.length > 0 && (oldCompanyName.length == 0 || companyName != oldCompanyName)) {
|
||||
$.ajax({
|
||||
type: "get",
|
||||
url: "/systemConfig/checkIsNameExist",
|
||||
dataType: "json",
|
||||
async: false,
|
||||
data: ({
|
||||
id: systemConfigId,
|
||||
companyName: companyName
|
||||
}),
|
||||
success: function (res) {
|
||||
if(res && res.code === 200) {
|
||||
if(res.data && res.data.status) {
|
||||
flag = res.data.status;
|
||||
if (flag) {
|
||||
$.messager.alert('提示', '系统配置名称已经存在', 'info');
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
//此处添加错误处理
|
||||
error: function () {
|
||||
$.messager.alert('提示', '检查系统配置名称是否存在异常，请稍后再试！', 'error');
|
||||
return;
|
||||
}
|
||||
});
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
//搜索处理
|
||||
$("#searchBtn").unbind().bind({
|
||||
click: function () {
|
||||
showSystemConfigDetails(1, initPageSize);
|
||||
var opts = $("#tableData").datagrid('options');
|
||||
var pager = $("#tableData").datagrid('getPager');
|
||||
opts.pageNumber = 1;
|
||||
opts.pageSize = initPageSize;
|
||||
pager.pagination('refresh', {
|
||||
pageNumber: 1,
|
||||
pageSize: initPageSize
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
function showSystemConfigDetails(pageNo, pageSize) {
|
||||
var companyName = $.trim($("#searchCompanyName").val());
|
||||
$.ajax({
|
||||
type: "get",
|
||||
url: "/systemConfig/list",
|
||||
dataType: "json",
|
||||
data: ({
|
||||
search: JSON.stringify({
|
||||
companyName: companyName
|
||||
}),
|
||||
currentPage: pageNo,
|
||||
pageSize: pageSize
|
||||
}),
|
||||
success: function (res) {
|
||||
if(res && res.code === 200){
|
||||
if(res.data && res.data.page) {
|
||||
pageTotal = res.data.page.total;
|
||||
$("#tableData").datagrid('loadData', res.data.page);
|
||||
}
|
||||
}
|
||||
},
|
||||
//此处添加错误处理
|
||||
error: function () {
|
||||
$.messager.alert('查询提示', '查询数据后台异常，请稍后再试！', 'error');
|
||||
return;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
//重置按钮
|
||||
$("#searchResetBtn").unbind().bind({
|
||||
click: function () {
|
||||
$("#searchCompanyName").val("");
|
||||
//加载完以后重新初始化
|
||||
$("#searchBtn").click();
|
||||
}
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -173,8 +173,10 @@
|
||||
<td style="padding:5px;width:140px;">
|
||||
<span class="NumberShow"></span>
|
||||
</td>
|
||||
<td style="width:70px;"></td>
|
||||
<td style="padding:5px;width:140px;"></td>
|
||||
<td style="width:70px;">关联订单：</td>
|
||||
<td style="padding:5px;width:130px;">
|
||||
<span class="LinkNumberShow"></span>
|
||||
</td>
|
||||
<td style="width:100px;"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
@@ -222,10 +224,8 @@
|
||||
<td style="padding:5px">
|
||||
<span class="OtherMoneyShow"></span>
|
||||
</td>
|
||||
<td>结算天数：</td>
|
||||
<td style="padding:5px">
|
||||
<span class="AccountDayShow"></span>
|
||||
</td>
|
||||
<td></td>
|
||||
<td style="padding:5px"></td>
|
||||
<td style="width:100px;"></td>
|
||||
</tr>
|
||||
</table>
|
||||
@@ -312,18 +312,18 @@
|
||||
<td style="padding:5px;width:130px;">
|
||||
<span class="OrganIdShow"></span>
|
||||
</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:70px;">单据日期：</td>
|
||||
<td style="padding:5px;width:140px;">
|
||||
<span class="OperTimeShow"></span>
|
||||
</td>
|
||||
<td style="width:70px;">单据编号：</td>
|
||||
<td style="width:80px;">单据编号：</td>
|
||||
<td style="padding:5px;width:140px;">
|
||||
<span class="NumberShow"></span>
|
||||
</td>
|
||||
<td style="width:70px;">关联订单：</td>
|
||||
<td style="padding:5px;width:130px;">
|
||||
<span class="LinkNumberShow"></span>
|
||||
</td>
|
||||
<td style="width:100px;"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
@@ -371,9 +371,9 @@
|
||||
<td style="padding:5px">
|
||||
<span class="OtherMoneyShow"></span>
|
||||
</td>
|
||||
<td>结算天数：</td>
|
||||
<td>销售人员：</td>
|
||||
<td style="padding:5px">
|
||||
<span class="AccountDayShow"></span>
|
||||
<span class="SalesmanShow"></span>
|
||||
</td>
|
||||
<td style="width:100px;"></td>
|
||||
</tr>
|
||||
@@ -388,10 +388,6 @@
|
||||
<td style="padding:5px;width:130px;">
|
||||
<span class="OrganIdShow"></span>
|
||||
</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;">
|
||||
<span class="OperTimeShow"></span>
|
||||
@@ -400,6 +396,8 @@
|
||||
<td style="padding:5px;width:140px;">
|
||||
<span class="NumberShow"></span>
|
||||
</td>
|
||||
<td style="width:70px;"></td>
|
||||
<td style="padding:5px;width:130px;"></td>
|
||||
<td style="width:100px;"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
@@ -447,8 +445,9 @@
|
||||
<td style="padding:5px">
|
||||
<span class="OtherMoneyShow"></span>
|
||||
</td>
|
||||
<td></td>
|
||||
<td>销售人员：</td>
|
||||
<td style="padding:5px">
|
||||
<span class="SalesmanShow"></span>
|
||||
</td>
|
||||
<td style="width:100px;"></td>
|
||||
</tr>
|
||||
|
||||
@@ -82,8 +82,9 @@
|
||||
<input name="Number" id="Number" class="easyui-validatebox"
|
||||
data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/>
|
||||
</td>
|
||||
<td style="width:70px;"></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>
|
||||
</tr>
|
||||
@@ -135,10 +136,8 @@
|
||||
<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"/>
|
||||
</td>
|
||||
<td>结算天数：</td>
|
||||
<td></td>
|
||||
<td style="padding:5px">
|
||||
<input id="AccountDay" name="AccountDay" class="easyui-validatebox"
|
||||
data-options="validType:'length[1,3]'" style="width:120px;"/>
|
||||
</td>
|
||||
<td style="width:100px;"></td>
|
||||
</tr>
|
||||
@@ -167,8 +166,10 @@
|
||||
<td style="padding:5px;width:140px;">
|
||||
<span id="NumberShow"></span>
|
||||
</td>
|
||||
<td style="width:70px;"></td>
|
||||
<td style="padding:5px;width:140px;"></td>
|
||||
<td style="width:70px;">关联订单：</td>
|
||||
<td style="padding:5px;width:140px;">
|
||||
<span id="LinkNumberShow"></span>
|
||||
</td>
|
||||
<td style="width:100px;"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
@@ -216,10 +217,8 @@
|
||||
<td style="padding:5px">
|
||||
<span id="OtherMoneyShow"></span>
|
||||
</td>
|
||||
<td>结算天数：</td>
|
||||
<td style="padding:5px">
|
||||
<span id="AccountDayShow"></span>
|
||||
</td>
|
||||
<td></td>
|
||||
<td style="padding:5px"></td>
|
||||
<td style="width:100px;"></td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
@@ -65,10 +65,6 @@
|
||||
<td style="padding:5px">
|
||||
<input id="OrganId" name="OrganId" style="width:110px;"/>
|
||||
</td>
|
||||
<td style="width:70px;">销售人员：</td>
|
||||
<td style="padding:5px">
|
||||
<input id="Salesman" name="Salesman" style="width:130px;"/>
|
||||
</td>
|
||||
<td>单据日期：</td>
|
||||
<td style="padding:5px">
|
||||
<input type="text" name="OperTime" id="OperTime"
|
||||
@@ -80,6 +76,8 @@
|
||||
<input name="Number" id="Number" class="easyui-validatebox"
|
||||
data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/>
|
||||
</td>
|
||||
<td style="width:70px;"></td>
|
||||
<td style="padding:5px"></td>
|
||||
<td style="width:100px;"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
@@ -130,8 +128,9 @@
|
||||
<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"/>
|
||||
</td>
|
||||
<td></td>
|
||||
<td>销售人员：</td>
|
||||
<td style="padding:5px">
|
||||
<input id="Salesman" name="Salesman" style="width:130px;"/>
|
||||
</td>
|
||||
<td style="width:100px;"></td>
|
||||
</tr>
|
||||
@@ -151,10 +150,6 @@
|
||||
<td style="padding:5px;width:130px;">
|
||||
<span id="OrganIdShow"></span>
|
||||
</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;">
|
||||
<span id="OperTimeShow"></span>
|
||||
@@ -163,6 +158,8 @@
|
||||
<td style="padding:5px;width:140px;">
|
||||
<span id="NumberShow"></span>
|
||||
</td>
|
||||
<td style="width:70px;"></td>
|
||||
<td style="padding:5px;width:130px;"></td>
|
||||
<td style="width:100px;"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
@@ -210,8 +207,9 @@
|
||||
<td style="padding:5px">
|
||||
<span id="OtherMoneyShow"></span>
|
||||
</td>
|
||||
<td></td>
|
||||
<td>销售人员：</td>
|
||||
<td style="padding:5px">
|
||||
<span id="SalesmanShow"></span>
|
||||
</td>
|
||||
<td style="width:100px;"></td>
|
||||
</tr>
|
||||
|
||||
@@ -65,21 +65,21 @@
|
||||
<td style="padding:5px">
|
||||
<input id="OrganId" name="OrganId" style="width:130px;"/>
|
||||
</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="width:70px;">单据日期：</td>
|
||||
<td style="padding:5px">
|
||||
<input type="text" name="OperTime" id="OperTime"
|
||||
onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
|
||||
style="width:140px;" readonly/>
|
||||
</td>
|
||||
<td style="width:70px;">单据编号：</td>
|
||||
<td style="width:80px;">单据编号：</td>
|
||||
<td style="padding:5px">
|
||||
<input name="Number" id="Number" class="easyui-validatebox"
|
||||
data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/>
|
||||
</td>
|
||||
<td style="width:70px;">销售人员：</td>
|
||||
<td style="padding:5px">
|
||||
<input id="Salesman" name="Salesman" style="width:130px;"/>
|
||||
</td>
|
||||
<td style="width:100px;"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
@@ -110,18 +110,18 @@
|
||||
<td style="padding:5px;width:130px;">
|
||||
<span id="OrganIdShow"></span>
|
||||
</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:70px;">单据日期：</td>
|
||||
<td style="padding:5px;width:140px;">
|
||||
<span id="OperTimeShow"></span>
|
||||
</td>
|
||||
<td style="width:70px;">单据编号：</td>
|
||||
<td style="width:80px;">单据编号：</td>
|
||||
<td style="padding:5px;width:140px;">
|
||||
<span id="NumberShow"></span>
|
||||
</td>
|
||||
<td style="width:70px;">销售人员：</td>
|
||||
<td style="padding:5px;width:130px;">
|
||||
<span id="SalesmanShow"></span>
|
||||
</td>
|
||||
<td style="width:100px;"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
||||
@@ -65,21 +65,21 @@
|
||||
<td style="padding:5px">
|
||||
<input id="OrganId" name="OrganId" style="width:130px;"/>
|
||||
</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="width:70px;">单据日期：</td>
|
||||
<td style="padding:5px">
|
||||
<input type="text" name="OperTime" id="OperTime"
|
||||
onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
|
||||
style="width:140px;" readonly/>
|
||||
</td>
|
||||
<td style="width:70px;">单据编号：</td>
|
||||
<td style="width:80px;">单据编号：</td>
|
||||
<td style="padding:5px">
|
||||
<input name="Number" id="Number" class="easyui-validatebox"
|
||||
data-options="required:true,validType:'length[2,30]'" style="width: 150px;" readonly/>
|
||||
</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>
|
||||
</tr>
|
||||
<tr>
|
||||
@@ -130,10 +130,9 @@
|
||||
<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"/>
|
||||
</td>
|
||||
<td>结算天数：</td>
|
||||
<td>销售人员：</td>
|
||||
<td style="padding:5px">
|
||||
<input id="AccountDay" name="AccountDay" class="easyui-numberbox"
|
||||
data-options="validType:'length[1,3]'" style="width:120px;"/>
|
||||
<input id="Salesman" name="Salesman" style="width:130px;"/>
|
||||
</td>
|
||||
<td style="width:100px;"></td>
|
||||
</tr>
|
||||
@@ -153,18 +152,18 @@
|
||||
<td style="padding:5px;width:130px;">
|
||||
<span id="OrganIdShow"></span>
|
||||
</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:70px;">单据日期：</td>
|
||||
<td style="padding:5px;width:140px;">
|
||||
<span id="OperTimeShow"></span>
|
||||
</td>
|
||||
<td style="width:70px;">单据编号：</td>
|
||||
<td style="width:80px;">单据编号：</td>
|
||||
<td style="padding:5px;width:140px;">
|
||||
<span id="NumberShow"></span>
|
||||
</td>
|
||||
<td style="width:70px;">关联订单：</td>
|
||||
<td style="padding:5px;width:130px;">
|
||||
<span id="LinkNumberShow"></span>
|
||||
</td>
|
||||
<td style="width:100px;"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
@@ -212,9 +211,9 @@
|
||||
<td style="padding:5px">
|
||||
<span id="OtherMoneyShow"></span>
|
||||
</td>
|
||||
<td>结算天数：</td>
|
||||
<td>销售人员：</td>
|
||||
<td style="padding:5px">
|
||||
<span id="AccountDayShow"></span>
|
||||
<span id="SalesmanShow"></span>
|
||||
</td>
|
||||
<td style="width:100px;"></td>
|
||||
</tr>
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
<td> </td>
|
||||
<td>
|
||||
期初应收：<span class="first-total">0</span>
|
||||
期末应收：<span class="last-total">0</span>
|
||||
期末应收：<span class="last-total">0</span><span id="pleaseSelect">（请选择客户）</span>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
@@ -241,7 +241,7 @@
|
||||
supType: "customer"
|
||||
}),
|
||||
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;
|
||||
$.ajax({
|
||||
type: "get",
|
||||
@@ -254,13 +254,14 @@
|
||||
supType: "customer"
|
||||
}),
|
||||
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 money = moneyA + moneyB;
|
||||
var moneyBeginNeedGet = beginNeedGet - 0; //期初应收
|
||||
var moneyBeginNeedPay = beginNeedPay - 0; //期初应付
|
||||
money = (money + moneyBeginNeedGet - moneyBeginNeedPay).toFixed(2);
|
||||
$(".first-total").text(money); //期初结存
|
||||
$("#pleaseSelect").hide();
|
||||
}
|
||||
},
|
||||
error: function () {
|
||||
@@ -289,7 +290,7 @@
|
||||
supType: "customer"
|
||||
}),
|
||||
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;
|
||||
$.ajax({
|
||||
type: "get",
|
||||
@@ -302,13 +303,14 @@
|
||||
supType: "customer"
|
||||
}),
|
||||
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 money = moneyA + moneyB;
|
||||
var moneyBeginNeedGet = beginNeedGet - 0; //期初应收
|
||||
var moneyBeginNeedPay = beginNeedPay - 0; //期初应付
|
||||
money = (money + moneyBeginNeedGet - moneyBeginNeedPay).toFixed(2);
|
||||
$(".last-total").text(money); //期末合计
|
||||
$("#pleaseSelect").hide();
|
||||
}
|
||||
},
|
||||
error: function () {
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
<td> </td>
|
||||
<td>
|
||||
期初应付：<span class="first-total">0</span>
|
||||
期末应付：<span class="last-total">0</span>
|
||||
期末应付：<span class="last-total">0</span><span id="pleaseSelect">（请选择供应商）</span>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
@@ -240,7 +240,7 @@
|
||||
supType: "vendor"
|
||||
}),
|
||||
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;
|
||||
$.ajax({
|
||||
type: "get",
|
||||
@@ -253,13 +253,14 @@
|
||||
supType: "vendor"
|
||||
}),
|
||||
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 money = moneyA + moneyB;
|
||||
var moneyBeginNeedGet = beginNeedGet - 0; //期初应收
|
||||
var moneyBeginNeedPay = beginNeedPay - 0; //期初应付
|
||||
money = (money + moneyBeginNeedPay - moneyBeginNeedGet).toFixed(2);
|
||||
$(".first-total").text(money); //期初结存
|
||||
$("#pleaseSelect").hide();
|
||||
}
|
||||
},
|
||||
error: function () {
|
||||
@@ -288,7 +289,7 @@
|
||||
supType: "vendor"
|
||||
}),
|
||||
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;
|
||||
$.ajax({
|
||||
type: "get",
|
||||
@@ -301,13 +302,14 @@
|
||||
supType: "vendor"
|
||||
}),
|
||||
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 money = moneyA + moneyB;
|
||||
var moneyBeginNeedGet = beginNeedGet - 0; //期初应收
|
||||
var moneyBeginNeedPay = beginNeedPay - 0; //期初应付
|
||||
money = (money + moneyBeginNeedPay - moneyBeginNeedGet).toFixed(2);
|
||||
$(".last-total").text(money); //期末合计
|
||||
$("#pleaseSelect").hide();
|
||||
}
|
||||
},
|
||||
error: function () {
|
||||
|
||||
@@ -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);
|
||||
|
||||
-- ----------------------------
|
||||
-- 时间：2019年3月8日
|
||||
-- 时间：2019年3月9日
|
||||
-- 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、根据本地用户表中现有部门生成机构表数据，同时重建机构和用户的关联关系
|
||||
-- 特别提醒：之后的sql都是在之前基础上迭代，可以对已存在的系统进行数据保留更新
|
||||
-- ----------------------------
|
||||
|
||||
@@ -51,6 +51,12 @@ public class BusinessConstants {
|
||||
* */
|
||||
public static final String ENABLE_SERIAL_NUMBER_ENABLED = "1";
|
||||
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";
|
||||
/**
|
||||
* 出入库分类
|
||||
*采购、采购退货、其它、零售、销售、调拨
|
||||
|
||||
@@ -51,7 +51,7 @@ public class DepotHeadController {
|
||||
* @return
|
||||
*/
|
||||
@PostMapping(value = "/batchSetStatus")
|
||||
public String batchSetStatus(@RequestParam("status") Boolean status,
|
||||
public String batchSetStatus(@RequestParam("status") String status,
|
||||
@RequestParam("depotHeadIDs") String depotHeadIDs,
|
||||
HttpServletRequest request) {
|
||||
Map<String, Object> objectMap = new HashMap<String, Object>();
|
||||
@@ -64,20 +64,12 @@ public class DepotHeadController {
|
||||
}
|
||||
|
||||
/**
|
||||
* 单据编号生成接口，规则：查找当前类型单据下的当天最大的单据号，并加1
|
||||
* @param type
|
||||
* @param subType
|
||||
* @param beginTime
|
||||
* @param endTime
|
||||
* 单据编号生成接口
|
||||
* @param request
|
||||
* @return
|
||||
*/
|
||||
@GetMapping(value = "/buildNumber")
|
||||
public BaseResponseInfo buildNumber(@RequestParam("type") String type,
|
||||
@RequestParam("subType") String subType,
|
||||
@RequestParam("beginTime") String beginTime,
|
||||
@RequestParam("endTime") String endTime,
|
||||
HttpServletRequest request) {
|
||||
public BaseResponseInfo buildNumber(HttpServletRequest request) {
|
||||
BaseResponseInfo res = new BaseResponseInfo();
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
try {
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -11,35 +11,51 @@ public class SystemConfig {
|
||||
|
||||
/**
|
||||
* 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
|
||||
*/
|
||||
private String type;
|
||||
private String companyName;
|
||||
|
||||
/**
|
||||
* 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
|
||||
*/
|
||||
private String name;
|
||||
private String companyContacts;
|
||||
|
||||
/**
|
||||
* 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
|
||||
*/
|
||||
private String value;
|
||||
private String companyAddress;
|
||||
|
||||
/**
|
||||
* 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
|
||||
*/
|
||||
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.
|
||||
@@ -67,97 +83,145 @@ public class SystemConfig {
|
||||
|
||||
/**
|
||||
* 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.type
|
||||
* @return the value of jsh_systemconfig.company_name
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public String getType() {
|
||||
return type;
|
||||
public String getCompanyName() {
|
||||
return companyName;
|
||||
}
|
||||
|
||||
/**
|
||||
* 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_name
|
||||
*
|
||||
* @param type the value for jsh_systemconfig.type
|
||||
* @param companyName the value for jsh_systemconfig.company_name
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public void setType(String type) {
|
||||
this.type = type == null ? null : type.trim();
|
||||
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.name
|
||||
* This method returns the value of the database column jsh_systemconfig.company_contacts
|
||||
*
|
||||
* @return the value of jsh_systemconfig.name
|
||||
* @return the value of jsh_systemconfig.company_contacts
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public String getName() {
|
||||
return name;
|
||||
public String getCompanyContacts() {
|
||||
return companyContacts;
|
||||
}
|
||||
|
||||
/**
|
||||
* 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_contacts
|
||||
*
|
||||
* @param name the value for jsh_systemconfig.name
|
||||
* @param companyContacts the value for jsh_systemconfig.company_contacts
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public void setName(String name) {
|
||||
this.name = name == null ? null : name.trim();
|
||||
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.value
|
||||
* This method returns the value of the database column jsh_systemconfig.company_address
|
||||
*
|
||||
* @return the value of jsh_systemconfig.value
|
||||
* @return the value of jsh_systemconfig.company_address
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public String getValue() {
|
||||
return value;
|
||||
public String getCompanyAddress() {
|
||||
return companyAddress;
|
||||
}
|
||||
|
||||
/**
|
||||
* 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_address
|
||||
*
|
||||
* @param value the value for jsh_systemconfig.value
|
||||
* @param companyAddress the value for jsh_systemconfig.company_address
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public void setValue(String value) {
|
||||
this.value = value == null ? null : value.trim();
|
||||
public void setCompanyAddress(String companyAddress) {
|
||||
this.companyAddress = companyAddress == null ? null : companyAddress.trim();
|
||||
}
|
||||
|
||||
/**
|
||||
* 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_tel
|
||||
*
|
||||
* @return the value of jsh_systemconfig.description
|
||||
* @return the value of jsh_systemconfig.company_tel
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public String getDescription() {
|
||||
return description;
|
||||
public String getCompanyTel() {
|
||||
return companyTel;
|
||||
}
|
||||
|
||||
/**
|
||||
* 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_tel
|
||||
*
|
||||
* @param description the value for jsh_systemconfig.description
|
||||
* @param companyTel the value for jsh_systemconfig.company_tel
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public void setDescription(String description) {
|
||||
this.description = description == null ? null : description.trim();
|
||||
public void setCompanyTel(String companyTel) {
|
||||
this.companyTel = companyTel == null ? null : companyTel.trim();
|
||||
}
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method returns the value of the database column jsh_systemconfig.company_fax
|
||||
*
|
||||
* @return the value of jsh_systemconfig.company_fax
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public String getCompanyFax() {
|
||||
return companyFax;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method sets the value of the database column jsh_systemconfig.company_fax
|
||||
*
|
||||
* @param companyFax the value for jsh_systemconfig.company_fax
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public void setCompanyFax(String companyFax) {
|
||||
this.companyFax = companyFax == null ? null : companyFax.trim();
|
||||
}
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method returns the value of the database column jsh_systemconfig.company_post_code
|
||||
*
|
||||
* @return the value of jsh_systemconfig.company_post_code
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public String getCompanyPostCode() {
|
||||
return companyPostCode;
|
||||
}
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method sets the value of the database column jsh_systemconfig.company_post_code
|
||||
*
|
||||
* @param companyPostCode the value for jsh_systemconfig.company_post_code
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
public void setCompanyPostCode(String companyPostCode) {
|
||||
this.companyPostCode = companyPostCode == null ? null : companyPostCode.trim();
|
||||
}
|
||||
}
|
||||
@@ -254,283 +254,423 @@ public class SystemConfigExample {
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andTypeIsNull() {
|
||||
addCriterion("type is null");
|
||||
public Criteria andCompanyNameIsNull() {
|
||||
addCriterion("company_name is null");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andTypeIsNotNull() {
|
||||
addCriterion("type is not null");
|
||||
public Criteria andCompanyNameIsNotNull() {
|
||||
addCriterion("company_name is not null");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andTypeEqualTo(String value) {
|
||||
addCriterion("type =", value, "type");
|
||||
public Criteria andCompanyNameEqualTo(String value) {
|
||||
addCriterion("company_name =", value, "companyName");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andTypeNotEqualTo(String value) {
|
||||
addCriterion("type <>", value, "type");
|
||||
public Criteria andCompanyNameNotEqualTo(String value) {
|
||||
addCriterion("company_name <>", value, "companyName");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andTypeGreaterThan(String value) {
|
||||
addCriterion("type >", value, "type");
|
||||
public Criteria andCompanyNameGreaterThan(String value) {
|
||||
addCriterion("company_name >", value, "companyName");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andTypeGreaterThanOrEqualTo(String value) {
|
||||
addCriterion("type >=", value, "type");
|
||||
public Criteria andCompanyNameGreaterThanOrEqualTo(String value) {
|
||||
addCriterion("company_name >=", value, "companyName");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andTypeLessThan(String value) {
|
||||
addCriterion("type <", value, "type");
|
||||
public Criteria andCompanyNameLessThan(String value) {
|
||||
addCriterion("company_name <", value, "companyName");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andTypeLessThanOrEqualTo(String value) {
|
||||
addCriterion("type <=", value, "type");
|
||||
public Criteria andCompanyNameLessThanOrEqualTo(String value) {
|
||||
addCriterion("company_name <=", value, "companyName");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andTypeLike(String value) {
|
||||
addCriterion("type like", value, "type");
|
||||
public Criteria andCompanyNameLike(String value) {
|
||||
addCriterion("company_name like", value, "companyName");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andTypeNotLike(String value) {
|
||||
addCriterion("type not like", value, "type");
|
||||
public Criteria andCompanyNameNotLike(String value) {
|
||||
addCriterion("company_name not like", value, "companyName");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andTypeIn(List<String> values) {
|
||||
addCriterion("type in", values, "type");
|
||||
public Criteria andCompanyNameIn(List<String> values) {
|
||||
addCriterion("company_name in", values, "companyName");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andTypeNotIn(List<String> values) {
|
||||
addCriterion("type not in", values, "type");
|
||||
public Criteria andCompanyNameNotIn(List<String> values) {
|
||||
addCriterion("company_name not in", values, "companyName");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andTypeBetween(String value1, String value2) {
|
||||
addCriterion("type between", value1, value2, "type");
|
||||
public Criteria andCompanyNameBetween(String value1, String value2) {
|
||||
addCriterion("company_name between", value1, value2, "companyName");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andTypeNotBetween(String value1, String value2) {
|
||||
addCriterion("type not between", value1, value2, "type");
|
||||
public Criteria andCompanyNameNotBetween(String value1, String value2) {
|
||||
addCriterion("company_name not between", value1, value2, "companyName");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andNameIsNull() {
|
||||
addCriterion("name is null");
|
||||
public Criteria andCompanyContactsIsNull() {
|
||||
addCriterion("company_contacts is null");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andNameIsNotNull() {
|
||||
addCriterion("name is not null");
|
||||
public Criteria andCompanyContactsIsNotNull() {
|
||||
addCriterion("company_contacts is not null");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andNameEqualTo(String value) {
|
||||
addCriterion("name =", value, "name");
|
||||
public Criteria andCompanyContactsEqualTo(String value) {
|
||||
addCriterion("company_contacts =", value, "companyContacts");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andNameNotEqualTo(String value) {
|
||||
addCriterion("name <>", value, "name");
|
||||
public Criteria andCompanyContactsNotEqualTo(String value) {
|
||||
addCriterion("company_contacts <>", value, "companyContacts");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andNameGreaterThan(String value) {
|
||||
addCriterion("name >", value, "name");
|
||||
public Criteria andCompanyContactsGreaterThan(String value) {
|
||||
addCriterion("company_contacts >", value, "companyContacts");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andNameGreaterThanOrEqualTo(String value) {
|
||||
addCriterion("name >=", value, "name");
|
||||
public Criteria andCompanyContactsGreaterThanOrEqualTo(String value) {
|
||||
addCriterion("company_contacts >=", value, "companyContacts");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andNameLessThan(String value) {
|
||||
addCriterion("name <", value, "name");
|
||||
public Criteria andCompanyContactsLessThan(String value) {
|
||||
addCriterion("company_contacts <", value, "companyContacts");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andNameLessThanOrEqualTo(String value) {
|
||||
addCriterion("name <=", value, "name");
|
||||
public Criteria andCompanyContactsLessThanOrEqualTo(String value) {
|
||||
addCriterion("company_contacts <=", value, "companyContacts");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andNameLike(String value) {
|
||||
addCriterion("name like", value, "name");
|
||||
public Criteria andCompanyContactsLike(String value) {
|
||||
addCriterion("company_contacts like", value, "companyContacts");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andNameNotLike(String value) {
|
||||
addCriterion("name not like", value, "name");
|
||||
public Criteria andCompanyContactsNotLike(String value) {
|
||||
addCriterion("company_contacts not like", value, "companyContacts");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andNameIn(List<String> values) {
|
||||
addCriterion("name in", values, "name");
|
||||
public Criteria andCompanyContactsIn(List<String> values) {
|
||||
addCriterion("company_contacts in", values, "companyContacts");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andNameNotIn(List<String> values) {
|
||||
addCriterion("name not in", values, "name");
|
||||
public Criteria andCompanyContactsNotIn(List<String> values) {
|
||||
addCriterion("company_contacts not in", values, "companyContacts");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andNameBetween(String value1, String value2) {
|
||||
addCriterion("name between", value1, value2, "name");
|
||||
public Criteria andCompanyContactsBetween(String value1, String value2) {
|
||||
addCriterion("company_contacts between", value1, value2, "companyContacts");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andNameNotBetween(String value1, String value2) {
|
||||
addCriterion("name not between", value1, value2, "name");
|
||||
public Criteria andCompanyContactsNotBetween(String value1, String value2) {
|
||||
addCriterion("company_contacts not between", value1, value2, "companyContacts");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andValueIsNull() {
|
||||
addCriterion("value is null");
|
||||
public Criteria andCompanyAddressIsNull() {
|
||||
addCriterion("company_address is null");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andValueIsNotNull() {
|
||||
addCriterion("value is not null");
|
||||
public Criteria andCompanyAddressIsNotNull() {
|
||||
addCriterion("company_address is not null");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andValueEqualTo(String value) {
|
||||
addCriterion("value =", value, "value");
|
||||
public Criteria andCompanyAddressEqualTo(String value) {
|
||||
addCriterion("company_address =", value, "companyAddress");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andValueNotEqualTo(String value) {
|
||||
addCriterion("value <>", value, "value");
|
||||
public Criteria andCompanyAddressNotEqualTo(String value) {
|
||||
addCriterion("company_address <>", value, "companyAddress");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andValueGreaterThan(String value) {
|
||||
addCriterion("value >", value, "value");
|
||||
public Criteria andCompanyAddressGreaterThan(String value) {
|
||||
addCriterion("company_address >", value, "companyAddress");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andValueGreaterThanOrEqualTo(String value) {
|
||||
addCriterion("value >=", value, "value");
|
||||
public Criteria andCompanyAddressGreaterThanOrEqualTo(String value) {
|
||||
addCriterion("company_address >=", value, "companyAddress");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andValueLessThan(String value) {
|
||||
addCriterion("value <", value, "value");
|
||||
public Criteria andCompanyAddressLessThan(String value) {
|
||||
addCriterion("company_address <", value, "companyAddress");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andValueLessThanOrEqualTo(String value) {
|
||||
addCriterion("value <=", value, "value");
|
||||
public Criteria andCompanyAddressLessThanOrEqualTo(String value) {
|
||||
addCriterion("company_address <=", value, "companyAddress");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andValueLike(String value) {
|
||||
addCriterion("value like", value, "value");
|
||||
public Criteria andCompanyAddressLike(String value) {
|
||||
addCriterion("company_address like", value, "companyAddress");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andValueNotLike(String value) {
|
||||
addCriterion("value not like", value, "value");
|
||||
public Criteria andCompanyAddressNotLike(String value) {
|
||||
addCriterion("company_address not like", value, "companyAddress");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andValueIn(List<String> values) {
|
||||
addCriterion("value in", values, "value");
|
||||
public Criteria andCompanyAddressIn(List<String> values) {
|
||||
addCriterion("company_address in", values, "companyAddress");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andValueNotIn(List<String> values) {
|
||||
addCriterion("value not in", values, "value");
|
||||
public Criteria andCompanyAddressNotIn(List<String> values) {
|
||||
addCriterion("company_address not in", values, "companyAddress");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andValueBetween(String value1, String value2) {
|
||||
addCriterion("value between", value1, value2, "value");
|
||||
public Criteria andCompanyAddressBetween(String value1, String value2) {
|
||||
addCriterion("company_address between", value1, value2, "companyAddress");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andValueNotBetween(String value1, String value2) {
|
||||
addCriterion("value not between", value1, value2, "value");
|
||||
public Criteria andCompanyAddressNotBetween(String value1, String value2) {
|
||||
addCriterion("company_address not between", value1, value2, "companyAddress");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andDescriptionIsNull() {
|
||||
addCriterion("description is null");
|
||||
public Criteria andCompanyTelIsNull() {
|
||||
addCriterion("company_tel is null");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andDescriptionIsNotNull() {
|
||||
addCriterion("description is not null");
|
||||
public Criteria andCompanyTelIsNotNull() {
|
||||
addCriterion("company_tel is not null");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andDescriptionEqualTo(String value) {
|
||||
addCriterion("description =", value, "description");
|
||||
public Criteria andCompanyTelEqualTo(String value) {
|
||||
addCriterion("company_tel =", value, "companyTel");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andDescriptionNotEqualTo(String value) {
|
||||
addCriterion("description <>", value, "description");
|
||||
public Criteria andCompanyTelNotEqualTo(String value) {
|
||||
addCriterion("company_tel <>", value, "companyTel");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andDescriptionGreaterThan(String value) {
|
||||
addCriterion("description >", value, "description");
|
||||
public Criteria andCompanyTelGreaterThan(String value) {
|
||||
addCriterion("company_tel >", value, "companyTel");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andDescriptionGreaterThanOrEqualTo(String value) {
|
||||
addCriterion("description >=", value, "description");
|
||||
public Criteria andCompanyTelGreaterThanOrEqualTo(String value) {
|
||||
addCriterion("company_tel >=", value, "companyTel");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andDescriptionLessThan(String value) {
|
||||
addCriterion("description <", value, "description");
|
||||
public Criteria andCompanyTelLessThan(String value) {
|
||||
addCriterion("company_tel <", value, "companyTel");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andDescriptionLessThanOrEqualTo(String value) {
|
||||
addCriterion("description <=", value, "description");
|
||||
public Criteria andCompanyTelLessThanOrEqualTo(String value) {
|
||||
addCriterion("company_tel <=", value, "companyTel");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andDescriptionLike(String value) {
|
||||
addCriterion("description like", value, "description");
|
||||
public Criteria andCompanyTelLike(String value) {
|
||||
addCriterion("company_tel like", value, "companyTel");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andDescriptionNotLike(String value) {
|
||||
addCriterion("description not like", value, "description");
|
||||
public Criteria andCompanyTelNotLike(String value) {
|
||||
addCriterion("company_tel not like", value, "companyTel");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andDescriptionIn(List<String> values) {
|
||||
addCriterion("description in", values, "description");
|
||||
public Criteria andCompanyTelIn(List<String> values) {
|
||||
addCriterion("company_tel in", values, "companyTel");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andDescriptionNotIn(List<String> values) {
|
||||
addCriterion("description not in", values, "description");
|
||||
public Criteria andCompanyTelNotIn(List<String> values) {
|
||||
addCriterion("company_tel not in", values, "companyTel");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andDescriptionBetween(String value1, String value2) {
|
||||
addCriterion("description between", value1, value2, "description");
|
||||
public Criteria andCompanyTelBetween(String value1, String value2) {
|
||||
addCriterion("company_tel between", value1, value2, "companyTel");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andDescriptionNotBetween(String value1, String value2) {
|
||||
addCriterion("description not between", value1, value2, "description");
|
||||
public Criteria andCompanyTelNotBetween(String value1, String value2) {
|
||||
addCriterion("company_tel not between", value1, value2, "companyTel");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andCompanyFaxIsNull() {
|
||||
addCriterion("company_fax is null");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andCompanyFaxIsNotNull() {
|
||||
addCriterion("company_fax is not null");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andCompanyFaxEqualTo(String value) {
|
||||
addCriterion("company_fax =", value, "companyFax");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andCompanyFaxNotEqualTo(String value) {
|
||||
addCriterion("company_fax <>", value, "companyFax");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andCompanyFaxGreaterThan(String value) {
|
||||
addCriterion("company_fax >", value, "companyFax");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andCompanyFaxGreaterThanOrEqualTo(String value) {
|
||||
addCriterion("company_fax >=", value, "companyFax");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andCompanyFaxLessThan(String value) {
|
||||
addCriterion("company_fax <", value, "companyFax");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andCompanyFaxLessThanOrEqualTo(String value) {
|
||||
addCriterion("company_fax <=", value, "companyFax");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andCompanyFaxLike(String value) {
|
||||
addCriterion("company_fax like", value, "companyFax");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andCompanyFaxNotLike(String value) {
|
||||
addCriterion("company_fax not like", value, "companyFax");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andCompanyFaxIn(List<String> values) {
|
||||
addCriterion("company_fax in", values, "companyFax");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andCompanyFaxNotIn(List<String> values) {
|
||||
addCriterion("company_fax not in", values, "companyFax");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andCompanyFaxBetween(String value1, String value2) {
|
||||
addCriterion("company_fax between", value1, value2, "companyFax");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andCompanyFaxNotBetween(String value1, String value2) {
|
||||
addCriterion("company_fax not between", value1, value2, "companyFax");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andCompanyPostCodeIsNull() {
|
||||
addCriterion("company_post_code is null");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andCompanyPostCodeIsNotNull() {
|
||||
addCriterion("company_post_code is not null");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andCompanyPostCodeEqualTo(String value) {
|
||||
addCriterion("company_post_code =", value, "companyPostCode");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andCompanyPostCodeNotEqualTo(String value) {
|
||||
addCriterion("company_post_code <>", value, "companyPostCode");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andCompanyPostCodeGreaterThan(String value) {
|
||||
addCriterion("company_post_code >", value, "companyPostCode");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andCompanyPostCodeGreaterThanOrEqualTo(String value) {
|
||||
addCriterion("company_post_code >=", value, "companyPostCode");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andCompanyPostCodeLessThan(String value) {
|
||||
addCriterion("company_post_code <", value, "companyPostCode");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andCompanyPostCodeLessThanOrEqualTo(String value) {
|
||||
addCriterion("company_post_code <=", value, "companyPostCode");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andCompanyPostCodeLike(String value) {
|
||||
addCriterion("company_post_code like", value, "companyPostCode");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andCompanyPostCodeNotLike(String value) {
|
||||
addCriterion("company_post_code not like", value, "companyPostCode");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andCompanyPostCodeIn(List<String> values) {
|
||||
addCriterion("company_post_code in", values, "companyPostCode");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andCompanyPostCodeNotIn(List<String> values) {
|
||||
addCriterion("company_post_code not in", values, "companyPostCode");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andCompanyPostCodeBetween(String value1, String value2) {
|
||||
addCriterion("company_post_code between", value1, value2, "companyPostCode");
|
||||
return (Criteria) this;
|
||||
}
|
||||
|
||||
public Criteria andCompanyPostCodeNotBetween(String value1, String value2) {
|
||||
addCriterion("company_post_code not between", value1, value2, "companyPostCode");
|
||||
return (Criteria) this;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,103 +1,96 @@
|
||||
package com.jsh.erp.datasource.mappers;
|
||||
|
||||
import com.jsh.erp.datasource.entities.DepotHead;
|
||||
import com.jsh.erp.datasource.entities.DepotHeadExample;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
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;
|
||||
|
||||
public interface DepotHeadMapper {
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_depothead
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
int countByExample(DepotHeadExample example);
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_depothead
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
int deleteByExample(DepotHeadExample example);
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_depothead
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
int deleteByPrimaryKey(Long id);
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_depothead
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
int insert(DepotHead record);
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_depothead
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
int insertSelective(DepotHead record);
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_depothead
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
List<DepotHead> selectByExample(DepotHeadExample example);
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_depothead
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
DepotHead selectByPrimaryKey(Long id);
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_depothead
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
int updateByExampleSelective(@Param("record") DepotHead record, @Param("example") DepotHeadExample example);
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_depothead
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
int updateByExample(@Param("record") DepotHead record, @Param("example") DepotHeadExample example);
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_depothead
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
int updateByPrimaryKeySelective(DepotHead record);
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_depothead
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
int updateByPrimaryKey(DepotHead record);
|
||||
package com.jsh.erp.datasource.mappers;
|
||||
|
||||
import com.jsh.erp.datasource.entities.DepotHead;
|
||||
import com.jsh.erp.datasource.entities.DepotHeadExample;
|
||||
import java.util.List;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
public interface DepotHeadMapper {
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_depothead
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
int countByExample(DepotHeadExample example);
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_depothead
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
int deleteByExample(DepotHeadExample example);
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_depothead
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
int deleteByPrimaryKey(Long id);
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_depothead
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
int insert(DepotHead record);
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_depothead
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
int insertSelective(DepotHead record);
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_depothead
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
List<DepotHead> selectByExample(DepotHeadExample example);
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_depothead
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
DepotHead selectByPrimaryKey(Long id);
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_depothead
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
int updateByExampleSelective(@Param("record") DepotHead record, @Param("example") DepotHeadExample example);
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_depothead
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
int updateByExample(@Param("record") DepotHead record, @Param("example") DepotHeadExample example);
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_depothead
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
int updateByPrimaryKeySelective(DepotHead record);
|
||||
|
||||
/**
|
||||
* This method was generated by MyBatis Generator.
|
||||
* This method corresponds to the database table jsh_depothead
|
||||
*
|
||||
* @mbggenerated
|
||||
*/
|
||||
int updateByPrimaryKey(DepotHead record);
|
||||
}
|
||||
@@ -9,8 +9,10 @@ import java.util.List;
|
||||
public interface SystemConfigMapperEx {
|
||||
|
||||
List<SystemConfig> selectByConditionSystemConfig(
|
||||
@Param("companyName") String companyName,
|
||||
@Param("offset") Integer offset,
|
||||
@Param("rows") Integer rows);
|
||||
|
||||
Long countsBySystemConfig();
|
||||
Long countsBySystemConfig(
|
||||
@Param("companyName") String companyName);
|
||||
}
|
||||
@@ -59,7 +59,9 @@ public class DepotHeadVo4List {
|
||||
|
||||
private Integer accountday;
|
||||
|
||||
private Boolean status;
|
||||
private String status;
|
||||
|
||||
private String linknumber;
|
||||
|
||||
private String projectName;
|
||||
|
||||
@@ -291,14 +293,22 @@ public class DepotHeadVo4List {
|
||||
this.accountday = accountday;
|
||||
}
|
||||
|
||||
public Boolean getStatus() {
|
||||
public String getStatus() {
|
||||
return status;
|
||||
}
|
||||
|
||||
public void setStatus(Boolean status) {
|
||||
public void setStatus(String status) {
|
||||
this.status = status;
|
||||
}
|
||||
|
||||
public String getLinknumber() {
|
||||
return linknumber;
|
||||
}
|
||||
|
||||
public void setLinknumber(String linknumber) {
|
||||
this.linknumber = linknumber;
|
||||
}
|
||||
|
||||
public String getProjectName() {
|
||||
return projectName;
|
||||
}
|
||||
|
||||
@@ -106,7 +106,7 @@ public class DepotHeadService {
|
||||
depotHead.setOperpersonname(uName);
|
||||
}
|
||||
depotHead.setCreatetime(new Timestamp(System.currentTimeMillis()));
|
||||
depotHead.setStatus(false);
|
||||
depotHead.setStatus(BusinessConstants.BILLS_STATUS_UN_AUDIT);
|
||||
return depotHeadMapper.insert(depotHead);
|
||||
}
|
||||
|
||||
@@ -142,7 +142,7 @@ public class DepotHeadService {
|
||||
}
|
||||
|
||||
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
|
||||
public int batchSetStatus(Boolean status, String depotHeadIDs) {
|
||||
public int batchSetStatus(String status, String depotHeadIDs) {
|
||||
List<Long> ids = StringUtil.strToLongList(depotHeadIDs);
|
||||
DepotHead depotHead = new DepotHead();
|
||||
depotHead.setStatus(status);
|
||||
@@ -275,7 +275,7 @@ public class DepotHeadService {
|
||||
User userInfo=userService.getCurrentUser();
|
||||
depotHead.setOperpersonname(userInfo==null?null:userInfo.getUsername());
|
||||
depotHead.setCreatetime(new Timestamp(System.currentTimeMillis()));
|
||||
depotHead.setStatus(false);
|
||||
depotHead.setStatus(BusinessConstants.BILLS_STATUS_UN_AUDIT);
|
||||
depotHeadMapperEx.adddepotHead(depotHead);
|
||||
/**入库和出库处理预付款信息*/
|
||||
if(BusinessConstants.PAY_TYPE_PREPAID.equals(depotHead.getPaytype())){
|
||||
@@ -285,6 +285,14 @@ public class DepotHeadService {
|
||||
}
|
||||
/**入库和出库处理单据子表信息*/
|
||||
depotItemService.saveDetials(inserted,deleted,updated,depotHead.getId());
|
||||
/**如果关联单据号非空则更新订单的状态为2 */
|
||||
if(depotHead.getLinknumber()!=null) {
|
||||
DepotHead depotHeadOrders = new DepotHead();
|
||||
depotHeadOrders.setStatus(BusinessConstants.BILLS_STATUS_SKIP);
|
||||
DepotHeadExample example = new DepotHeadExample();
|
||||
example.createCriteria().andNumberEqualTo(depotHead.getLinknumber());
|
||||
depotHeadMapper.updateByExampleSelective(depotHeadOrders, example);
|
||||
}
|
||||
}
|
||||
/**
|
||||
* create by: cjl
|
||||
|
||||
@@ -31,13 +31,17 @@ public class SystemConfigComponent implements ICommonQuery {
|
||||
}
|
||||
|
||||
private List<?> getSystemConfigList(Map<String, String> map) {
|
||||
String search = map.get(Constants.SEARCH);
|
||||
String companyName = StringUtil.getInfo(search, "companyName");
|
||||
String order = QueryUtils.order(map);
|
||||
return systemConfigService.select(QueryUtils.offset(map), QueryUtils.rows(map));
|
||||
return systemConfigService.select(companyName, QueryUtils.offset(map), QueryUtils.rows(map));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Long counts(Map<String, String> map) {
|
||||
return systemConfigService.countSystemConfig();
|
||||
String search = map.get(Constants.SEARCH);
|
||||
String companyName = StringUtil.getInfo(search, "companyName");
|
||||
return systemConfigService.countSystemConfig(companyName);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -33,12 +33,12 @@ public class SystemConfigService {
|
||||
SystemConfigExample example = new SystemConfigExample();
|
||||
return systemConfigMapper.selectByExample(example);
|
||||
}
|
||||
public List<SystemConfig> select(int offset, int rows) {
|
||||
return systemConfigMapperEx.selectByConditionSystemConfig(offset, rows);
|
||||
public List<SystemConfig> select(String companyName, int offset, int rows) {
|
||||
return systemConfigMapperEx.selectByConditionSystemConfig(companyName, offset, rows);
|
||||
}
|
||||
|
||||
public Long countSystemConfig() {
|
||||
return systemConfigMapperEx.countsBySystemConfig();
|
||||
public Long countSystemConfig(String companyName) {
|
||||
return systemConfigMapperEx.countsBySystemConfig(companyName);
|
||||
}
|
||||
|
||||
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
|
||||
@@ -69,7 +69,7 @@ public class SystemConfigService {
|
||||
|
||||
public int checkIsNameExist(Long id, String name) {
|
||||
SystemConfigExample example = new SystemConfigExample();
|
||||
example.createCriteria().andIdNotEqualTo(id).andNameEqualTo(name);
|
||||
example.createCriteria().andIdNotEqualTo(id).andCompanyNameEqualTo(name);
|
||||
List<SystemConfig> list = systemConfigMapper.selectByExample(example);
|
||||
return list.size();
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.jsh.erp.datasource.mappers.DepotHeadMapper">
|
||||
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.DepotHead">
|
||||
<!--
|
||||
@@ -33,7 +33,8 @@
|
||||
<result column="OtherMoneyList" jdbcType="VARCHAR" property="othermoneylist" />
|
||||
<result column="OtherMoneyItem" jdbcType="VARCHAR" property="othermoneyitem" />
|
||||
<result column="AccountDay" jdbcType="INTEGER" property="accountday" />
|
||||
<result column="Status" jdbcType="BIT" property="status" />
|
||||
<result column="Status" jdbcType="VARCHAR" property="status" />
|
||||
<result column="LinkNumber" jdbcType="VARCHAR" property="linknumber" />
|
||||
</resultMap>
|
||||
<sql id="Example_Where_Clause">
|
||||
<!--
|
||||
@@ -109,7 +110,8 @@
|
||||
Id, Type, SubType, ProjectId, DefaultNumber, Number, OperPersonName, CreateTime,
|
||||
OperTime, OrganId, HandsPersonId, AccountId, ChangeAmount, AllocationProjectId, TotalPrice,
|
||||
PayType, Remark, Salesman, AccountIdList, AccountMoneyList, Discount, DiscountMoney,
|
||||
DiscountLastMoney, OtherMoney, OtherMoneyList, OtherMoneyItem, AccountDay, Status
|
||||
DiscountLastMoney, OtherMoney, OtherMoneyList, OtherMoneyItem, AccountDay, Status,
|
||||
LinkNumber
|
||||
</sql>
|
||||
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample" resultMap="BaseResultMap">
|
||||
<!--
|
||||
@@ -171,7 +173,7 @@
|
||||
AccountIdList, AccountMoneyList, Discount,
|
||||
DiscountMoney, DiscountLastMoney, OtherMoney,
|
||||
OtherMoneyList, OtherMoneyItem, AccountDay,
|
||||
Status)
|
||||
Status, LinkNumber)
|
||||
values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{subtype,jdbcType=VARCHAR},
|
||||
#{projectid,jdbcType=BIGINT}, #{defaultnumber,jdbcType=VARCHAR}, #{number,jdbcType=VARCHAR},
|
||||
#{operpersonname,jdbcType=VARCHAR}, #{createtime,jdbcType=TIMESTAMP}, #{opertime,jdbcType=TIMESTAMP},
|
||||
@@ -181,7 +183,7 @@
|
||||
#{accountidlist,jdbcType=VARCHAR}, #{accountmoneylist,jdbcType=VARCHAR}, #{discount,jdbcType=DECIMAL},
|
||||
#{discountmoney,jdbcType=DECIMAL}, #{discountlastmoney,jdbcType=DECIMAL}, #{othermoney,jdbcType=DECIMAL},
|
||||
#{othermoneylist,jdbcType=VARCHAR}, #{othermoneyitem,jdbcType=VARCHAR}, #{accountday,jdbcType=INTEGER},
|
||||
#{status,jdbcType=BIT})
|
||||
#{status,jdbcType=VARCHAR}, #{linknumber,jdbcType=VARCHAR})
|
||||
</insert>
|
||||
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.DepotHead">
|
||||
<!--
|
||||
@@ -274,6 +276,9 @@
|
||||
<if test="status != null">
|
||||
Status,
|
||||
</if>
|
||||
<if test="linknumber != null">
|
||||
LinkNumber,
|
||||
</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null">
|
||||
@@ -358,7 +363,10 @@
|
||||
#{accountday,jdbcType=INTEGER},
|
||||
</if>
|
||||
<if test="status != null">
|
||||
#{status,jdbcType=BIT},
|
||||
#{status,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="linknumber != null">
|
||||
#{linknumber,jdbcType=VARCHAR},
|
||||
</if>
|
||||
</trim>
|
||||
</insert>
|
||||
@@ -461,7 +469,10 @@
|
||||
AccountDay = #{record.accountday,jdbcType=INTEGER},
|
||||
</if>
|
||||
<if test="record.status != null">
|
||||
Status = #{record.status,jdbcType=BIT},
|
||||
Status = #{record.status,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="record.linknumber != null">
|
||||
LinkNumber = #{record.linknumber,jdbcType=VARCHAR},
|
||||
</if>
|
||||
</set>
|
||||
<if test="_parameter != null">
|
||||
@@ -501,7 +512,8 @@
|
||||
OtherMoneyList = #{record.othermoneylist,jdbcType=VARCHAR},
|
||||
OtherMoneyItem = #{record.othermoneyitem,jdbcType=VARCHAR},
|
||||
AccountDay = #{record.accountday,jdbcType=INTEGER},
|
||||
Status = #{record.status,jdbcType=BIT}
|
||||
Status = #{record.status,jdbcType=VARCHAR},
|
||||
LinkNumber = #{record.linknumber,jdbcType=VARCHAR}
|
||||
<if test="_parameter != null">
|
||||
<include refid="Update_By_Example_Where_Clause" />
|
||||
</if>
|
||||
@@ -592,7 +604,10 @@
|
||||
AccountDay = #{accountday,jdbcType=INTEGER},
|
||||
</if>
|
||||
<if test="status != null">
|
||||
Status = #{status,jdbcType=BIT},
|
||||
Status = #{status,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="linknumber != null">
|
||||
LinkNumber = #{linknumber,jdbcType=VARCHAR},
|
||||
</if>
|
||||
</set>
|
||||
where Id = #{id,jdbcType=BIGINT}
|
||||
@@ -629,7 +644,8 @@
|
||||
OtherMoneyList = #{othermoneylist,jdbcType=VARCHAR},
|
||||
OtherMoneyItem = #{othermoneyitem,jdbcType=VARCHAR},
|
||||
AccountDay = #{accountday,jdbcType=INTEGER},
|
||||
Status = #{status,jdbcType=BIT}
|
||||
Status = #{status,jdbcType=VARCHAR},
|
||||
LinkNumber = #{linknumber,jdbcType=VARCHAR}
|
||||
where Id = #{id,jdbcType=BIGINT}
|
||||
</update>
|
||||
</mapper>
|
||||
@@ -293,7 +293,7 @@
|
||||
AccountIdList, AccountMoneyList, Discount,
|
||||
DiscountMoney, DiscountLastMoney, OtherMoney,
|
||||
OtherMoneyList, OtherMoneyItem, AccountDay,
|
||||
Status)
|
||||
Status, LinkNumber)
|
||||
values (#{type,jdbcType=VARCHAR}, #{subtype,jdbcType=VARCHAR},
|
||||
#{projectid,jdbcType=BIGINT}, #{defaultnumber,jdbcType=VARCHAR}, #{number,jdbcType=VARCHAR},
|
||||
#{operpersonname,jdbcType=VARCHAR}, #{createtime,jdbcType=TIMESTAMP}, #{opertime,jdbcType=TIMESTAMP},
|
||||
@@ -303,7 +303,7 @@
|
||||
#{accountidlist,jdbcType=VARCHAR}, #{accountmoneylist,jdbcType=VARCHAR}, #{discount,jdbcType=DECIMAL},
|
||||
#{discountmoney,jdbcType=DECIMAL}, #{discountlastmoney,jdbcType=DECIMAL}, #{othermoney,jdbcType=DECIMAL},
|
||||
#{othermoneylist,jdbcType=VARCHAR}, #{othermoneyitem,jdbcType=VARCHAR}, #{accountday,jdbcType=INTEGER},
|
||||
#{status,jdbcType=BIT})
|
||||
#{status,jdbcType=VARCHAR}, #{linknumber,jdbcType=VARCHAR})
|
||||
</insert>
|
||||
<update id="updatedepotHead" parameterType="com.jsh.erp.datasource.entities.DepotHead">
|
||||
update jsh_depothead
|
||||
@@ -384,7 +384,10 @@
|
||||
AccountDay = #{accountday,jdbcType=INTEGER},
|
||||
</if>
|
||||
<if test="status != null">
|
||||
Status = #{status,jdbcType=BIT},
|
||||
Status = #{status,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="linknumber != null">
|
||||
LinkNumber = #{linknumber,jdbcType=VARCHAR},
|
||||
</if>
|
||||
</set>
|
||||
where Id = #{id,jdbcType=BIGINT}
|
||||
|
||||
@@ -7,10 +7,12 @@
|
||||
This element is automatically generated by MyBatis Generator, do not modify.
|
||||
-->
|
||||
<id column="id" jdbcType="BIGINT" property="id" />
|
||||
<result column="type" jdbcType="VARCHAR" property="type" />
|
||||
<result column="name" jdbcType="VARCHAR" property="name" />
|
||||
<result column="value" jdbcType="VARCHAR" property="value" />
|
||||
<result column="description" jdbcType="VARCHAR" property="description" />
|
||||
<result column="company_name" jdbcType="VARCHAR" property="companyName" />
|
||||
<result column="company_contacts" jdbcType="VARCHAR" property="companyContacts" />
|
||||
<result column="company_address" jdbcType="VARCHAR" property="companyAddress" />
|
||||
<result column="company_tel" jdbcType="VARCHAR" property="companyTel" />
|
||||
<result column="company_fax" jdbcType="VARCHAR" property="companyFax" />
|
||||
<result column="company_post_code" jdbcType="VARCHAR" property="companyPostCode" />
|
||||
</resultMap>
|
||||
<sql id="Example_Where_Clause">
|
||||
<!--
|
||||
@@ -83,7 +85,7 @@
|
||||
WARNING - @mbggenerated
|
||||
This element is automatically generated by MyBatis Generator, do not modify.
|
||||
-->
|
||||
id, type, name, value, description
|
||||
id, company_name, company_contacts, company_address, company_tel, company_fax, company_post_code
|
||||
</sql>
|
||||
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.SystemConfigExample" resultMap="BaseResultMap">
|
||||
<!--
|
||||
@@ -136,10 +138,12 @@
|
||||
WARNING - @mbggenerated
|
||||
This element is automatically generated by MyBatis Generator, do not modify.
|
||||
-->
|
||||
insert into jsh_systemconfig (id, type, name,
|
||||
value, description)
|
||||
values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR},
|
||||
#{value,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR})
|
||||
insert into jsh_systemconfig (id, company_name, company_contacts,
|
||||
company_address, company_tel, company_fax,
|
||||
company_post_code)
|
||||
values (#{id,jdbcType=BIGINT}, #{companyName,jdbcType=VARCHAR}, #{companyContacts,jdbcType=VARCHAR},
|
||||
#{companyAddress,jdbcType=VARCHAR}, #{companyTel,jdbcType=VARCHAR}, #{companyFax,jdbcType=VARCHAR},
|
||||
#{companyPostCode,jdbcType=VARCHAR})
|
||||
</insert>
|
||||
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.SystemConfig">
|
||||
<!--
|
||||
@@ -151,34 +155,46 @@
|
||||
<if test="id != null">
|
||||
id,
|
||||
</if>
|
||||
<if test="type != null">
|
||||
type,
|
||||
<if test="companyName != null">
|
||||
company_name,
|
||||
</if>
|
||||
<if test="name != null">
|
||||
name,
|
||||
<if test="companyContacts != null">
|
||||
company_contacts,
|
||||
</if>
|
||||
<if test="value != null">
|
||||
value,
|
||||
<if test="companyAddress != null">
|
||||
company_address,
|
||||
</if>
|
||||
<if test="description != null">
|
||||
description,
|
||||
<if test="companyTel != null">
|
||||
company_tel,
|
||||
</if>
|
||||
<if test="companyFax != null">
|
||||
company_fax,
|
||||
</if>
|
||||
<if test="companyPostCode != null">
|
||||
company_post_code,
|
||||
</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="id != null">
|
||||
#{id,jdbcType=BIGINT},
|
||||
</if>
|
||||
<if test="type != null">
|
||||
#{type,jdbcType=VARCHAR},
|
||||
<if test="companyName != null">
|
||||
#{companyName,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="name != null">
|
||||
#{name,jdbcType=VARCHAR},
|
||||
<if test="companyContacts != null">
|
||||
#{companyContacts,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="value != null">
|
||||
#{value,jdbcType=VARCHAR},
|
||||
<if test="companyAddress != null">
|
||||
#{companyAddress,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="description != null">
|
||||
#{description,jdbcType=VARCHAR},
|
||||
<if test="companyTel != null">
|
||||
#{companyTel,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="companyFax != null">
|
||||
#{companyFax,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="companyPostCode != null">
|
||||
#{companyPostCode,jdbcType=VARCHAR},
|
||||
</if>
|
||||
</trim>
|
||||
</insert>
|
||||
@@ -202,17 +218,23 @@
|
||||
<if test="record.id != null">
|
||||
id = #{record.id,jdbcType=BIGINT},
|
||||
</if>
|
||||
<if test="record.type != null">
|
||||
type = #{record.type,jdbcType=VARCHAR},
|
||||
<if test="record.companyName != null">
|
||||
company_name = #{record.companyName,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="record.name != null">
|
||||
name = #{record.name,jdbcType=VARCHAR},
|
||||
<if test="record.companyContacts != null">
|
||||
company_contacts = #{record.companyContacts,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="record.value != null">
|
||||
value = #{record.value,jdbcType=VARCHAR},
|
||||
<if test="record.companyAddress != null">
|
||||
company_address = #{record.companyAddress,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="record.description != null">
|
||||
description = #{record.description,jdbcType=VARCHAR},
|
||||
<if test="record.companyTel != null">
|
||||
company_tel = #{record.companyTel,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="record.companyFax != null">
|
||||
company_fax = #{record.companyFax,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="record.companyPostCode != null">
|
||||
company_post_code = #{record.companyPostCode,jdbcType=VARCHAR},
|
||||
</if>
|
||||
</set>
|
||||
<if test="_parameter != null">
|
||||
@@ -226,10 +248,12 @@
|
||||
-->
|
||||
update jsh_systemconfig
|
||||
set id = #{record.id,jdbcType=BIGINT},
|
||||
type = #{record.type,jdbcType=VARCHAR},
|
||||
name = #{record.name,jdbcType=VARCHAR},
|
||||
value = #{record.value,jdbcType=VARCHAR},
|
||||
description = #{record.description,jdbcType=VARCHAR}
|
||||
company_name = #{record.companyName,jdbcType=VARCHAR},
|
||||
company_contacts = #{record.companyContacts,jdbcType=VARCHAR},
|
||||
company_address = #{record.companyAddress,jdbcType=VARCHAR},
|
||||
company_tel = #{record.companyTel,jdbcType=VARCHAR},
|
||||
company_fax = #{record.companyFax,jdbcType=VARCHAR},
|
||||
company_post_code = #{record.companyPostCode,jdbcType=VARCHAR}
|
||||
<if test="_parameter != null">
|
||||
<include refid="Update_By_Example_Where_Clause" />
|
||||
</if>
|
||||
@@ -241,17 +265,23 @@
|
||||
-->
|
||||
update jsh_systemconfig
|
||||
<set>
|
||||
<if test="type != null">
|
||||
type = #{type,jdbcType=VARCHAR},
|
||||
<if test="companyName != null">
|
||||
company_name = #{companyName,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="name != null">
|
||||
name = #{name,jdbcType=VARCHAR},
|
||||
<if test="companyContacts != null">
|
||||
company_contacts = #{companyContacts,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="value != null">
|
||||
value = #{value,jdbcType=VARCHAR},
|
||||
<if test="companyAddress != null">
|
||||
company_address = #{companyAddress,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="description != null">
|
||||
description = #{description,jdbcType=VARCHAR},
|
||||
<if test="companyTel != null">
|
||||
company_tel = #{companyTel,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="companyFax != null">
|
||||
company_fax = #{companyFax,jdbcType=VARCHAR},
|
||||
</if>
|
||||
<if test="companyPostCode != null">
|
||||
company_post_code = #{companyPostCode,jdbcType=VARCHAR},
|
||||
</if>
|
||||
</set>
|
||||
where id = #{id,jdbcType=BIGINT}
|
||||
@@ -262,10 +292,12 @@
|
||||
This element is automatically generated by MyBatis Generator, do not modify.
|
||||
-->
|
||||
update jsh_systemconfig
|
||||
set type = #{type,jdbcType=VARCHAR},
|
||||
name = #{name,jdbcType=VARCHAR},
|
||||
value = #{value,jdbcType=VARCHAR},
|
||||
description = #{description,jdbcType=VARCHAR}
|
||||
set company_name = #{companyName,jdbcType=VARCHAR},
|
||||
company_contacts = #{companyContacts,jdbcType=VARCHAR},
|
||||
company_address = #{companyAddress,jdbcType=VARCHAR},
|
||||
company_tel = #{companyTel,jdbcType=VARCHAR},
|
||||
company_fax = #{companyFax,jdbcType=VARCHAR},
|
||||
company_post_code = #{companyPostCode,jdbcType=VARCHAR}
|
||||
where id = #{id,jdbcType=BIGINT}
|
||||
</update>
|
||||
</mapper>
|
||||
@@ -5,6 +5,9 @@
|
||||
select *
|
||||
FROM jsh_systemconfig
|
||||
where 1=1
|
||||
<if test="companyName != null">
|
||||
and company_name like '%${companyName}%'
|
||||
</if>
|
||||
<if test="offset != null and rows != null">
|
||||
limit #{offset},#{rows}
|
||||
</if>
|
||||
@@ -14,5 +17,8 @@
|
||||
COUNT(id)
|
||||
FROM jsh_systemconfig
|
||||
WHERE 1=1
|
||||
<if test="companyName != null">
|
||||
and company_name like '%${companyName}%'
|
||||
</if>
|
||||
</select>
|
||||
</mapper>
|
||||
@@ -5,7 +5,7 @@
|
||||
|
||||
<generatorConfiguration>
|
||||
<classPathEntry
|
||||
location="C:\Users\cjl\.m2\repository\mysql\mysql-connector-java\5.1.47\mysql-connector-java-5.1.47.jar"/>
|
||||
location="E:\maven-repository\mysql\mysql-connector-java\5.1.47\mysql-connector-java-5.1.47.jar"/>
|
||||
|
||||
<context id="DB2Tables" targetRuntime="MyBatis3" defaultModelType="flat">
|
||||
<commentGenerator>
|
||||
@@ -59,12 +59,12 @@
|
||||
<table tableName="jsh_materialproperty" domainObjectName="MaterialProperty"></table>
|
||||
<table tableName="jsh_person" domainObjectName="Person"></table>
|
||||
<table tableName="jsh_role" domainObjectName="Role"></table>
|
||||
<table tableName="jsh_supplier" domainObjectName="Supplier"></table>
|
||||
<table tableName="jsh_supplier" domainObjectName="Supplier"></table>-->
|
||||
<table tableName="jsh_systemconfig" domainObjectName="SystemConfig"></table>
|
||||
<table tableName="jsh_unit" domainObjectName="Unit"></table>
|
||||
<!--<table tableName="jsh_unit" domainObjectName="Unit"></table>
|
||||
<table tableName="jsh_user" domainObjectName="User"></table>
|
||||
<table tableName="jsh_userbusiness" domainObjectName="UserBusiness"></table>-->
|
||||
<!--<table tableName="jsh_serial_number" domainObjectName="SerialNumber"></table>-->
|
||||
<table tableName="jsh_userbusiness" domainObjectName="UserBusiness"></table>
|
||||
<table tableName="jsh_serial_number" domainObjectName="SerialNumber"></table>-->
|
||||
<table tableName="jsh_organization" domainObjectName="Organization"></table>
|
||||
<!--<table tableName="jsh_orga_user_rel" domainObjectName="OrgaUserRel"></table>-->
|
||||
</context>
|
||||
|
||||
Reference in New Issue
Block a user