Skip to content
GitLab
Commit a95ecbda authored by double's avatar double
Browse files

1、零售出库添加会员卡号快捷方式 

2、销售订单、销售出库添加客户快捷方式
3、仓库添加默认仓库
4、零售、销售、采购的商品明细仓库默认选中默认仓库
parent a92bf8d3
Hide whitespace changes
Inline Side-by-side
erp_web/js/pages/materials/in_out.js
View file @ a95ecbda
//初始化界面 //初始化界面
var defDepotId = null;
var kid = sessionStorage.getItem("userId"); var kid = sessionStorage.getItem("userId");
var pageType = getUrlParam('t'); //获取页面类型传值 var pageType = getUrlParam('t'); //获取页面类型传值
var depotList = null; var depotList = null;
...@@ -53,7 +54,7 @@ ...@@ -53,7 +54,7 @@
initMProperty(); //初始化商品属性 initMProperty(); //初始化商品属性
initTableData(); initTableData();
ininPager(); ininPager();
initForm(); initForm();
bindEvent();//绑定操作事件 bindEvent();//绑定操作事件
}); });
//根据单据名称获取类型 //根据单据名称获取类型
...@@ -74,8 +75,8 @@ ...@@ -74,8 +75,8 @@
amountNum = "CGDD"; amountNum = "CGDD";
} }
else if(listTitle === "采购入库列表"){ else if(listTitle === "采购入库列表"){
listType = "入库"; listType = "入库";
listSubType = "采购"; listSubType = "采购";
payTypeTitle = "付款"; payTypeTitle = "付款";
organUrl = supUrl; organUrl = supUrl;
amountNum = "CGRK"; amountNum = "CGRK";
...@@ -88,15 +89,15 @@ ...@@ -88,15 +89,15 @@
amountNum = "LSTH"; amountNum = "LSTH";
} }
else if(listTitle === "销售退货列表"){ else if(listTitle === "销售退货列表"){
listType = "入库"; listType = "入库";
listSubType = "销售退货"; listSubType = "销售退货";
payTypeTitle = "付款"; payTypeTitle = "付款";
organUrl = cusUrl; organUrl = cusUrl;
amountNum = "XSTH"; amountNum = "XSTH";
} }
else if(listTitle === "其它入库列表"){ else if(listTitle === "其它入库列表"){
listType = "入库"; listType = "入库";
listSubType = "其它"; listSubType = "其它";
payTypeTitle = "隐藏"; payTypeTitle = "隐藏";
organUrl = supUrl; organUrl = supUrl;
amountNum = "QTRK"; amountNum = "QTRK";
...@@ -116,29 +117,29 @@ ...@@ -116,29 +117,29 @@
amountNum = "XSDD"; amountNum = "XSDD";
} }
else if(listTitle === "销售出库列表"){ else if(listTitle === "销售出库列表"){
listType = "出库"; listType = "出库";
listSubType = "销售"; listSubType = "销售";
payTypeTitle = "收款"; payTypeTitle = "收款";
organUrl = cusUrl; organUrl = cusUrl;
amountNum = "XSCK"; amountNum = "XSCK";
} }
else if(listTitle === "采购退货列表"){ else if(listTitle === "采购退货列表"){
listType = "出库"; listType = "出库";
listSubType = "采购退货"; listSubType = "采购退货";
payTypeTitle = "收款"; payTypeTitle = "收款";
organUrl = supUrl; organUrl = supUrl;
amountNum = "CGTH"; amountNum = "CGTH";
} }
else if(listTitle === "其它出库列表"){ else if(listTitle === "其它出库列表"){
listType = "出库"; listType = "出库";
listSubType = "其它"; listSubType = "其它";
payTypeTitle = "隐藏"; payTypeTitle = "隐藏";
organUrl = cusUrl; organUrl = cusUrl;
amountNum = "QTCK"; amountNum = "QTCK";
} }
else if(listTitle === "调拨出库列表"){ else if(listTitle === "调拨出库列表"){
listType = "出库"; listType = "出库";
listSubType = "调拨"; listSubType = "调拨";
payTypeTitle = "隐藏"; payTypeTitle = "隐藏";
organUrl = supUrl; organUrl = supUrl;
amountNum = "DBCK"; amountNum = "DBCK";
...@@ -178,12 +179,12 @@ ...@@ -178,12 +179,12 @@
userBusinessList = null; userBusinessList = null;
} }
} }
}); });
} }
//初始化页面选项卡 //初始化页面选项卡
function initSelectInfo_UB(){ function initSelectInfo_UB(){
if(userBusinessList !=null) if(userBusinessList !=null)
{ {
if(userBusinessList.length>0) if(userBusinessList.length>0)
...@@ -193,8 +194,8 @@ ...@@ -193,8 +194,8 @@
} }
} }
} }
//初始化系统基础信息 //初始化系统基础信息
function initSystemData_depot(){ function initSystemData_depot(){
$.ajax({ $.ajax({
...@@ -211,24 +212,27 @@ ...@@ -211,24 +212,27 @@
return; return;
} }
} }
}); });
} }
//初始化页面选项卡 //初始化页面选项卡
function initSelectInfo_depot(){ function initSelectInfo_depot(){
var options = ""; var options = "";
if(depotList !=null) if(depotList !=null)
{ {
options = ""; options = "";
for(var i = 0 ;i < depotList.length;i++) for(var i = 0 ;i < depotList.length;i++)
{ {
var depot = depotList[i]; var depot = depotList[i];
if(userdepot!=null) if(userdepot!=null)
{ {
if(userdepot.indexOf("["+depot.id+"]")!=-1) if(userdepot.indexOf("["+depot.id+"]")!=-1)
{ {
options += '<option value="' + depot.id + '">' + depot.name + '</option>'; if(depot.isdefault){
defDepotId = depot.id;
}
options += '<option value="' + depot.id + '">' + depot.name + '</option>';
depotString = depotString + depot.id + ","; depotString = depotString + depot.id + ",";
} }
} }
...@@ -238,16 +242,16 @@ ...@@ -238,16 +242,16 @@
} }
depotString = depotString.substring(1, depotString.length-1); depotString = depotString.substring(1, depotString.length-1);
$("#ProjectId").empty().append(options); $("#ProjectId").empty().append(options);
$("#AllocationProjectId").empty().append(options); $("#AllocationProjectId").empty().append(options);
$("#searchProjectId").empty().append('<option value="">全部</option>').append(options); $("#searchProjectId").empty().append('<option value="">全部</option>').append(options);
} }
} }
//初始化供应商、客户、散户信息 //初始化供应商、客户、散户信息
function initSupplier(){ function initSupplier(){
$('#OrganId').combobox({ $('#OrganId').combobox({
url: organUrl, url: organUrl,
valueField:'id', valueField:'id',
textField:'supplier', textField:'supplier',
filter: function(q, row){ filter: function(q, row){
var opts = $(this).combobox('options'); var opts = $(this).combobox('options');
...@@ -297,7 +301,7 @@ ...@@ -297,7 +301,7 @@
}); });
} }
} }
}); });
} }
//初始化销售人员 //初始化销售人员
...@@ -364,7 +368,7 @@ ...@@ -364,7 +368,7 @@
} }
}); });
} }
//初始化系统基础信息 //初始化系统基础信息
function initSystemData_person(){ function initSystemData_person(){
$.ajax({ $.ajax({
...@@ -380,12 +384,12 @@ ...@@ -380,12 +384,12 @@
} }
} }
} }
}); });
} }
//初始化页面选项卡 //初始化页面选项卡
function initSelectInfo_person(){ function initSelectInfo_person(){
var options1 = ""; var options1 = "";
if(personList !=null) if(personList !=null)
{ {
for(var i = 0 ;i < personList.length;i++) for(var i = 0 ;i < personList.length;i++)
...@@ -398,7 +402,7 @@ ...@@ -398,7 +402,7 @@
if(person.type=="仓管员") if(person.type=="仓管员")
{ {
options1 += '<option value="' + person.id + '">' + person.name + '</option>'; options1 += '<option value="' + person.id + '">' + person.name + '</option>';
} }
} }
$("#HandsPersonId").empty().append(options1); $("#HandsPersonId").empty().append(options1);
} }
...@@ -418,11 +422,11 @@ ...@@ -418,11 +422,11 @@
} }
} }
} }
}); });
} }
//获取账户信息 //获取账户信息
function initSelectInfo_account(){ function initSelectInfo_account(){
var options = ""; var options = "";
if(accountList !=null){ if(accountList !=null){
options = "<option value=''>(空)</option>"; options = "<option value=''>(空)</option>";
options += "<option value='many' class='many' data-manyAmount=''>多账户</option>"; options += "<option value='many' class='many' data-manyAmount=''>多账户</option>";
...@@ -432,11 +436,11 @@ ...@@ -432,11 +436,11 @@
if(account.isdefault) { if(account.isdefault) {
defaultAccountId = account.id; //给账户赋值默认id defaultAccountId = account.id; //给账户赋值默认id
} }
} }
$("#AccountId").empty().append(options); $("#AccountId").empty().append(options);
} }
} }
//防止表单提交重复 //防止表单提交重复
function initForm(){ function initForm(){
$('#depotHeadFM').form({ $('#depotHeadFM').form({
...@@ -445,7 +449,7 @@ ...@@ -445,7 +449,7 @@
} }
}); });
} }
//初始化表格数据 //初始化表格数据
function initTableData(){ function initTableData(){
if(pageType === "skip") { if(pageType === "skip") {
...@@ -616,7 +620,7 @@ ...@@ -616,7 +620,7 @@
onLoadError:function() { onLoadError:function() {
$.messager.alert('页面加载提示','页面加载异常，请稍后再试！','error'); $.messager.alert('页面加载提示','页面加载异常，请稍后再试！','error');
return; return;
} }
}); });
} }
...@@ -1112,7 +1116,7 @@ ...@@ -1112,7 +1116,7 @@
iconCls:'icon-undo', iconCls:'icon-undo',
handler:function() handler:function()
{ {
reject(); //撤销 reject(); //撤销
} }
} }
], ],
...@@ -1120,7 +1124,7 @@ ...@@ -1120,7 +1124,7 @@
{ {
$.messager.alert('页面加载提示','页面加载异常，请稍后再试！','error'); $.messager.alert('页面加载提示','页面加载异常，请稍后再试！','error');
return; return;
} }
}); });
$.ajax({ $.ajax({
type:"get", type:"get",
...@@ -1164,8 +1168,8 @@ ...@@ -1164,8 +1168,8 @@
$.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error'); $.messager.alert('查询提示','查询数据后台异常，请稍后再试！','error');
} }
}); });
} }
//初始化表格数据-商品列表-查看状态 //初始化表格数据-商品列表-查看状态
function initTableData_material_show(TotalPrice){ function initTableData_material_show(TotalPrice){
var isShowAnotherDepot = true; //显示对方仓库,true为隐藏,false为显示 var isShowAnotherDepot = true; //显示对方仓库,true为隐藏,false为显示
...@@ -1221,7 +1225,7 @@ ...@@ -1221,7 +1225,7 @@
onLoadError:function() { onLoadError:function() {
$.messager.alert('页面加载提示','页面加载异常，请稍后再试！','error'); $.messager.alert('页面加载提示','页面加载异常，请稍后再试！','error');
return; return;
} }
}); });
$.ajax({ $.ajax({
type:"get", type:"get",
...@@ -1256,28 +1260,28 @@ ...@@ -1256,28 +1260,28 @@
function ininPager(){ function ininPager(){
try try
{ {
var opts = $("#tableData").datagrid('options'); var opts = $("#tableData").datagrid('options');
var pager = $("#tableData").datagrid('getPager'); var pager = $("#tableData").datagrid('getPager');
pager.pagination({ pager.pagination({
onSelectPage:function(pageNum, pageSize) onSelectPage:function(pageNum, pageSize)
{ {
opts.pageNumber = pageNum; opts.pageNumber = pageNum;
opts.pageSize = pageSize; opts.pageSize = pageSize;
pager.pagination('refresh', pager.pagination('refresh',
{ {
pageNumber:pageNum, pageNumber:pageNum,
pageSize:pageSize pageSize:pageSize
}); });
showDepotHeadDetails(pageNum,pageSize); showDepotHeadDetails(pageNum,pageSize);
} }
}); });
} }
catch (e) catch (e)
{ {
$.messager.alert('异常处理提示',"分页信息异常 : " + e.name + ": " + e.message,'error'); $.messager.alert('异常处理提示',"分页信息异常 : " + e.name + ": " + e.message,'error');
} }
} }
//删除单据信息 //删除单据信息
function deleteDepotHead(depotHeadID, thisOrganId, totalPrice, status){ function deleteDepotHead(depotHeadID, thisOrganId, totalPrice, status){
if(status == "1" || status == "2") { if(status == "1" || status == "2") {
...@@ -1349,11 +1353,11 @@ ...@@ -1349,11 +1353,11 @@
//批量删除单据信息 //批量删除单据信息
function batDeleteDepotHead(){ function batDeleteDepotHead(){
var row = $('#tableData').datagrid('getChecked'); var row = $('#tableData').datagrid('getChecked');
if(row.length == 0) if(row.length == 0)
{ {
$.messager.alert('删除提示','没有记录被选中！','info'); $.messager.alert('删除提示','没有记录被选中！','info');
return; return;
} }
if(row.length > 0) if(row.length > 0)
{ {
...@@ -1575,7 +1579,7 @@ ...@@ -1575,7 +1579,7 @@
var addTitle = listTitle.replace("列表","信息"); var addTitle = listTitle.replace("列表","信息");
$('#depotHeadDlg').dialog('open').dialog('setTitle','<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加' + addTitle); $('#depotHeadDlg').dialog('open').dialog('setTitle','<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加' + addTitle);
$(".window-mask").css({ width: webW ,height: webH}); $(".window-mask").css({ width: webW ,height: webH});
orgDepotHead = ""; orgDepotHead = "";
depotHeadID = 0; depotHeadID = 0;
initTableData_material("add"); //商品列表 initTableData_material("add"); //商品列表
...@@ -1583,6 +1587,13 @@ ...@@ -1583,6 +1587,13 @@
$("#addOrgan").off("click").on("click",function(){ $("#addOrgan").off("click").on("click",function(){
$('#supplierDlg').dialog('open').dialog('setTitle','<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加供应商信息'); $('#supplierDlg').dialog('open').dialog('setTitle','<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加供应商信息');
}); });
$("#addMember").off("click").on("click",function(){
$('#supplierDlg').dialog('open').dialog('setTitle','<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加会员信息');
});
$("#addCustomer").off("click").on("click",function(){
$('#supplierDlg').dialog('open').dialog('setTitle','<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加客户信息');
});
url = '/depotHead/addDepotHeadAndDetail'; url = '/depotHead/addDepotHeadAndDetail';
//零售单据修改收款时，自动计算找零 //零售单据修改收款时，自动计算找零
...@@ -1627,7 +1638,7 @@ ...@@ -1627,7 +1638,7 @@
} }
}); });
} }
} }
//编辑信息 //编辑信息
function editDepotHead(depotHeadTotalInfo, status){ function editDepotHead(depotHeadTotalInfo, status){
...@@ -1735,7 +1746,7 @@ ...@@ -1735,7 +1746,7 @@
var itemMoneyArr = depotHeadInfo[26].split(","); var itemMoneyArr = depotHeadInfo[26].split(",");
$("#OtherMoney").attr("data-itemArr",JSON.stringify(itemArr)).attr("data-itemMoneyArr",JSON.stringify(itemMoneyArr)); //json数据存储 $("#OtherMoney").attr("data-itemArr",JSON.stringify(itemArr)).attr("data-itemMoneyArr",JSON.stringify(itemMoneyArr)); //json数据存储
} }
initTableData_material("edit",TotalPrice); //商品列表 initTableData_material("edit",TotalPrice); //商品列表
reject(); //撤销下、刷新商品列表 reject(); //撤销下、刷新商品列表
if(pageType === "skip") { if(pageType === "skip") {
...@@ -1746,7 +1757,7 @@ ...@@ -1746,7 +1757,7 @@
url = '/depotHead/updateDepotHeadAndDetail?id=' + depotHeadInfo[0]; //更新接口 url = '/depotHead/updateDepotHeadAndDetail?id=' + depotHeadInfo[0]; //更新接口
} }
} }
//查看信息 //查看信息
function showDepotHead(depotHeadTotalInfo){ function showDepotHead(depotHeadTotalInfo){
var depotHeadInfo = depotHeadTotalInfo.split("AaBb"); var depotHeadInfo = depotHeadTotalInfo.split("AaBb");
...@@ -1812,7 +1823,7 @@ ...@@ -1812,7 +1823,7 @@
var showTitle = listTitle.replace("列表","信息"); var showTitle = listTitle.replace("列表","信息");
$('#depotHeadDlgShow').dialog('open').dialog('setTitle','<img src="/js/easyui-1.3.5/themes/icons/list.png"/>&nbsp;查看' + showTitle); $('#depotHeadDlgShow').dialog('open').dialog('setTitle','<img src="/js/easyui-1.3.5/themes/icons/list.png"/>&nbsp;查看' + showTitle);
$(".window-mask").css({ width: webW ,height: webH}); $(".window-mask").css({ width: webW ,height: webH});
depotHeadID = depotHeadInfo[0]; depotHeadID = depotHeadInfo[0];
initTableData_material_show(TotalPrice); //商品列表-查看状态 initTableData_material_show(TotalPrice); //商品列表-查看状态
...@@ -1862,7 +1873,7 @@ ...@@ -1862,7 +1873,7 @@
} }
} }
} }
//绑定操作事件 //绑定操作事件
function bindEvent(){ function bindEvent(){
showDepotHeadDetails(1,initPageSize); //初始化时自动查询 showDepotHeadDetails(1,initPageSize); //初始化时自动查询
...@@ -2569,7 +2580,13 @@ ...@@ -2569,7 +2580,13 @@
$("#otherMoneyTotalDlg").text($("#OtherMoney").val()); $("#otherMoneyTotalDlg").text($("#OtherMoney").val());
}); });
if(listTitle === "采购入库列表" || listTitle === "其它入库列表" || listTitle === "采购订单列表"){ if(listTitle === "采购入库列表" || listTitle === "其它入库列表" || listTitle === "采购订单列表"|| listTitle === "零售出库列表"|| listTitle === "销售出库列表"|| listTitle === "销售订单列表"){
var supplierType = "供应商";
if(listTitle === "零售出库列表"){
supplierType = "会员";
}else if(listTitle === "销售出库列表" || listTitle === "销售订单列表"){
supplierType = "客户";
}
//检查单位名称是否存在 ++ 重名无法提示问题需要跟进 //检查单位名称是否存在 ++ 重名无法提示问题需要跟进
function checkSupplierName() { function checkSupplierName() {
var supplierName = $.trim($("#supplier").val()); var supplierName = $.trim($("#supplier").val());
...@@ -2608,6 +2625,7 @@ ...@@ -2608,6 +2625,7 @@
} }
return flag; return flag;
} }
//保存供应商信息 //保存供应商信息
$("#saveSupplier").off("click").on("click",function() { $("#saveSupplier").off("click").on("click",function() {
if(checkSupplierName()){ if(checkSupplierName()){
...@@ -2629,7 +2647,7 @@ ...@@ -2629,7 +2647,7 @@
} }
var url = '/supplier/add'; var url = '/supplier/add';
var supObj = $("#supplierFM").serializeObject(); var supObj = $("#supplierFM").serializeObject();
supObj.type = "供应商"; supObj.type = supplierType;
supObj.enabled = 1; supObj.enabled = 1;
$.ajax({ $.ajax({
url: url, url: url,
...@@ -2706,7 +2724,7 @@ ...@@ -2706,7 +2724,7 @@
} }
}); });
} }
//自动计算事件 //自动计算事件
function autoReckon() { function autoReckon() {
//延时绑定事件 //延时绑定事件
...@@ -2892,8 +2910,8 @@ ...@@ -2892,8 +2910,8 @@
} }
},500); },500);
} }
//结束编辑 //结束编辑
function endEditing() { function endEditing() {
if (editIndex == undefined) { return true } if (editIndex == undefined) { return true }
if ($('#materialData').datagrid('validateRow', editIndex)) { if ($('#materialData').datagrid('validateRow', editIndex)) {
...@@ -2927,7 +2945,7 @@ ...@@ -2927,7 +2945,7 @@
//新增 //新增
function append(){ function append(){
if (endEditing()) { if (endEditing()) {
$('#materialData').datagrid('appendRow', {}); $('#materialData').datagrid('appendRow', {DepotId:defDepotId});
editIndex = $('#materialData').datagrid('getRows').length - 1; editIndex = $('#materialData').datagrid('getRows').length - 1;
$('#materialData').datagrid('selectRow', editIndex).datagrid('beginEdit', editIndex); $('#materialData').datagrid('selectRow', editIndex).datagrid('beginEdit', editIndex);
autoReckon(); autoReckon();
...@@ -3000,7 +3018,7 @@ ...@@ -3000,7 +3018,7 @@
} }
if (totalRowNum != "") { if (totalRowNum != "") {
var totalRowNum = totalRowNum.substring(0, totalRowNum.length - 1); var totalRowNum = totalRowNum.substring(0, totalRowNum.length - 1);
$.messager.alert('提示',"第" + totalRowNum + "行数据填写不完整！",'info'); $.messager.alert('提示',"第" + totalRowNum + "行数据填写不完整！",'info');
return false; return false;
} }
return true; return true;
...@@ -3056,7 +3074,7 @@ ...@@ -3056,7 +3074,7 @@
} }
} }
}); });
if(depotHeadMax !=null) { if(depotHeadMax !=null) {
depotHeadMaxId=depotHeadMax; depotHeadMaxId=depotHeadMax;
} }
......
erp_web/pages/manage/depot.html
View file @ a95ecbda
...@@ -182,7 +182,19 @@ ...@@ -182,7 +182,19 @@
{title: '搬运费', field: 'truckage', width: 60}, {title: '搬运费', field: 'truckage', width: 60},
{title: '负责人', field: 'principalName', width: 60}, {title: '负责人', field: 'principalName', width: 60},
{title: '排序', field: 'sort', width: 60}, {title: '排序', field: 'sort', width: 60},
{
title: '是否默认', field: 'isdefault', width: 100, align: "center",
formatter: function (value, rec) {
if (rec.isdefault) {
return "<b style='color:green'>是</b>";
}
else {
return "否";
}
}
},
{title: '描述', field: 'remark', width: 120} {title: '描述', field: 'remark', width: 120}
]], ]],
toolbar: [ toolbar: [
{ {
...@@ -200,6 +212,14 @@ ...@@ -200,6 +212,14 @@
handler: function () { handler: function () {
batDeleteDepot(); batDeleteDepot();
} }
},
{
id: 'setDepotIsDefault',
text: '设为默认',
iconCls: 'icon-ok',
handler: function () {
setDepotIsDefault();
}
} }
], ],
onLoadError: function () { onLoadError: function () {
...@@ -286,7 +306,53 @@ ...@@ -286,7 +306,53 @@
} }
}); });
} }
//设为默认操作事件
function setDepotIsDefault() {
var allRow = $('#tableData').datagrid('getRows');
var row = $('#tableData').datagrid('getChecked');
if (row.length == 0) {
$.messager.alert('设置提示', '没有记录被选中！', 'info');
return;
}
if (row.length > 0) {
function setDefault(depotID, isDefault) {
$.ajax({
type: "post",
url: "/depot/updateDepotIsDefault",
dataType: "json",
async: false,
data: ({
depotID: depotID,
isDefault: isDefault
}),
success: function (res) {
if (res == "true" && isDefault) {
}
},
//此处添加错误处理
error: function () {
$.messager.alert('提示', '设为默认账户异常，请稍后再试！', 'error');
return;
}
});
}
if (row.length == 1) {
setDefault(row[0].id, true); //设置默认
for (var i = 0; i < allRow.length; i++) {
if (allRow[i].id != row[0].id) {
setDefault(allRow[i].id, false);
}
}
setTimeout(function () {
$("#searchBtn").click();
}, 1000);
}
return;
}
}
//批量删除仓库 //批量删除仓库
function batDeleteDepot() { function batDeleteDepot() {
var row = $('#tableData').datagrid('getChecked'); var row = $('#tableData').datagrid('getChecked');
...@@ -565,4 +631,4 @@ ...@@ -565,4 +631,4 @@
}); });
</script> </script>
</body> </body>
</html> </html>
\ No newline at end of file
erp_web/pages/materials/retail_out_list.html
View file @ a95ecbda
...@@ -63,7 +63,13 @@ ...@@ -63,7 +63,13 @@
<tr> <tr>
<td style="width:60px;height:50px;">会员卡号：</td> <td style="width:60px;height:50px;">会员卡号：</td>
<td style="padding:5px;width:200px;"> <td style="padding:5px;width:200px;">
<div class="org-list">
<input id="OrganId" name="OrganId" style="width:130px;"/> <input id="OrganId" name="OrganId" style="width:130px;"/>
</div>
<div class="add-org-btn">
<img id="addMember" src="/js/easyui-1.3.5/themes/icons/edit_add.png"
style="cursor: pointer;" alt="增加会员" title="增加会员"/>
</div>
</td> </td>
<td style="width:70px;">单据日期：</td> <td style="width:70px;">单据日期：</td>
<td style="padding:5px"> <td style="padding:5px">
...@@ -243,5 +249,107 @@ ...@@ -243,5 +249,107 @@
<a href="javascript:void(0)" id="saveDepotHeadAccountDlg" class="easyui-linkbutton" iconCls="icon-ok">保存</a> <a href="javascript:void(0)" id="saveDepotHeadAccountDlg" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
<a href="javascript:void(0)" id="cancelDepotHeadAccountDlg" class="easyui-linkbutton" iconCls="icon-cancel">取消</a> <a href="javascript:void(0)" id="cancelDepotHeadAccountDlg" class="easyui-linkbutton" iconCls="icon-cancel">取消</a>
</div> </div>
<div id="supplierDlg" class="easyui-dialog" style="width:580px;padding:10px 20px"
closed="true" buttons="#supplierDlgBtn" modal="true" collapsible="false" closable="true">
<form id="supplierFM">
<table>
<tr>
<td style="width: 80px;height: 20px">名称</td>
<td style="width: 180px;padding:1px">
<input name="supplier" id="supplier" class="easyui-validatebox"
data-options="required:true,validType:'length[2,30]'" style="width: 160px;height: 20px"/>
</td>
<td style="width: 60px;height: 20px">联系人</td>
<td style="width:180px;padding:1px;">
<input name="contacts" id="contacts" class="easyui-validatebox" style="width: 160px;height: 20px"/>
</td>
</tr>
<tr>
<td>联系电话</td>
<td style="padding:1px;">
<input name="phonenum" id="phonenum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
</td>
<td>手机</td>
<td style="padding:1px;">
<input name="telephone" id="telephone" class="easyui-validatebox"
style="width: 160px;height: 20px"/>
</td>
</tr>
<tr>
<td>电子邮箱</td>
<td style="padding:1px">
<input name="email" id="email" class="easyui-validatebox" validType="email"
style="width: 160px;height: 20px"/>
</td>
<td>传真</td>
<td style="padding:1px">
<input name="fax" id="fax" class="easyui-validatebox" style="width: 160px;height: 20px"/>
</td>
</tr>
<tr>
<td>期初应收</td>
<td style="padding:1px">
<input name="BeginNeedGet" id="BeginNeedGet" type="text" class="easyui-numberbox"
data-options="min:0,precision:2" style="width: 160px;height: 20px"></input>
</td>
<td>期初应付</td>
<td style="padding:1px">
<input name="BeginNeedPay" id="BeginNeedPay" type="text" class="easyui-numberbox"
data-options="min:0,precision:2" style="width: 160px;height: 20px"></input>
</td>
</tr>
<tr>
<td>累计应收</td>
<td style="padding:1px">
<input name="AllNeedGet" id="AllNeedGet" type="text" class="easyui-numberbox"
data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input>
</td>
<td>累计应付</td>
<td style="padding:1px">
<input name="AllNeedPay" id="AllNeedPay" type="text" class="easyui-numberbox"
data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input>
</td>
</tr>
<tr>
<td>纳税人识别号</td>
<td style="padding:1px">
<input name="taxNum" id="taxNum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
</td>
<td>税率</td>
<td style="padding:1px">
<input name="taxRate" id="taxRate" class="easyui-validatebox" style="width: 160px;height: 20px"/>
</td>
</tr>
<tr>
<td>开户行</td>
<td style="padding:1px">
<input name="bankName" id="bankName" class="easyui-validatebox" style="width: 160px;height: 20px"/>
</td>
<td>账号</td>
<td style="padding:1px">
<input name="accountNumber" id="accountNumber" class="easyui-validatebox"
style="width: 160px;height: 20px"/>
</td>
</tr>
<tr>
<td>地址</td>
<td style="padding:1px" colspan="3">
<input name="address" id="address" class="easyui-validatebox" style="width: 408px;height: 20px"/>
</td>
</tr>
<tr>
<td>备注</td>
<td style="padding:1px" colspan="3">
<textarea name="description" id="description" rows="2" cols="2" style="width: 408px;"></textarea>
</td>
</tr>
</table>
</form>
</div>
<div id="supplierDlgBtn">
<a href="javascript:void(0)" id="saveSupplier" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
<a href="javascript:void(0)" id="cancelSupplier" class="easyui-linkbutton" iconCls="icon-cancel"
onclick="javascript:$('#supplierDlg').dialog('close')">取消</a>
</div>
</body> </body>
</html> </html>
\ No newline at end of file
erp_web/pages/materials/sale_orders_list.html
View file @ a95ecbda
...@@ -63,7 +63,13 @@ ...@@ -63,7 +63,13 @@
<tr> <tr>
<td style="width:60px;">客户：</td> <td style="width:60px;">客户：</td>
<td style="padding:5px"> <td style="padding:5px">
<input id="OrganId" name="OrganId" style="width:130px;"/> <div class="org-list">
<input id="OrganId" name="OrganId" style="width:130px;"/>
</div>
<div class="add-org-btn">
<img id="addCustomer" src="/js/easyui-1.3.5/themes/icons/edit_add.png"
style="cursor: pointer;" alt="增加客戶" title="增加客戶"/>
</div>
</td> </td>
<td style="width:70px;">单据日期：</td> <td style="width:70px;">单据日期：</td>
<td style="padding:5px"> <td style="padding:5px">
...@@ -195,6 +201,107 @@ ...@@ -195,6 +201,107 @@
<a href="javascript:void(0)" id="saveOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-ok">保存</a> <a href="javascript:void(0)" id="saveOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
<a href="javascript:void(0)" id="cancelOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-cancel">取消</a> <a href="javascript:void(0)" id="cancelOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-cancel">取消</a>
</div> </div>
<div id="supplierDlg" class="easyui-dialog" style="width:580px;padding:10px 20px"
closed="true" buttons="#supplierDlgBtn" modal="true" collapsible="false" closable="true">
<form id="supplierFM">
<table>
<tr>
<td style="width: 80px;height: 20px">名称</td>
<td style="width: 180px;padding:1px">
<input name="supplier" id="supplier" class="easyui-validatebox"
data-options="required:true,validType:'length[2,30]'" style="width: 160px;height: 20px"/>
</td>
<td style="width: 60px;height: 20px">联系人</td>
<td style="width:180px;padding:1px;">
<input name="contacts" id="contacts" class="easyui-validatebox" style="width: 160px;height: 20px"/>
</td>
</tr>
<tr>
<td>联系电话</td>
<td style="padding:1px;">
<input name="phonenum" id="phonenum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
</td>
<td>手机</td>
<td style="padding:1px;">
<input name="telephone" id="telephone" class="easyui-validatebox"
style="width: 160px;height: 20px"/>
</td>
</tr>
<tr>
<td>电子邮箱</td>
<td style="padding:1px">
<input name="email" id="email" class="easyui-validatebox" validType="email"
style="width: 160px;height: 20px"/>
</td>
<td>传真</td>
<td style="padding:1px">
<input name="fax" id="fax" class="easyui-validatebox" style="width: 160px;height: 20px"/>
</td>
</tr>
<tr>
<td>期初应收</td>
<td style="padding:1px">
<input name="BeginNeedGet" id="BeginNeedGet" type="text" class="easyui-numberbox"
data-options="min:0,precision:2" style="width: 160px;height: 20px"></input>
</td>
<td>期初应付</td>
<td style="padding:1px">
<input name="BeginNeedPay" id="BeginNeedPay" type="text" class="easyui-numberbox"
data-options="min:0,precision:2" style="width: 160px;height: 20px"></input>
</td>
</tr>
<tr>
<td>累计应收</td>
<td style="padding:1px">
<input name="AllNeedGet" id="AllNeedGet" type="text" class="easyui-numberbox"
data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input>
</td>
<td>累计应付</td>
<td style="padding:1px">
<input name="AllNeedPay" id="AllNeedPay" type="text" class="easyui-numberbox"
data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input>
</td>
</tr>
<tr>
<td>纳税人识别号</td>
<td style="padding:1px">
<input name="taxNum" id="taxNum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
</td>
<td>税率</td>
<td style="padding:1px">
<input name="taxRate" id="taxRate" class="easyui-validatebox" style="width: 160px;height: 20px"/>
</td>
</tr>
<tr>
<td>开户行</td>
<td style="padding:1px">
<input name="bankName" id="bankName" class="easyui-validatebox" style="width: 160px;height: 20px"/>
</td>
<td>账号</td>
<td style="padding:1px">
<input name="accountNumber" id="accountNumber" class="easyui-validatebox"
style="width: 160px;height: 20px"/>
</td>
</tr>
<tr>
<td>地址</td>
<td style="padding:1px" colspan="3">
<input name="address" id="address" class="easyui-validatebox" style="width: 408px;height: 20px"/>
</td>
</tr>
<tr>
<td>备注</td>
<td style="padding:1px" colspan="3">
<textarea name="description" id="description" rows="2" cols="2" style="width: 408px;"></textarea>
</td>
</tr>
</table>
</form>
</div>
<div id="supplierDlgBtn">
<a href="javascript:void(0)" id="saveSupplier" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
<a href="javascript:void(0)" id="cancelSupplier" class="easyui-linkbutton" iconCls="icon-cancel"
onclick="javascript:$('#supplierDlg').dialog('close')">取消</a>
</div>
</body> </body>
</html> </html>
\ No newline at end of file
erp_web/pages/materials/sale_out_list.html
View file @ a95ecbda
...@@ -63,7 +63,13 @@ ...@@ -63,7 +63,13 @@
<tr> <tr>
<td style="width:60px;">客户：</td> <td style="width:60px;">客户：</td>
<td style="padding:5px"> <td style="padding:5px">
<input id="OrganId" name="OrganId" style="width:130px;"/> <div class="org-list">
<input id="OrganId" name="OrganId" style="width:130px;"/>
</div>
<div class="add-org-btn">
<img id="addCustomer" src="/js/easyui-1.3.5/themes/icons/edit_add.png"
style="cursor: pointer;" alt="增加客戶" title="增加客戶"/>
</div>
</td> </td>
<td style="width:70px;">单据日期：</td> <td style="width:70px;">单据日期：</td>
<td style="padding:5px"> <td style="padding:5px">
...@@ -276,6 +282,107 @@ ...@@ -276,6 +282,107 @@
<a href="javascript:void(0)" id="saveOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-ok">保存</a> <a href="javascript:void(0)" id="saveOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
<a href="javascript:void(0)" id="cancelOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-cancel">取消</a> <a href="javascript:void(0)" id="cancelOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-cancel">取消</a>
</div> </div>
<div id="supplierDlg" class="easyui-dialog" style="width:580px;padding:10px 20px"
closed="true" buttons="#supplierDlgBtn" modal="true" collapsible="false" closable="true">
<form id="supplierFM">
<table>
<tr>
<td style="width: 80px;height: 20px">名称</td>
<td style="width: 180px;padding:1px">
<input name="supplier" id="supplier" class="easyui-validatebox"
data-options="required:true,validType:'length[2,30]'" style="width: 160px;height: 20px"/>
</td>
<td style="width: 60px;height: 20px">联系人</td>
<td style="width:180px;padding:1px;">
<input name="contacts" id="contacts" class="easyui-validatebox" style="width: 160px;height: 20px"/>
</td>
</tr>
<tr>
<td>联系电话</td>
<td style="padding:1px;">
<input name="phonenum" id="phonenum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
</td>
<td>手机</td>
<td style="padding:1px;">
<input name="telephone" id="telephone" class="easyui-validatebox"
style="width: 160px;height: 20px"/>
</td>
</tr>
<tr>
<td>电子邮箱</td>
<td style="padding:1px">
<input name="email" id="email" class="easyui-validatebox" validType="email"
style="width: 160px;height: 20px"/>
</td>
<td>传真</td>
<td style="padding:1px">
<input name="fax" id="fax" class="easyui-validatebox" style="width: 160px;height: 20px"/>
</td>
</tr>
<tr>
<td>期初应收</td>
<td style="padding:1px">
<input name="BeginNeedGet" id="BeginNeedGet" type="text" class="easyui-numberbox"
data-options="min:0,precision:2" style="width: 160px;height: 20px"></input>
</td>
<td>期初应付</td>
<td style="padding:1px">
<input name="BeginNeedPay" id="BeginNeedPay" type="text" class="easyui-numberbox"
data-options="min:0,precision:2" style="width: 160px;height: 20px"></input>
</td>
</tr>
<tr>
<td>累计应收</td>
<td style="padding:1px">
<input name="AllNeedGet" id="AllNeedGet" type="text" class="easyui-numberbox"
data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input>
</td>
<td>累计应付</td>
<td style="padding:1px">
<input name="AllNeedPay" id="AllNeedPay" type="text" class="easyui-numberbox"
data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input>
</td>
</tr>
<tr>
<td>纳税人识别号</td>
<td style="padding:1px">
<input name="taxNum" id="taxNum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
</td>
<td>税率</td>
<td style="padding:1px">
<input name="taxRate" id="taxRate" class="easyui-validatebox" style="width: 160px;height: 20px"/>
</td>
</tr>
<tr>
<td>开户行</td>
<td style="padding:1px">
<input name="bankName" id="bankName" class="easyui-validatebox" style="width: 160px;height: 20px"/>
</td>
<td>账号</td>
<td style="padding:1px">
<input name="accountNumber" id="accountNumber" class="easyui-validatebox"
style="width: 160px;height: 20px"/>
</td>
</tr>
<tr>
<td>地址</td>
<td style="padding:1px" colspan="3">
<input name="address" id="address" class="easyui-validatebox" style="width: 408px;height: 20px"/>
</td>
</tr>
<tr>
<td>备注</td>
<td style="padding:1px" colspan="3">
<textarea name="description" id="description" rows="2" cols="2" style="width: 408px;"></textarea>
</td>
</tr>
</table>
</form>
</div>
<div id="supplierDlgBtn">
<a href="javascript:void(0)" id="saveSupplier" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
<a href="javascript:void(0)" id="cancelSupplier" class="easyui-linkbutton" iconCls="icon-cancel"
onclick="javascript:$('#supplierDlg').dialog('close')">取消</a>
</div>
</body> </body>
</html> </html>
\ No newline at end of file
src/main/java/com/jsh/erp/constants/BusinessConstants.java
View file @ a95ecbda
...@@ -86,7 +86,7 @@ public class BusinessConstants { ...@@ -86,7 +86,7 @@ public class BusinessConstants {
/** /**
* create by: qiankunpingtai * create by: qiankunpingtai
* create time: 2019/3/14 11:41 * create time: 2019/3/14 11:41
* description: * description:
* 为了使用户可以自己建初始目录，设定根目录的父级目录id为-1 * 为了使用户可以自己建初始目录，设定根目录的父级目录id为-1
* *
*/ */
......
src/main/java/com/jsh/erp/controller/DepotController.java
View file @ a95ecbda
...@@ -207,5 +207,16 @@ public class DepotController { ...@@ -207,5 +207,16 @@ public class DepotController {
} }
return result; return result;
} }
@PostMapping(value = "/updateDepotIsDefault")
public String updateDepotIsDefault(@RequestParam("isDefault") Boolean isDefault,
@RequestParam("depotID") Long depotID,
HttpServletRequest request) throws Exception{
Map<String, Object> objectMap = new HashMap<String, Object>();
int res = depotService.updateDepotIsDefault(isDefault, depotID);
if(res > 0) {
return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code);
} else {
return returnJson(objectMap, ErpInfo.ERROR.name, ErpInfo.ERROR.code);
}
}
} }
src/main/java/com/jsh/erp/controller/DepotItemController.java
View file @ a95ecbda
...@@ -448,7 +448,7 @@ public class DepotItemController { ...@@ -448,7 +448,7 @@ public class DepotItemController {
BigDecimal InPrice = sumPrice("入库", pid, diEx.getMId(), monthTime, false); BigDecimal InPrice = sumPrice("入库", pid, diEx.getMId(), monthTime, false);
BigDecimal OutPrice = sumPrice("出库", pid, diEx.getMId(), monthTime, false); BigDecimal OutPrice = sumPrice("出库", pid, diEx.getMId(), monthTime, false);
item.put("MaterialName", diEx.getMName()); item.put("MaterialName", diEx.getMName());
item.put("MaterialModel", diEx.getMColor()); item.put("MaterialModel", diEx.getMModel());
//扩展信息 //扩展信息
String materialOther = getOtherInfo(mpArr, diEx); String materialOther = getOtherInfo(mpArr, diEx);
item.put("MaterialOther", materialOther); item.put("MaterialOther", materialOther);
......
src/main/java/com/jsh/erp/datasource/entities/Depot.java
View file @ a95ecbda
...@@ -90,6 +90,15 @@ public class Depot { ...@@ -90,6 +90,15 @@ public class Depot {
* @mbggenerated * @mbggenerated
*/ */
private String deleteFlag; private String deleteFlag;
private Boolean isdefault;
public Boolean getIsdefault() {
return isdefault;
}
public void setIsdefault(Boolean isdefault) {
this.isdefault = isdefault;
}
/** /**
* This method was generated by MyBatis Generator. * This method was generated by MyBatis Generator.
...@@ -354,4 +363,4 @@ public class Depot { ...@@ -354,4 +363,4 @@ public class Depot {
public void setDeleteFlag(String deleteFlag) { public void setDeleteFlag(String deleteFlag) {
this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim(); this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
} }
} }
\ No newline at end of file
src/main/java/com/jsh/erp/datasource/entities/DepotExample.java
View file @ a95ecbda
...@@ -235,6 +235,7 @@ public class DepotExample { ...@@ -235,6 +235,7 @@ public class DepotExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIdIn(List<Long> values) { public Criteria andIdIn(List<Long> values) {
addCriterion("id in", values, "id"); addCriterion("id in", values, "id");
return (Criteria) this; return (Criteria) this;
...@@ -664,7 +665,65 @@ public class DepotExample { ...@@ -664,7 +665,65 @@ public class DepotExample {
addCriterion("remark <>", value, "remark"); addCriterion("remark <>", value, "remark");
return (Criteria) this; return (Criteria) this;
} }
public Criteria andIsdefaultIsNull() {
addCriterion("IsDefault is null");
return (Criteria) this;
}
public Criteria andIsdefaultIsNotNull() {
addCriterion("IsDefault is not null");
return (Criteria) this;
}
public Criteria andIsdefaultEqualTo(Boolean value) {
addCriterion("IsDefault =", value, "isdefault");
return (Criteria) this;
}
public Criteria andIsdefaultNotEqualTo(Boolean value) {
addCriterion("IsDefault <>", value, "isdefault");
return (Criteria) this;
}
public Criteria andIsdefaultGreaterThan(Boolean value) {
addCriterion("IsDefault >", value, "isdefault");
return (Criteria) this;
}
public Criteria andIsdefaultGreaterThanOrEqualTo(Boolean value) {
addCriterion("IsDefault >=", value, "isdefault");
return (Criteria) this;
}
public Criteria andIsdefaultLessThan(Boolean value) {
addCriterion("IsDefault <", value, "isdefault");
return (Criteria) this;
}
public Criteria andIsdefaultLessThanOrEqualTo(Boolean value) {
addCriterion("IsDefault <=", value, "isdefault");
return (Criteria) this;
}
public Criteria andIsdefaultIn(List<Boolean> values) {
addCriterion("IsDefault in", values, "isdefault");
return (Criteria) this;
}
public Criteria andIsdefaultNotIn(List<Boolean> values) {
addCriterion("IsDefault not in", values, "isdefault");
return (Criteria) this;
}
public Criteria andIsdefaultBetween(Boolean value1, Boolean value2) {
addCriterion("IsDefault between", value1, value2, "isdefault");
return (Criteria) this;
}
public Criteria andIsdefaultNotBetween(Boolean value1, Boolean value2) {
addCriterion("IsDefault not between", value1, value2, "isdefault");
return (Criteria) this;
}
public Criteria andRemarkGreaterThan(String value) { public Criteria andRemarkGreaterThan(String value) {
addCriterion("remark >", value, "remark"); addCriterion("remark >", value, "remark");
return (Criteria) this; return (Criteria) this;
...@@ -1010,4 +1069,4 @@ public class DepotExample { ...@@ -1010,4 +1069,4 @@ public class DepotExample {
this(condition, value, secondValue, null); this(condition, value, secondValue, null);
} }
} }
} }
\ No newline at end of file
src/main/java/com/jsh/erp/service/depot/DepotService.java
View file @ a95ecbda
...@@ -316,4 +316,24 @@ public class DepotService { ...@@ -316,4 +316,24 @@ public class DepotService {
return deleteTotal; return deleteTotal;
} }
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
public int updateDepotIsDefault(Boolean isDefault, Long depotID) throws Exception{
logService.insertLog(BusinessConstants.LOG_INTERFACE_NAME_DEPOT,BusinessConstants.LOG_OPERATION_TYPE_EDIT+depotID,
((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
Depot depot = new Depot();
depot.setIsdefault(isDefault);
DepotExample example = new DepotExample();
example.createCriteria().andIdEqualTo(depotID);
int result=0;
try{
result = depotMapper.updateByExampleSelective(depot, example);
}catch(Exception e){
logger.error("异常码[{}],异常提示[{}],异常[{}]",
ExceptionConstants.DATA_WRITE_FAIL_CODE,ExceptionConstants.DATA_WRITE_FAIL_MSG,e);
throw new BusinessRunTimeException(ExceptionConstants.DATA_WRITE_FAIL_CODE,
ExceptionConstants.DATA_WRITE_FAIL_MSG);
}
return result;
}
} }
src/main/resources/mapper_xml/DepotMapper.xml
View file @ a95ecbda
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!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.DepotMapper"> <mapper namespace="com.jsh.erp.datasource.mappers.DepotMapper">
<resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Depot"> <resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Depot">
<!-- <!--
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<result column="principal" jdbcType="BIGINT" property="principal" /> <result column="principal" jdbcType="BIGINT" property="principal" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" /> <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
<result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" /> <result column="delete_Flag" jdbcType="VARCHAR" property="deleteFlag" />
<result column="IsDefault" jdbcType="BIT" property="isdefault" />
</resultMap> </resultMap>
<sql id="Example_Where_Clause"> <sql id="Example_Where_Clause">
<!-- <!--
...@@ -89,8 +90,8 @@ ...@@ -89,8 +90,8 @@
WARNING - @mbggenerated WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
id, name, address, warehousing, truckage, type, sort, remark, principal, tenant_id, id, name, address, warehousing, truckage, type, sort, remark, principal, tenant_id,
delete_Flag delete_Flag,IsDefault
</sql> </sql>
<select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.DepotExample" resultMap="BaseResultMap"> <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.DepotExample" resultMap="BaseResultMap">
<!-- <!--
...@@ -115,7 +116,7 @@ ...@@ -115,7 +116,7 @@
WARNING - @mbggenerated WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
select select
<include refid="Base_Column_List" /> <include refid="Base_Column_List" />
from jsh_depot from jsh_depot
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
...@@ -143,13 +144,13 @@ ...@@ -143,13 +144,13 @@
WARNING - @mbggenerated WARNING - @mbggenerated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
--> -->
insert into jsh_depot (id, name, address, insert into jsh_depot (id, name, address,
warehousing, truckage, type, warehousing, truckage, type,
sort, remark, principal, sort, remark, principal,
tenant_id, delete_Flag) tenant_id, delete_Flag)
values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR},
#{warehousing,jdbcType=DECIMAL}, #{truckage,jdbcType=DECIMAL}, #{type,jdbcType=INTEGER}, #{warehousing,jdbcType=DECIMAL}, #{truckage,jdbcType=DECIMAL}, #{type,jdbcType=INTEGER},
#{sort,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{principal,jdbcType=BIGINT}, #{sort,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{principal,jdbcType=BIGINT},
#{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR}) #{tenantId,jdbcType=BIGINT}, #{deleteFlag,jdbcType=VARCHAR})
</insert> </insert>
<insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Depot"> <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Depot">
...@@ -279,6 +280,9 @@ ...@@ -279,6 +280,9 @@
<if test="record.deleteFlag != null"> <if test="record.deleteFlag != null">
delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR}, delete_Flag = #{record.deleteFlag,jdbcType=VARCHAR},
</if> </if>
<if test="record.isdefault != null">
IsDefault = #{record.isdefault,jdbcType=BIT},
</if>
</set> </set>
<if test="_parameter != null"> <if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" /> <include refid="Update_By_Example_Where_Clause" />
...@@ -363,4 +367,4 @@ ...@@ -363,4 +367,4 @@
delete_Flag = #{deleteFlag,jdbcType=VARCHAR} delete_Flag = #{deleteFlag,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT} where id = #{id,jdbcType=BIGINT}
</update> </update>
</mapper> </mapper>
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment