Skip to content
GitLab
Commit 153f5602 authored by 季圣华's avatar 季圣华
Browse files

增加-零售出库单据-初稿

parent 80aca0ef
Expand all Hide whitespace changes
Inline Side-by-side
sql/jsh_erp.sql
View file @ 153f5602
This diff is collapsed.
src/main/java/com/jsh/action/materials/DepotItemAction.java
View file @ 153f5602
......@@ -310,19 +310,23 @@ public class DepotItemAction extends BaseAction<DepotItemModel>
for(DepotItem depotItem:dataList)
{
JSONObject item = new JSONObject();
Integer OutSum = sumNumberBuyOrSale("出库","销售",depotItem.getMaterialId().getId(),model.getMonthTime());
Integer InSum = sumNumberBuyOrSale("入库","销售退货",depotItem.getMaterialId().getId(),model.getMonthTime());
Double OutSumPrice = sumPriceBuyOrSale("出库","销售",depotItem.getMaterialId().getId(),model.getMonthTime());
Integer OutSumRetail = sumNumberBuyOrSale("出库","零售",depotItem.getMaterialId().getId(),model.getMonthTime());
Integer OutSum = sumNumberBuyOrSale("出库","销售",depotItem.getMaterialId().getId(),model.getMonthTime());
Integer InSumRetail = sumNumberBuyOrSale("入库","零售退货",depotItem.getMaterialId().getId(),model.getMonthTime());
Integer InSum = sumNumberBuyOrSale("入库","销售退货",depotItem.getMaterialId().getId(),model.getMonthTime());
Double OutSumRetailPrice = sumPriceBuyOrSale("出库","零售",depotItem.getMaterialId().getId(),model.getMonthTime());
Double OutSumPrice = sumPriceBuyOrSale("出库","销售",depotItem.getMaterialId().getId(),model.getMonthTime());
Double InSumRetailPrice = sumPriceBuyOrSale("入库","零售退货",depotItem.getMaterialId().getId(),model.getMonthTime());
Double InSumPrice = sumPriceBuyOrSale("入库","销售退货",depotItem.getMaterialId().getId(),model.getMonthTime());
item.put("Id", depotItem.getId());
item.put("MaterialId", depotItem.getMaterialId()==null?"":depotItem.getMaterialId().getId());
item.put("MaterialName", depotItem.getMaterialId().getName());
item.put("MaterialModel", depotItem.getMaterialId().getModel());
item.put("MaterialColor", depotItem.getMaterialId().getColor());
item.put("OutSum", OutSum);
item.put("InSum", InSum);
item.put("OutSumPrice", OutSumPrice);
item.put("InSumPrice", InSumPrice);
item.put("OutSum", OutSumRetail + OutSum);
item.put("InSum", InSumRetail + InSum);
item.put("OutSumPrice", OutSumRetailPrice + OutSumPrice);
item.put("InSumPrice", InSumRetailPrice + InSumPrice);
dataArray.add(item);
}
}
......
src/main/webapp/css/retail_list.css 0 → 100644
View file @ 153f5602
#depotHeadFM .retail-amount tr td{
padding: 5px;
}
#depotHeadFM .retail-amount tr td input{
width: 185px;
height: 30px;
line-height: 30px;
font-size: 24px;
border-color: #878787;
border-style: solid;
border-top-width: 0px;
border-right-width: 0px;
border-bottom-width: 1px;
border-left-width: 0px
}
#depotHeadFM .retail-amount .change-amount{
color:purple;
}
#depotHeadFM .retail-amount .get-amount{
color:red;
}
#depotHeadFM .retail-amount .back-amount{
color: green;
text-align: right;
}
#depotHeadDlgShow .retail-amount-show tr td{
padding: 5px;
}
#depotHeadDlgShow .retail-amount-show .change-amount-show{
color:purple;
font-size: 24px;
}
#depotHeadDlgShow .retail-amount-show .get-amount-show{
color:red;
font-size: 24px;
}
#depotHeadDlgShow .retail-amount-show .back-amount-show{
color: green;
text-align: right;
font-size: 24px;
}
src/main/webapp/js/pages/materials/in_out.js
View file @ 153f5602
......@@ -47,6 +47,12 @@
payTypeTitle = "付款";
organUrl = supUrl;
}
else if(listTitle === "零售退货列表"){
listType = "入库";
listSubType = "零售退货";
payTypeTitle = "付款";
organUrl = cusUrl;
}
else if(listTitle === "销售退货列表"){
listType = "入库";
listSubType = "销售退货";
......@@ -59,6 +65,12 @@
payTypeTitle = "隐藏";
organUrl = supUrl;
}
else if(listTitle === "零售出库列表"){
listType = "出库";
listSubType = "零售";
payTypeTitle = "收款";
organUrl = cusUrl;
}
else if(listTitle === "销售出库列表"){
listType = "出库";
listSubType = "销售";
......@@ -640,6 +652,18 @@
initTableData_material("add"); //商品列表
reject(); //撤销下、刷新商品列表
url = path + '/depotHead/create.action';
//零售单据修改收款时，自动计算找零
if(listSubType == "零售"){
var getAmount = $("#depotHeadFM .get-amount");
getAmount.off("keyup").on("keyup",function() {
var changeAmount = $("#depotHeadFM .change-amount");
var backAmount = $("#depotHeadFM .back-amount");
if(changeAmount.val()){
backAmount.val(getAmount.val()-changeAmount.val());
}
});
}
}
//编辑信息
......@@ -693,6 +717,12 @@
depotHeadID = depotHeadInfo[0];
initTableData_material_show(TotalPrice); //商品列表-查看状态
//零售单据修改收款时，自动计算找零
if(listSubType == "零售"){
$("#depotHeadDlgShow .get-amount-show").text($("#depotHeadDlgShow .change-amount-show").text());
$("#depotHeadDlgShow .back-amount-show").text(0);
}
}
//绑定操作事件
......@@ -747,7 +777,7 @@
else {
AllocationProjectId = $.trim($("#AllocationProjectId").val()); //收货仓库-对方
}
if(listSubType === "采购"||listSubType === "销售退货"){
if(listSubType === "采购"||listSubType === "零售退货"||listSubType === "销售退货"){
//付款为负数
ChangeAmount = 0 - ChangeAmount;
TotalPrice = 0 - TotalPrice;
......@@ -798,14 +828,14 @@
{
$.messager.show({
title: '错误提示',
msg: '保存采购入库信息失败，请稍后重试!'
msg: '保存信息失败，请稍后重试!'
});
}
},
//此处添加错误处理
error:function()
{
$.messager.alert('提示','保存采购入库信息异常，请稍后再试！','error');
$.messager.alert('提示','保存信息异常，请稍后再试！','error');
return;
}
});
......@@ -884,7 +914,12 @@
});
TotalPrice = TotalPrice + UnitPrice*OperNumber;
footer.find("[field='AllPrice']").find("div").text((TotalPrice).toFixed(2));
if(listSubType == "零售"){
$("#ChangeAmount, #getAmount").val(TotalPrice);
$("#backAmount").val(0);
}
});
//点击单价，自动提示参考价格列表
body.find("[field='UnitPrice']").find(input).off("click").on("click",function(){
var self = this;
var mValue = body.find("[field='MaterialId'] .combo-value").attr("value"); //获取选中的商品id
......@@ -954,6 +989,10 @@
});
TotalPrice = TotalPrice + UnitPrice*OperNumber;
footer.find("[field='AllPrice']").find("div").text((TotalPrice).toFixed(2));
if(listSubType == "零售"){
$("#ChangeAmount, #getAmount").val(TotalPrice);
$("#backAmount").val(0);
}
});
//修改金额，自动计算单价和合计
body.find("[field='AllPrice']").find(input).off("keyup").on("keyup",function(){
......@@ -968,6 +1007,10 @@
});
TotalPrice = TotalPrice + AllPrice;
footer.find("[field='AllPrice']").find("div").text((TotalPrice).toFixed(2));
if(listSubType == "零售"){
$("#ChangeAmount, #getAmount").val(TotalPrice);
$("#backAmount").val(0);
}
});
},500);
}
......
src/main/webapp/logs/jsh-info.log
View file @ 153f5602
This diff is collapsed.
src/main/webapp/pages/materials/retail_back_list.jsp 0 → 100644
View file @ 153f5602
<%@page import="com.jsh.util.Tools"%>
<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
<%
String path = request.getContextPath();
String clientIp = Tools.getCurrentUserIP();
%>
<!DOCTYPE html>
<html>
<head>
<title>零售退货</title>
<meta charset="utf-8">
<!-- 指定以IE8的方式来渲染 -->
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
<link rel="shortcut icon" href="<%=path%>/images/favicon.ico" type="image/x-icon" />
<link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/default/easyui.css"/>
<link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/icon.css"/>
<link type="text/css" rel="stylesheet" href="<%=path %>/css/common.css" />
<script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
<script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
<script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
<script src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script>
<script src="<%=path %>/js/common/common.js"></script>
<script src="<%=path %>/js/pages/materials/in_out.js"></script>
<script>
var kid = ${sessionScope.user.id};
var path = "<%=path%>";
var clientIp = "<%=clientIp%>";
</script>
</head>
<body>
<!-- 查询 -->
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable">
<tr>
<td>收货仓库：</td>
<td>
<select name="searchProjectId" id="searchProjectId" style="width:80px;"></select>
</td>
<td>单据编号：</td>
<td>
<input type="text" name="searchNumber" id="searchNumber" style="width:60px;"/>
</td>
<td>单据日期：</td>
<td>
<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
</td>
<td>-</td>
<td>
<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
</td>
<td>&nbsp;</td>
<td>
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a>&nbsp;
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchResetBtn">重置</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="depotHeadDlg" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
<form id="depotHeadFM" method="post" novalidate>
<table>
<tr>
<td>收货仓库：</td>
<td style="padding:5px">
<select name="ProjectId" id="ProjectId" style="width:110px;"></select>
</td>
<td>单据日期：</td>
<td style="padding:5px">
<input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:110px;"/>
</td>
<td>退货单位：</td>
<td style="padding:5px">
<input id="OrganId" name="OrganId" style="width:110px;" />
</td>
<td>经手人：</td>
<td style="padding:5px">
<select name="HandsPersonId" id="HandsPersonId" style="width:110px;"></select>
</td>
</tr>
<tr>
<td>付款账户：</td>
<td style="padding:5px">
<select name="AccountId" id="AccountId" style="width:110px;"></select>
</td>
<td>付款金额：</td>
<td style="padding:5px">
<input id="ChangeAmount" name="ChangeAmount" data-changeamount="0" style="width:110px;" />
</td>
<td>单据编号：</td>
<td style="padding:5px">
<input name="Number" id="Number" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 110px;"/>
</td>
<td>单据备注：</td>
<td style="padding:5px">
<input name="Remark" id="Remark" class="easyui-validatebox" style="width: 110px;"/>
</td>
</tr>
<tr>
<td>商品列表：</td>
<td colspan="7">
<!-- 商品列表table -->
<table id="materialData" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td>
</tr>
</table>
<input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
</form>
</div>
<div id="dlg-buttons">
<a href="javascript:void(0)" id="saveDepotHead" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
<a href="javascript:void(0)" id="cancelDepotHead" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a>
</div>
<div id="depotHeadDlgShow" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
closed="true" modal="true" cache="false" collapsible="false" closable="true">
<table>
<tr>
<td>收货仓库：</td>
<td style="padding:5px;width:110px;">
<span id="ProjectIdShow"></span>
</td>
<td>单据日期：</td>
<td style="padding:5px;width:110px;">
<span id="OperTimeShow"></span>
</td>
<td>退货单位：</td>
<td style="padding:5px;width:110px;">
<span id="OrganIdShow"></span>
</td>
<td>经手人：</td>
<td style="padding:5px;width:110px;">
<span id="HandsPersonIdShow"></span>
</td>
</tr>
<tr>
<td>付款账户：</td>
<td style="padding:5px;width:110px;">
<span id="AccountIdShow"></span>
</td>
<td>付款金额：</td>
<td style="padding:5px;width:110px;">
<span id="ChangeAmountShow"></span>
</td>
<td>单据编号：</td>
<td style="padding:5px;width:110px;">
<span id="NumberShow"></span>
</td>
<td>单据备注：</td>
<td style="padding:5px;width:110px;">
<span id="RemarkShow"></span>
</td>
</tr>
<tr>
<td>商品列表：</td>
<td colspan="7">
<!-- 商品列表table -->
<table id="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td>
</tr>
</table>
</div>
</body>
</html>
\ No newline at end of file
src/main/webapp/pages/materials/retail_out_list.jsp 0 → 100644
View file @ 153f5602
<%@page import="com.jsh.util.Tools"%>
<%@ page language="java" import="java.util.*" pageEncoding="utf-8"%>
<%
String path = request.getContextPath();
String clientIp = Tools.getCurrentUserIP();
%>
<!DOCTYPE html>
<html>
<head>
<title>零售出库</title>
<meta charset="utf-8">
<!-- 指定以IE8的方式来渲染 -->
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
<link rel="shortcut icon" href="<%=path%>/images/favicon.ico" type="image/x-icon" />
<link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/default/easyui.css"/>
<link rel="stylesheet" type="text/css" href="<%=path %>/js/easyui-1.3.5/themes/icon.css"/>
<link type="text/css" rel="stylesheet" href="<%=path %>/css/common.css" />
<link type="text/css" rel="stylesheet" href="<%=path %>/css/retail_list.css" />
<script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
<script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
<script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
<script src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script>
<script src="<%=path %>/js/common/common.js"></script>
<script src="<%=path %>/js/pages/materials/in_out.js"></script>
<script>
var kid = ${sessionScope.user.id};
var path = "<%=path%>";
var clientIp = "<%=clientIp%>";
</script>
</head>
<body>
<!-- 查询 -->
<div id = "searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" closable="false">
<table id="searchTable">
<tr>
<td>发货仓库：</td>
<td>
<select name="searchProjectId" id="searchProjectId" style="width:80px;"></select>
</td>
<td>单据编号：</td>
<td>
<input type="text" name="searchNumber" id="searchNumber" style="width:60px;"/>
</td>
<td>单据日期：</td>
<td>
<input type="text" name="searchBeginTime" id="searchBeginTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
</td>
<td>-</td>
<td>
<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:80px;"/>
</td>
<td>&nbsp;</td>
<td>
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a>&nbsp;
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchResetBtn">重置</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="depotHeadDlg" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
<form id="depotHeadFM" method="post" novalidate>
<table>
<tr>
<td>购买单位：</td>
<td style="padding:5px">
<input id="OrganId" name="OrganId" style="width:110px;" />
</td>
<td>发货仓库：</td>
<td style="padding:5px">
<select name="ProjectId" id="ProjectId" style="width:110px;"></select>
</td>
<td>单据编号：</td>
<td style="padding:5px">
<input name="Number" id="Number" class="easyui-validatebox" data-options="required:true,validType:'length[2,30]'" style="width: 130px;"/>
</td>
<td>单据日期：</td>
<td style="padding:5px">
<input type="text" name="OperTime" id="OperTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width: 125px;"/>
</td>
</tr>
<tr>
<td>单据备注：</td>
<td style="padding:5px" colspan="5">
<input name="Remark" id="Remark" class="easyui-validatebox" style="width: 292px;"/>
</td>
</tr>
<tr>
<td colspan="6">
<!-- 商品列表table -->
<table id="materialData" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td>
<td colspan="2" valign="top">
<table width="100%" class="retail-amount">
<tr>
<td colspan="2">实收金额</td>
</tr>
<tr>
<td colspan="2">
<input id="ChangeAmount" name="ChangeAmount" class="change-amount" readonly="readonly" data-changeamount="0" />
</td>
</tr>
<tr>
<td colspan="2">收款金额</td>
</tr>
<tr>
<td colspan="2">
<input id="getAmount" name="getAmount" class="get-amount" data-changeamount="0" />
</td>
</tr>
<tr>
<td colspan="2">找零</td>
</tr>
<tr>
<td colspan="2">
<input id="backAmount" name="backAmount" class="back-amount" readonly="readonly" data-changeamount="0" />
</td>
</tr>
<tr>
<td>收款账户：</td>
<td>
<select name="AccountId" id="AccountId" style="width: 117px;"></select>
</td>
</tr>
<tr>
<td>经手人：</td>
<td>
<select name="HandsPersonId" id="HandsPersonId" style="width: 117px;"></select>
</td>
</tr>
</table>
</td>
</tr>
</table>
<input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/>
</form>
</div>
<div id="dlg-buttons">
<a href="javascript:void(0)" id="saveDepotHead" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
<a href="javascript:void(0)" id="cancelDepotHead" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a>
</div>
<div id="depotHeadDlgShow" class="easyui-dialog" style="width:850px;padding:10px 20px;top:20px"
closed="true" modal="true" cache="false" collapsible="false" closable="true">
<table>
<tr>
<td>购买单位：</td>
<td style="padding:5px;width:110px;">
<span id="OrganIdShow"></span>
</td>
<td>发货仓库：</td>
<td style="padding:5px;width:110px;">
<span id="ProjectIdShow"></span>
</td>
<td>单据编号：</td>
<td style="padding:5px;width:130px;">
<span id="NumberShow"></span>
</td>
<td>单据日期：</td>
<td style="padding:5px;width:125px;">
<span id="OperTimeShow"></span>
</td>
</tr>
<tr>
<td>单据备注：</td>
<td style="padding:5px;width:292px;" colspan="5">
<span id="RemarkShow"></span>
</td>
</tr>
<tr>
<td colspan="6">
<!-- 商品列表table -->
<table id="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td>
<td colspan="2" valign="top">
<table width="100%" class="retail-amount-show">
<tr>
<td colspan="2">实收金额</td>
</tr>
<tr>
<td colspan="2">
<span id="ChangeAmountShow" class="change-amount-show"></span>
</td>
</tr>
<tr>
<td colspan="2">收款金额</td>
</tr>
<tr>
<td colspan="2">
<span id="getAmountShow" class="get-amount-show"></span>
</td>
</tr>
<tr>
<td colspan="2">找零</td>
</tr>
<tr>
<td colspan="2">
<span id="backAmountShow" class="back-amount-show"></span>
</td>
</tr>
<tr>
<td>收款账户：</td>
<td align="left" style="width:110px;">
<span id="AccountIdShow"></span>
</td>
</tr>
<tr>
<td>经手人：</td>
<td align="left" style="width:110px;">
<span id="HandsPersonIdShow"></span>
</td>
</tr>
</table>
</td>
</tr>
</table>
</div>
</body>
</html>
\ No newline at end of file
src/main/webapp/pages/reports/sale_out_report.jsp
View file @ 153f5602
......@@ -35,6 +35,7 @@
<td>
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-search" id="searchBtn">查询</a>
</td>
<td><span class="tip">注：此处包含零售+批发销售</span></td>
</tr>
</table>
</div>
......@@ -48,6 +49,7 @@
//初始化界面
$(function()
{
$("#searchTable .tip").css("padding-left","15px").css("color","red");
initTableData();
ininPager();
});
......
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