计费模块重构,可以在线配置SQl,更灵活面对不同计费方式

master
erzhongxmu 2022-07-25 12:14:08 +08:00
parent d88f5d0900
commit 376aaecbe2
14 changed files with 258 additions and 20124 deletions

View File

@ -1,3 +0,0 @@
ALTER TABLE `wms`.`wm_in_qm_i`
ADD COLUMN `base_in_goodscount` VARCHAR(45) NULL AFTER `IM_CUS_CODE`,
ADD COLUMN `base_out_goodscount` VARCHAR(45) NULL AFTER `base_in_goodscount`;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -18,12 +18,12 @@ import org.hibernate.annotations.GenericGenerator;
import javax.persistence.SequenceGenerator;
import org.jeecgframework.poi.excel.annotation.Excel;
/**
/**
* @Title: Entity
* @Description:
* @author erzhongxmu
* @date 2017-09-26 15:11:40
* @version V1.0
* @version V1.0
*
*/
@Entity
@ -51,6 +51,12 @@ public class BaCostConfEntity implements java.io.Serializable {
/**费用名称*/
@Excel(name="费用名称")
private java.lang.String costCode;
@Excel(name="免费天数")
private java.lang.String freeDay;
// @Excel(name="免费天数2")
private java.lang.String freeDay2;
@Excel(name="数据SQL")
private java.lang.String dataSql;
/**价格RMB*/
@Excel(name="价格RMB")
private java.lang.String costJg;
@ -66,7 +72,7 @@ public class BaCostConfEntity implements java.io.Serializable {
/**含税价RMB*/
@Excel(name="含税价RMB")
private java.lang.String costHs;
/**
*: java.lang.String
*@return: java.lang.String
@ -310,4 +316,31 @@ public class BaCostConfEntity implements java.io.Serializable {
public void setCostHs(java.lang.String costHs){
this.costHs = costHs;
}
@Column(name ="free_day",nullable=true,length=36)
public String getFreeDay() {
return freeDay;
}
public void setFreeDay(String freeDay) {
this.freeDay = freeDay;
}
@Column(name ="free_day2",nullable=true,length=36)
public String getFreeDay2() {
return freeDay2;
}
public void setFreeDay2(String freeDay2) {
this.freeDay2 = freeDay2;
}
@Column(name ="data_sql",nullable=true,length=36)
public String getDataSql() {
return dataSql;
}
public void setDataSql(String dataSql) {
this.dataSql = dataSql;
}
}

View File

@ -71,12 +71,12 @@ import org.jeecgframework.web.cgform.entity.upload.CgUploadEntity;
import org.jeecgframework.web.cgform.service.config.CgFormFieldServiceI;
import java.util.HashMap;
/**
/**
* @Title: Controller
* @Description:
* @author erzhongxmu
* @date 2017-09-26 15:12:32
* @version V1.0
* @version V1.0
*
*/
@Controller
@ -98,7 +98,7 @@ public class WmCusCostHController extends BaseController {
/**
*
*
*
* @return
*/
@RequestMapping(params = "list")
@ -108,7 +108,7 @@ public class WmCusCostHController extends BaseController {
/**
* easyui AJAX
*
*
* @param request
* @param response
* @param dataGrid
@ -132,7 +132,7 @@ public class WmCusCostHController extends BaseController {
/**
*
*
*
* @return
*/
@RequestMapping(params = "doDel")
@ -155,7 +155,7 @@ public class WmCusCostHController extends BaseController {
/**
*
*
*
* @return
*/
@RequestMapping(params = "doBatchDel")
@ -182,7 +182,7 @@ public class WmCusCostHController extends BaseController {
/**
*
*
*
* @param ids
* @return
*/
@ -206,7 +206,7 @@ public class WmCusCostHController extends BaseController {
}
/**
*
*
*
* @param ids
* @return
*/
@ -230,7 +230,7 @@ public class WmCusCostHController extends BaseController {
/**
*
*
*
* @return
*/
@RequestMapping(params = "goAdd")
@ -241,10 +241,10 @@ public class WmCusCostHController extends BaseController {
}
return new ModelAndView("com/zzjee/wm/wmCusCostH-add");
}
/**
*
*
*
* @return
*/
@RequestMapping(params = "goUpdate")
@ -255,16 +255,16 @@ public class WmCusCostHController extends BaseController {
}
return new ModelAndView("com/zzjee/wm/wmCusCostH-update");
}
/**
* []
*
*
* @return
*/
@RequestMapping(params = "wmCusCostIList")
public ModelAndView wmCusCostIList(WmCusCostHEntity wmCusCostH, HttpServletRequest req) {
//===================================================================================
//获取参数
Object id0 = wmCusCostH.getId();
@ -284,6 +284,9 @@ public class WmCusCostHController extends BaseController {
t.setCostZk(baCostConfEntity.getCostZk());
t.setCostBhs(baCostConfEntity.getCostBhs());
t.setCostHs(baCostConfEntity.getCostHs());
t.setFreeDay(baCostConfEntity.getFreeDay());
t.setFreeDay2(baCostConfEntity.getFreeDay2());
t.setDataSql(baCostConfEntity.getDataSql());
wmCusCostIEntityList.add(t);
}
}catch(Exception e){
@ -403,14 +406,14 @@ public class WmCusCostHController extends BaseController {
return new ModelAndView("common/upload/pub_excel_upload");
}
@RequestMapping(method = RequestMethod.GET)
@ResponseBody
public List<WmCusCostHEntity> list() {
List<WmCusCostHEntity> listWmCusCostHs=wmCusCostHService.getList(WmCusCostHEntity.class);
return listWmCusCostHs;
}
@RequestMapping(value = "/{id}", method = RequestMethod.GET)
@ResponseBody
public ResponseEntity<?> get(@PathVariable("id") String id) {
@ -420,7 +423,7 @@ public class WmCusCostHController extends BaseController {
}
return new ResponseEntity(task, HttpStatus.OK);
}
@RequestMapping(method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
@ResponseBody
public ResponseEntity<?> create(@RequestBody WmCusCostHPage wmCusCostHPage, UriComponentsBuilder uriBuilder) {
@ -432,7 +435,7 @@ public class WmCusCostHController extends BaseController {
//保存
List<WmCusCostIEntity> wmCusCostIList = wmCusCostHPage.getWmCusCostIList();
WmCusCostHEntity wmCusCostH = new WmCusCostHEntity();
try{
MyBeanUtils.copyBeanNotNull2Bean(wmCusCostH,wmCusCostHPage);
@ -449,7 +452,7 @@ public class WmCusCostHController extends BaseController {
return new ResponseEntity(headers, HttpStatus.CREATED);
}
@RequestMapping(value = "/{id}", method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<?> update(@RequestBody WmCusCostHPage wmCusCostHPage) {
//调用JSR303 Bean Validator进行校验如果出错返回含400错误码及json格式的错误信息.
@ -460,7 +463,7 @@ public class WmCusCostHController extends BaseController {
//保存
List<WmCusCostIEntity> wmCusCostIList = wmCusCostHPage.getWmCusCostIList();
WmCusCostHEntity wmCusCostH = new WmCusCostHEntity();
try{
MyBeanUtils.copyBeanNotNull2Bean(wmCusCostH,wmCusCostHPage);
@ -481,7 +484,7 @@ public class WmCusCostHController extends BaseController {
}
/**
*
*
*
* @param id wmCusCostHid
*/
@RequestMapping(params = "getFiles")

View File

@ -53,8 +53,10 @@ public class WmCusCostIEntity implements java.io.Serializable {
/**费用名称*/
@Excel(name="免费天数")
private java.lang.String freeDay;
@Excel(name="免费天数2")
// @Excel(name="免费天数2")
private java.lang.String freeDay2;
@Excel(name="数据SQL")
private java.lang.String dataSql;
/**价格RMB*/
@Excel(name="价格RMB")
private java.lang.String costJg;
@ -381,4 +383,13 @@ public class WmCusCostIEntity implements java.io.Serializable {
public void setFreeDay2(String freeDay2) {
this.freeDay2 = freeDay2;
}
@Column(name ="data_sql",nullable=true,length=36)
public String getDataSql() {
return dataSql;
}
public void setDataSql(String dataSql) {
this.dataSql = dataSql;
}
}

View File

@ -63,6 +63,40 @@ public class CostTask {
org.jeecgframework.core.util.LogUtil.info("总耗时" + times + "毫秒");
}
public void costcountv2(String datestr, String chongsuan, WmDayCostConfEntity t){
String tsql = "select COST_SF from wm_day_cost_conf where to_days(cost_date) = to_days(?)";
if (chongsuan.equals("N")) {//非重算
List<Map<String, Object>> resultconf = systemService.findForJdbc(tsql, datestr);
if (resultconf.size() > 0) {
return;
} else {
Date costdate = DateUtils.str2Date(datestr, DateUtils.date_sdf);
t.setCostDate(costdate);
t.setCostSf("Y");
t.setCreateBy("system");
t.setCreateDate(costdate);
systemService.save(t);
}
}
tsql = "call update_wm_his_stock('" + datestr + "')";
try {
systemService.executeSql(tsql);
} catch (Exception e) {
// TODO: handle exception
}
org.jeecgframework.core.util.LogUtil
.info("===================1库存更新成功===================");
//先删除
tsql = "delete from wm_day_cost where cost_sta ='已生成' and to_days(cost_data) = to_days(?)";
systemService.executeSql(tsql, t.getCostDate());
org.jeecgframework.core.util.LogUtil
.info("===================V2数据删除成功===================");
}
public void costcount(String datestr, String chongsuan, WmDayCostConfEntity t) {
// WmDayCostConfEntity t = new WmDayCostConfEntity();
String tsql = "select COST_SF from wm_day_cost_conf where to_days(cost_date) = to_days(?)";

View File

@ -12,10 +12,10 @@
<link rel="stylesheet" href="online/template/ledefault/css/bootstrap-theme.css">
<link rel="stylesheet" href="online/template/ledefault/css/bootstrap.css">
<link rel="stylesheet" href="online/template/ledefault/css/app.css">
<link rel="stylesheet" href="plug-in/Validform/css/metrole/style.css" type="text/css"/>
<link rel="stylesheet" href="plug-in/Validform/css/metrole/tablefrom.css" type="text/css"/>
<script type="text/javascript" src="plug-in/jquery/jquery-1.8.3.js"></script>
<script type="text/javascript" src="plug-in/tools/dataformat.js"></script>
<script type="text/javascript" src="plug-in/easyui/jquery.easyui.min.1.3.2.js"></script>
@ -31,7 +31,7 @@
<script type="text/javascript" src="plug-in/Validform/plugin/passwordStrength/passwordStrength-min.js"></script>
<script type="text/javascript" charset="utf-8" src="plug-in/ueditor/ueditor.config.js"></script>
<script type="text/javascript" charset="utf-8" src="plug-in/ueditor/ueditor.all.min.js"></script>
<script type="text/javascript">
//编写自定义JS代码
</script>
@ -56,85 +56,121 @@
</div>
<div class="col-xs-3">
<t:dictSelect field="costCode" type="list" extendJson="{class:'form-control'}"
dictTable="ba_cost" dictField="cost_code" dictText="cost_name" hasLabel="false" title="费用名称"></t:dictSelect>
dictTable="ba_cost" dictField="cost_code" dictText="cost_name" hasLabel="false" title="费用名称"></t:dictSelect>
<span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">费用名称</label>
</div>
</div>
<div class="row show-grid">
<div class="col-xs-3 text-center">
<b>免费天数:</b>
</div>
<div class="col-xs-3">
<input id="freeDay" name="freeDay" type="text" class="form-control"
ignore="ignore"
/>
<span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">免费天数</label>
</div>
</div>
<div class="row show-grid">
<div class="col-xs-3 text-center">
<b>免费天数2</b>
</div>
<div class="col-xs-3">
<input id="freeDay2" name="freeDay2" type="text" class="form-control"
ignore="ignore"
/>
<span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">免费天数2</label>
</div>
</div>
<div class="row show-grid">
<div class="col-xs-3 text-center">
<b>数据SQL</b>
</div>
<div class="col-xs-3">
<input id="dataSql" name="dataSql" type="text" class="form-control"
ignore="ignore"
/>
<span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">数据SQL</label>
</div>
</div>
<div class="row show-grid">
<div class="col-xs-3 text-center">
<b>价格RMB</b>
</div>
<div class="col-xs-3">
<input id="costJg" name="costJg" type="text" class="form-control"
<input id="costJg" name="costJg" type="text" class="form-control"
ignore="ignore"
/>
<span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">价格RMB</label>
</div>
</div>
<div class="row show-grid">
<div class="col-xs-3 text-center">
<b>税率:</b>
</div>
<div class="col-xs-3">
<input id="costSl" name="costSl" type="text" class="form-control"
<input id="costSl" name="costSl" type="text" class="form-control"
ignore="ignore"
/>
<span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">税率</label>
</div>
</div>
<div class="row show-grid">
<div class="col-xs-3 text-center">
<b>折扣:</b>
</div>
<div class="col-xs-3">
<input id="costZk" name="costZk" type="text" class="form-control"
<input id="costZk" name="costZk" type="text" class="form-control"
ignore="ignore"
/>
<span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">折扣</label>
</div>
</div>
<div class="row show-grid">
<div class="col-xs-3 text-center">
<b>不含税价RMB</b>
</div>
<div class="col-xs-3">
<input id="costBhs" name="costBhs" type="text" class="form-control"
<input id="costBhs" name="costBhs" type="text" class="form-control"
ignore="ignore"
/>
<span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">不含税价RMB</label>
</div>
</div>
<div class="row show-grid">
<div class="col-xs-3 text-center">
<b>含税价RMB</b>
</div>
<div class="col-xs-3">
<input id="costHs" name="costHs" type="text" class="form-control"
<input id="costHs" name="costHs" type="text" class="form-control"
ignore="ignore"
/>
<span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">含税价RMB</label>
</div>
</div>
<div class="row" id = "sub_tr" style="display: none;">
<div class="col-xs-12 layout-header">
<div class="col-xs-6"></div>
@ -143,7 +179,7 @@
</div>
</div>
</div>
<div class="con-wrapper" id="con-wrapper2" style="display: block;"></div>
</div>
</t:formvalid>
@ -154,7 +190,7 @@
if(location.href.indexOf("load=detail")!=-1){
$(".jeecgDetail").hide();
}
if(location.href.indexOf("mode=read")!=-1){
//查看模式控件禁用
$("#formobj").find(":input").attr("disabled","disabled");
@ -167,11 +203,11 @@
var neibuClickFlag = false;
function neibuClick() {
neibuClickFlag = true;
neibuClickFlag = true;
$('#btn_sub').trigger('click');
}
</script>
</body>
<script src = "webpage/com/zzjee/ba/baCostConf.js"></script>
</html>
<script src = "webpage/com/zzjee/ba/baCostConf.js"></script>
</html>

View File

@ -12,10 +12,10 @@
<link rel="stylesheet" href="online/template/ledefault/css/bootstrap-theme.css">
<link rel="stylesheet" href="online/template/ledefault/css/bootstrap.css">
<link rel="stylesheet" href="online/template/ledefault/css/app.css">
<link rel="stylesheet" href="plug-in/Validform/css/metrole/style.css" type="text/css"/>
<link rel="stylesheet" href="plug-in/Validform/css/metrole/tablefrom.css" type="text/css"/>
<script type="text/javascript" src="plug-in/jquery/jquery-1.8.3.js"></script>
<script type="text/javascript" src="plug-in/tools/dataformat.js"></script>
<script type="text/javascript" src="plug-in/easyui/jquery.easyui.min.1.3.2.js"></script>
@ -40,8 +40,8 @@
<t:formvalid formid="formobj" dialog="true" usePlugin="password" layout="table" action="baCostConfController.do?doUpdate" tiptype="1" >
<input type="hidden" id="btn_sub" class="btn_sub"/>
<input type="hidden" name="id" value='${baCostConfPage.id}' >
<div class="tab-wrapper">
<!-- tab -->
<ul class="nav nav-tabs">
@ -56,13 +56,51 @@
</div>
<div class="col-xs-3">
<t:dictSelect field="costCode" type="list" extendJson="{class:'form-control'}"
dictTable="ba_cost" dictField="cost_code" dictText="cost_name" defaultVal="${baCostConfPage.costCode}" hasLabel="false" title="费用名称"></t:dictSelect>
dictTable="ba_cost" dictField="cost_code" dictText="cost_name" defaultVal="${baCostConfPage.costCode}" hasLabel="false" title="费用名称"></t:dictSelect>
<span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">费用名称</label>
</div>
</div>
<div class="row show-grid">
<div class="col-xs-3 text-center">
<b>免费天数:</b>
</div>
<div class="col-xs-3">
<input id="freeDay" name="freeDay" type="text" class="form-control"
ignore="ignore"
value='${baCostConfPage.freeDay}' />
<span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">免费天数</label>
</div>
</div>
<div class="row show-grid">
<div class="col-xs-3 text-center">
<b>免费天数2</b>
</div>
<div class="col-xs-3">
<input id="freeDay2" name="freeDay2" type="text" class="form-control"
ignore="ignore"
value='${baCostConfPage.freeDay2}' />
<span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">免费天数2</label>
</div>
</div>
<div class="row show-grid">
<div class="col-xs-3 text-center">
<b>数据SQL</b>
</div>
<div class="col-xs-3">
<input id="dataSql" name="dataSql" type="text" class="form-control"
ignore="ignore"
value='${baCostConfPage.dataSql}' />
<span class="Validform_checktip" style="float:left;height:0px;"></span>
<label class="Validform_label" style="display: none">数据SQL</label>
</div>
</div>
<div class="row show-grid">
<div class="col-xs-3 text-center">
<b>价格RMB</b>
@ -75,8 +113,8 @@
<label class="Validform_label" style="display: none">价格RMB</label>
</div>
</div>
<div class="row show-grid">
<div class="col-xs-3 text-center">
<b>税率:</b>
@ -89,8 +127,8 @@
<label class="Validform_label" style="display: none">税率</label>
</div>
</div>
<div class="row show-grid">
<div class="col-xs-3 text-center">
<b>折扣:</b>
@ -103,8 +141,8 @@
<label class="Validform_label" style="display: none">折扣</label>
</div>
</div>
<div class="row show-grid">
<div class="col-xs-3 text-center">
<b>不含税价RMB</b>
@ -117,8 +155,8 @@
<label class="Validform_label" style="display: none">不含税价RMB</label>
</div>
</div>
<div class="row show-grid">
<div class="col-xs-3 text-center">
<b>含税价RMB</b>
@ -131,10 +169,10 @@
<label class="Validform_label" style="display: none">含税价RMB</label>
</div>
</div>
<div class="row" id = "sub_tr" style="display: none;">
<div class="col-xs-12 layout-header">
<div class="col-xs-6"></div>
@ -143,7 +181,7 @@
</div>
</div>
</div>
<div class="con-wrapper" id="con-wrapper2" style="display: block;"></div>
</div>
</t:formvalid>
@ -154,7 +192,7 @@
if(location.href.indexOf("load=detail")!=-1){
$(".jeecgDetail").hide();
}
if(location.href.indexOf("mode=read")!=-1){
//查看模式控件禁用
$("#formobj").find(":input").attr("disabled","disabled");
@ -167,11 +205,11 @@
var neibuClickFlag = false;
function neibuClick() {
neibuClickFlag = true;
neibuClickFlag = true;
$('#btn_sub').trigger('click');
}
</script>
</body>
<script src = "webpage/com/zzjee/ba/baCostConf.js"></script>
</html>
<script src = "webpage/com/zzjee/ba/baCostConf.js"></script>
</html>

View File

@ -14,6 +14,9 @@
<t:dgCol title="所属部门" field="sysOrgCode" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="所属公司" field="sysCompanyCode" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="费用名称" field="costCode" query="true" queryMode="single" dictionary="ba_cost,cost_code,cost_name" width="120"></t:dgCol>
<t:dgCol title="免费天数" field="freeDay" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="免费天数2" field="freeDay2" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="数据SQL" field="dataSql" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="价格RMB" field="costJg" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="税率" field="costSl" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="折扣" field="costZk" queryMode="single" width="120"></t:dgCol>

View File

@ -333,10 +333,10 @@
<label class="Validform_label" style="display: none;">免费天数</label>
</td>
<td align="left">
<input name="wmCusCostIList[#index#].freeDay2" maxlength="32"
<input name="wmCusCostIList[#index#].dataSql" maxlength="32"
ignore="checked"
type="text" class="form-control" style="width:120px;" datatype="*">
<label class="Validform_label" style="display: none;">免费天数2</label>
<label class="Validform_label" style="display: none;">数据SQL</label>
</td>
<td align="left">
<input name="wmCusCostIList[#index#].costSl" maxlength="32"

View File

@ -332,10 +332,10 @@
<label class="Validform_label" style="display: none;">免费天数</label>
</td>
<td align="left">
<input name="wmCusCostIList[#index#].freeDay2" maxlength="32"
<input name="wmCusCostIList[#index#].dataSql" maxlength="32"
ignore="checked"
type="text" class="form-control" style="width:120px;" datatype="*">
<label class="Validform_label" style="display: none;">免费天数2</label>
<label class="Validform_label" style="display: none;">数据SQL</label>
</td>
<td align="left">
<input name="wmCusCostIList[#index#].costSl" maxlength="32"

View File

@ -44,7 +44,7 @@
免费天数
</th>
<th>
免费天数2
数据SQL
</th>
<th>
价格RMB
@ -90,9 +90,9 @@
<label class="Validform_label" style="display: none;">免费天数</label>
</td>
<td>
<input name="wmCusCostIList[0].freeDay2" maxlength="32"
<input name="wmCusCostIList[0].dataSql" maxlength="32"
type="text" class="form-control" style="width:120px;" datatype="*">
<label class="Validform_label" style="display: none;">免费天数2</label>
<label class="Validform_label" style="display: none;">数据SQL</label>
</td>
<td>
<input name="wmCusCostIList[0].costJg" maxlength="32"
@ -147,9 +147,9 @@
<label class="Validform_label" style="display: none;">免费天数</label>
</td>
<td align="left">
<input name="wmCusCostIList[${stuts.index }].freeDay2" maxlength="32"
type="text" class="form-control" style="width:120px;" datatype="*" value="${poVal.freeDay2 }">
<label class="Validform_label" style="display: none;">免费天数2</label>
<input name="wmCusCostIList[${stuts.index }].dataSql" maxlength="32"
type="text" class="form-control" style="width:120px;" datatype="*" value="${poVal.dataSql }">
<label class="Validform_label" style="display: none;">数据SQL</label>
</td>
<td align="left">
<input name="wmCusCostIList[${stuts.index }].costJg" maxlength="32"