mirror of
https://github.com/weizhiqiang1995/erp-pro.git
synced 2024-09-20 23:16:01 +08:00
添加获取账户接口,添加单据主表enum
This commit is contained in:
parent
2eeb302c95
commit
f1c63a8f7a
|
@ -114,4 +114,17 @@ public class AccountController {
|
|||
public void queryAccountStreamById(InputObject inputObject, OutputObject outputObject) throws Exception{
|
||||
accountService.queryAccountStreamById(inputObject, outputObject);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取账户信息展示为下拉框
|
||||
* @param inputObject
|
||||
* @param outputObject
|
||||
* @throws Exception
|
||||
*/
|
||||
@RequestMapping("/post/AccountController/queryAccountListToSelect")
|
||||
@ResponseBody
|
||||
public void queryAccountListToSelect(InputObject inputObject, OutputObject outputObject) throws Exception{
|
||||
accountService.queryAccountListToSelect(inputObject, outputObject);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -15,23 +15,25 @@ public interface AccountDao {
|
|||
|
||||
public Map<String, Object> queryAccountByName(Map<String, Object> params) throws Exception;
|
||||
|
||||
public void insertAccount(Map<String, Object> params) throws Exception;
|
||||
public int insertAccount(Map<String, Object> params) throws Exception;
|
||||
|
||||
public Map<String, Object> queryAccountById(Map<String, Object> params) throws Exception;
|
||||
|
||||
public void editAccountByDeleteFlag(Map<String, Object> params) throws Exception;
|
||||
public int editAccountByDeleteFlag(Map<String, Object> params) throws Exception;
|
||||
|
||||
public Map<String, Object> queryAccountByIdAndName(Map<String, Object> params) throws Exception;
|
||||
|
||||
public void editAccountById(Map<String, Object> params) throws Exception;
|
||||
public int editAccountById(Map<String, Object> params) throws Exception;
|
||||
|
||||
public Map<String, Object> queryAccountByIdAndIsDeafault(Map<String, Object> params) throws Exception;
|
||||
|
||||
public void editAccountByIsDefault(Map<String, Object> params) throws Exception;
|
||||
public int editAccountByIsDefault(Map<String, Object> params) throws Exception;
|
||||
|
||||
public void editAccountByIdAndIsDefault(Map<String, Object> params) throws Exception;
|
||||
public int editAccountByIdAndIsDefault(Map<String, Object> params) throws Exception;
|
||||
|
||||
public Map<String, Object> queryAccountByIdAndInfo(Map<String, Object> params) throws Exception;
|
||||
|
||||
public List<Map<String, Object>> queryAccountStreamById(Map<String, Object> params, PageBounds pageBounds) throws Exception;
|
||||
|
||||
public List<Map<String, Object>> queryAccountListToSelect(Map<String, Object> params) throws Exception;
|
||||
}
|
||||
|
|
|
@ -14,4 +14,63 @@ public class ErpConstants {
|
|||
return STORE_HOUSE_REDIS_KEY + userId;
|
||||
}
|
||||
|
||||
//单据主表类型
|
||||
public static enum DepoTheadSubType {
|
||||
//入库
|
||||
PUT_IS_PURCHASE("采购入库", "CGRK", "1"),
|
||||
PUT_IS_SALES_RETURNS("销售退货", "XSTH", "2"),
|
||||
PUT_IS_RETAIL_RETURNS("零售退货", "LSTH", "3"),
|
||||
PUT_IS_OTHERS("其他入库", "QTRK", "4"),
|
||||
//出库
|
||||
OUT_IS_SALES_OUTLET("销售出库", "XSCK", "5"),
|
||||
OUT_IS_PURCHASE_RETURNS("采购退货", "CGTH", "6"),
|
||||
OUT_IS_ALLOCATION("调拨", "DBCK", "7"),
|
||||
OUT_IS_RETAIL("零售", "LSCK", "8"),
|
||||
OUT_IS_OTHERS("其他出库", "QTCK", "9");
|
||||
|
||||
private String nameCode;
|
||||
private String code;
|
||||
private String num;
|
||||
|
||||
DepoTheadSubType(String nameCode, String code, String num){
|
||||
this.nameCode = nameCode;
|
||||
this.code = code;
|
||||
this.num = num;
|
||||
}
|
||||
|
||||
public static String getClockInName(String num){
|
||||
for (DepoTheadSubType q : DepoTheadSubType.values()){
|
||||
if(q.getNum().equals(num)){
|
||||
return q.getCode();
|
||||
}
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
||||
public String getNameCode() {
|
||||
return nameCode;
|
||||
}
|
||||
|
||||
public void setNameCode(String nameCode) {
|
||||
this.nameCode = nameCode;
|
||||
}
|
||||
|
||||
public String getNum() {
|
||||
return num;
|
||||
}
|
||||
|
||||
public void setNum(String num) {
|
||||
this.num = num;
|
||||
}
|
||||
|
||||
public String getCode() {
|
||||
return code;
|
||||
}
|
||||
|
||||
public void setCode(String code) {
|
||||
this.code = code;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -25,4 +25,6 @@ public interface AccountService {
|
|||
public void queryAccountByIdAndInfo(InputObject inputObject, OutputObject outputObject) throws Exception;
|
||||
|
||||
public void queryAccountStreamById(InputObject inputObject, OutputObject outputObject) throws Exception;
|
||||
|
||||
public void queryAccountListToSelect(InputObject inputObject, OutputObject outputObject) throws Exception;
|
||||
}
|
||||
|
|
|
@ -174,4 +174,19 @@ public class AccountServiceImpl implements AccountService {
|
|||
outputObject.setBeans(beans);
|
||||
outputObject.settotal(total);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取账户信息展示为下拉框
|
||||
* @param inputObject
|
||||
* @param outputObject
|
||||
* @throws Exception
|
||||
*/
|
||||
@Override
|
||||
public void queryAccountListToSelect(InputObject inputObject, OutputObject outputObject) throws Exception {
|
||||
Map<String, Object> params = inputObject.getParams();
|
||||
params.put("userId", inputObject.getLogParams().get("id"));
|
||||
List<Map<String, Object>> beans = accountDao.queryAccountListToSelect(params);
|
||||
outputObject.setBeans(beans);
|
||||
outputObject.settotal(beans.size());
|
||||
}
|
||||
}
|
||||
|
|
|
@ -172,4 +172,17 @@
|
|||
a.tenant_id = #{userId}
|
||||
AND a.id = #{id}
|
||||
</select>
|
||||
|
||||
<select id="queryAccountListToSelect" parameterType="java.util.Map" resultType="java.util.Map">
|
||||
SELECT
|
||||
a.id,
|
||||
a.`name`
|
||||
FROM
|
||||
erp_account a
|
||||
WHERE
|
||||
a.tenant_id = #{userId}
|
||||
AND a.delete_flag = '0'
|
||||
ORDER BY a.is_default ASC
|
||||
</select>
|
||||
|
||||
</mapper>
|
|
@ -315,5 +315,7 @@
|
|||
<url id="account008" path="/post/AccountController/queryAccountStreamById" val="查看账户流水" allUse="1">
|
||||
<property id="rowId" name="id" ref="required" var="结算账户Id"></property>
|
||||
</url>
|
||||
<url id="account009" path="/post/AccountController/queryAccountListToSelect" val="获取账户信息展示为下拉框" allUse="2">
|
||||
</url>
|
||||
<!-- 结算账户管理结束 -->
|
||||
</controller>
|
|
@ -5,11 +5,12 @@ layui.config({
|
|||
version: skyeyeVersion
|
||||
}).extend({ //指定js别名
|
||||
window: 'js/winui.window'
|
||||
}).define(['window', 'jquery', 'winui'], function(exports) {
|
||||
}).define(['window', 'jquery', 'winui', 'laydate'], function(exports) {
|
||||
winui.renderColor();
|
||||
layui.use(['form'], function(form) {
|
||||
var index = parent.layer.getFrameIndex(window.name); //获取窗口索引
|
||||
var $ = layui.$;
|
||||
var $ = layui.$,
|
||||
laydate = layui.laydate;
|
||||
var enclosureInfo = ""; //附件id
|
||||
var rowNum = 1; //表格的序号
|
||||
var depotHtml = "", materialHtml = "";//仓库
|
||||
|
@ -18,7 +19,28 @@ layui.config({
|
|||
var usetableTemplate = $("#usetableTemplate").html();
|
||||
var selOption = getFileContent('tpl/template/select-option.tpl');
|
||||
|
||||
initSupplierHtml();
|
||||
//事故时间
|
||||
laydate.render({
|
||||
elem: '#operTime',
|
||||
type: 'datetime',
|
||||
trigger: 'click'
|
||||
});
|
||||
|
||||
initAccountHtml();
|
||||
//初始化账户
|
||||
function initAccountHtml() {
|
||||
AjaxPostUtil.request({url: reqBasePath + "account009", params: {}, type: 'json', callback: function(json) {
|
||||
if(json.returnCode == 0) {
|
||||
//加载供应商数据
|
||||
$("#accountId").html(getDataUseHandlebars(selOption, json));
|
||||
//初始化供应商
|
||||
initSupplierHtml();
|
||||
} else {
|
||||
winui.window.msg(json.returnMessage, {icon: 2, time: 2000});
|
||||
}
|
||||
}});
|
||||
}
|
||||
|
||||
//初始化供应商
|
||||
function initSupplierHtml() {
|
||||
AjaxPostUtil.request({url: reqBasePath + "supplier009", params: {}, type: 'json', callback: function(json) {
|
||||
|
|
|
@ -16,13 +16,19 @@
|
|||
<select id="supplierId" lay-search win-verify="required"></select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-form-item layui-col-xs6">
|
||||
<label class="layui-form-label">单据日期<i class="red">*</i></label>
|
||||
<div class="layui-input-block">
|
||||
<input type="text" id="operTime" name="operTime" win-verify="required" placeholder="请选择单据日期" class="layui-input"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-form-item layui-col-xs12">
|
||||
<label class="layui-form-label">列表项<i class="red">*</i></label>
|
||||
<div class="layui-input-block">
|
||||
<div class="winui-toolbar">
|
||||
<div class="winui-tool" style="text-align: left;">
|
||||
<button id="addRow" class="winui-toolbtn" type="button"><i class="fa fa-plus" aria-hidden="true"></i>新增行</button>
|
||||
<button id="deleteRow" class="winui-toolbtn" type="button"><i class="fa fa-plus" aria-hidden="true"></i>删除行</button>
|
||||
<button id="deleteRow" class="winui-toolbtn" type="button"><i class="fa fa-trash-o" aria-hidden="true"></i>删除行</button>
|
||||
</div>
|
||||
</div>
|
||||
<table class="layui-table">
|
||||
|
@ -44,7 +50,13 @@
|
|||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-form-item layui-col-xs12">
|
||||
<div class="layui-form-item layui-col-xs6">
|
||||
<label class="layui-form-label">支付账户</label>
|
||||
<div class="layui-input-block">
|
||||
<select id="accountId" lay-search win-verify="required"></select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-form-item layui-col-xs6">
|
||||
<label class="layui-form-label">共计金额</label>
|
||||
<div class="layui-input-block ver-center" id="allPrice">
|
||||
0.00
|
||||
|
|
Loading…
Reference in a new issue