Skip to content
GitLab
Commit 06ad056f authored by 乾坤平台's avatar 乾坤平台 Committed by 季圣华
Browse files

!25 修复库存判断不准确的问题 

Merge pull request !25 from 乾坤平台/master
parents 86e7b3e7 01905d2a
Hide whitespace changes
Inline Side-by-side
erp_web/pages/materials/sale_back_list.html
View file @ 06ad056f
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>销售退货</title> <title>销售退货</title>
<meta charset="utf-8"> <meta charset="utf-8">
<!-- 指定以IE8的方式来渲染 --> <!-- 指定以IE8的方式来渲染 -->
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/> <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
<link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/> <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
<link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/default/easyui.css"/> <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/default/easyui.css"/>
<link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/icon.css"/> <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/icon.css"/>
<link type="text/css" rel="stylesheet" href="/css/common.css"/> <link type="text/css" rel="stylesheet" href="/css/common.css"/>
<link type="text/css" rel="stylesheet" href="/css/in_out.css"/> <link type="text/css" rel="stylesheet" href="/css/in_out.css"/>
<script src="/js/jquery-1.8.0.min.js"></script> <script src="/js/jquery-1.8.0.min.js"></script>
<script src="/js/easyui-1.3.5/jquery.easyui.min.js"></script> <script src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
<script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script> <script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
<script src="/js/My97DatePicker/WdatePicker.js"></script> <script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script> <script src="/js/common/common.js"></script>
<script src="/js/pages/materials/in_out.js"></script> <script src="/js/pages/materials/in_out.js"></script>
</head> </head>
<body> <body>
<!-- 查询 --> <!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" <div id="searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false"> closable="false">
<table id="searchTable"> <table id="searchTable">
<tr> <tr>
<td>单据编号：</td> <td>单据编号：</td>
<td> <td>
<input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/> <input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/>
</td> </td>
<td>商品信息：</td> <td>商品信息：</td>
<td> <td>
<input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号" style="width:100px;"/> <input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号" style="width:100px;"/>
</td> </td>
<td>单据日期：</td> <td>单据日期：</td>
<td> <td>
<input type="text" name="searchBeginTime" id="searchBeginTime" <input type="text" name="searchBeginTime" id="searchBeginTime"
onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/> onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
</td> </td>
<td>-</td> <td>-</td>
<td> <td>
<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" <input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})"
class="txt Wdate" style="width:100px;"/> class="txt Wdate" style="width:100px;"/>
</td> </td>
<td>&nbsp;</td> <td>&nbsp;</td>
<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-search" id="searchBtn">查询</a>&nbsp;
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchResetBtn">重置</a> <a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchResetBtn">重置</a>
</td> </td>
</tr> </tr>
</table> </table>
</div> </div>
<!-- 数据显示table --> <!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px; top:300px;" title="销售退货列表" iconCls="icon-list" <div id="tablePanel" class="easyui-panel" style="padding:1px; top:300px;" title="销售退货列表" iconCls="icon-list"
collapsible="true" closable="false"> collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table> <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div> </div>
<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px" <div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true"> closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
<form id="depotHeadFM" method="post" novalidate> <form id="depotHeadFM" method="post" novalidate>
<table> <table>
<tr> <tr>
<td>客户：</td> <td>客户：</td>
<td style="padding:5px"> <td style="padding:5px">
<input id="OrganId" name="OrganId" style="width:110px;"/> <input id="OrganId" name="OrganId" style="width:110px;"/>
</td> </td>
<td style="width:70px;">销售人员：</td> <td style="width:70px;">销售人员：</td>
<td style="padding:5px"> <td style="padding:5px">
<input id="Salesman" name="Salesman" style="width:130px;"/> <input id="Salesman" name="Salesman" style="width:130px;"/>
</td> </td>
<td>单据日期：</td> <td>单据日期：</td>
<td style="padding:5px"> <td style="padding:5px">
<input type="text" name="OperTime" id="OperTime" <input type="text" name="OperTime" id="OperTime"
onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate" onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
style="width:140px;"/> style="width:140px;" readonly/>
</td> </td>
<td>单据编号：</td> <td>单据编号：</td>
<td style="padding:5px"> <td style="padding:5px">
<input name="Number" id="Number" class="easyui-validatebox" <input name="Number" id="Number" class="easyui-validatebox"
data-options="required:true,validType:'length[2,30]'" style="width: 140px;"/> data-options="required:true,validType:'length[2,30]'" style="width: 140px;" readonly/>
</td> </td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
<td colspan="9"> <td colspan="9">
<!-- 商品列表table --> <!-- 商品列表table -->
<table id="materialData" style="top:100px;border-bottom-color:#FFFFFF"></table> <table id="materialData" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="9"> <td colspan="9">
<textarea name="Remark" id="Remark" rows="2" cols="2" placeholder="暂无备注信息" <textarea name="Remark" id="Remark" rows="2" cols="2" placeholder="暂无备注信息"
style="width: 1130px; height:35px;"></textarea> style="width: 1130px; height:35px;"></textarea>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>优惠率：</td> <td>优惠率：</td>
<td style="padding:5px"> <td style="padding:5px">
<input id="Discount" name="Discount" style="width:110px;"/> <input id="Discount" name="Discount" style="width:110px;"/>
% %
</td> </td>
<td>退款优惠：</td> <td>退款优惠：</td>
<td style="padding:5px"> <td style="padding:5px">
<input id="DiscountMoney" name="DiscountMoney" style="width:120px;"/> <input id="DiscountMoney" name="DiscountMoney" style="width:120px;"/>
</td> </td>
<td>优惠后金额：</td> <td>优惠后金额：</td>
<td style="padding:5px"> <td style="padding:5px">
<input id="DiscountLastMoney" name="DiscountLastMoney" readonly="readonly" style="width:120px;"/> <input id="DiscountLastMoney" name="DiscountLastMoney" readonly="readonly" style="width:120px;"/>
</td> </td>
<td>本次退款：</td> <td>本次退款：</td>
<td style="padding:5px"> <td style="padding:5px">
<input id="ChangeAmount" name="ChangeAmount" data-changeamount="0" style="width:120px;"/> <input id="ChangeAmount" name="ChangeAmount" data-changeamount="0" style="width:120px;"/>
</td> </td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
<td>结算账户：</td> <td>结算账户：</td>
<td style="padding:5px"> <td style="padding:5px">
<select name="AccountId" id="AccountId" style="width:120px;"></select> <select name="AccountId" id="AccountId" style="width:120px;"></select>
<img class="many-account-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg" <img class="many-account-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg"
style="display: none;"/> style="display: none;"/>
</td> </td>
<td>本次欠款：</td> <td>本次欠款：</td>
<td style="padding:5px"> <td style="padding:5px">
<input id="Debt" name="Debt" readonly="readonly" style="width:120px;"/> <input id="Debt" name="Debt" readonly="readonly" style="width:120px;"/>
</td> </td>
<td>销售费用：</td> <td>销售费用：</td>
<td style="padding:5px"> <td style="padding:5px">
<input id="OtherMoney" name="OtherMoney" style="width:120px;" readonly="readonly"/> <input id="OtherMoney" name="OtherMoney" style="width:120px;" readonly="readonly"/>
<img class="other-money-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg"/> <img class="other-money-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg"/>
</td> </td>
<td></td> <td></td>
<td style="padding:5px"> <td style="padding:5px">
</td> </td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
</table> </table>
<input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/> </form>
</form> </div>
</div> <div id="dlg-buttons">
<div id="dlg-buttons"> <a href="javascript:void(0)" id="saveDepotHead" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
<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"
<a href="javascript:void(0)" id="cancelDepotHead" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a>
onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a> </div>
</div> <div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
<div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px" closed="true" modal="true" cache="false" collapsible="false" closable="true">
closed="true" modal="true" cache="false" collapsible="false" closable="true"> <table>
<table> <tr>
<tr> <td style="width:60px;">客户：</td>
<td style="width:60px;">客户：</td> <td style="padding:5px;width:130px;">
<td style="padding:5px;width:130px;"> <span id="OrganIdShow"></span>
<span id="OrganIdShow"></span> </td>
</td> <td style="width:70px;">销售人员：</td>
<td style="width:70px;">销售人员：</td> <td style="padding:5px;width:130px;">
<td style="padding:5px;width:130px;"> <span id="SalesmanShow"></span>
<span id="SalesmanShow"></span> </td>
</td> <td style="width:80px;">单据日期：</td>
<td style="width:80px;">单据日期：</td> <td style="padding:5px;width:140px;">
<td style="padding:5px;width:140px;"> <span id="OperTimeShow"></span>
<span id="OperTimeShow"></span> </td>
</td> <td style="width:70px;">单据编号：</td>
<td style="width:70px;">单据编号：</td> <td style="padding:5px;width:140px;">
<td style="padding:5px;width:140px;"> <span id="NumberShow"></span>
<span id="NumberShow"></span> </td>
</td> <td style="width:100px;"></td>
<td style="width:100px;"></td> </tr>
</tr> <tr>
<tr> <td colspan="9" style="width: 1130px;">
<td colspan="9" style="width: 1130px;"> <!-- 商品列表table -->
<!-- 商品列表table --> <table id="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
<table id="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table> </td>
</td> </tr>
</tr> <tr>
<tr> <td style="width:60px;">单据备注：</td>
<td style="width:60px;">单据备注：</td> <td colspan="8" style="height:35px;">
<td colspan="8" style="height:35px;"> <span id="RemarkShow" style="width: 1070px; height:35px;"></span>
<span id="RemarkShow" style="width: 1070px; height:35px;"></span> </td>
</td> </tr>
</tr> <tr>
<tr> <td>优惠率：</td>
<td>优惠率：</td> <td>
<td> <span id="DiscountShow" style="width: 110px;"></span>
<span id="DiscountShow" style="width: 110px;"></span> %
% </td>
</td> <td>退款优惠：</td>
<td>退款优惠：</td> <td>
<td> <span id="DiscountMoneyShow" style="width: 120px;"></span>
<span id="DiscountMoneyShow" style="width: 120px;"></span> </td>
</td> <td>优惠后金额：</td>
<td>优惠后金额：</td> <td>
<td> <span id="DiscountLastMoneyShow" style="width: 120px;"></span>
<span id="DiscountLastMoneyShow" style="width: 120px;"></span> </td>
</td> <td>本次退款：</td>
<td>本次退款：</td> <td style="padding:5px">
<td style="padding:5px"> <span id="ChangeAmountShow"></span>
<span id="ChangeAmountShow"></span> </td>
</td> <td style="width:100px;"></td>
<td style="width:100px;"></td> </tr>
</tr> <tr>
<tr> <td>结算账户：</td>
<td>结算账户：</td> <td style="padding:5px">
<td style="padding:5px"> <span id="AccountIdShow"></span>
<span id="AccountIdShow"></span> </td>
</td> <td>本次欠款：</td>
<td>本次欠款：</td> <td style="padding:5px">
<td style="padding:5px"> <span id="DebtShow"></span>
<span id="DebtShow"></span> </td>
</td> <td>销售费用：</td>
<td>销售费用：</td> <td style="padding:5px">
<td style="padding:5px"> <span id="OtherMoneyShow"></span>
<span id="OtherMoneyShow"></span> </td>
</td> <td></td>
<td></td> <td style="padding:5px">
<td style="padding:5px"> </td>
</td> <td style="width:100px;"></td>
<td style="width:100px;"></td> </tr>
</tr> </table>
</table> </div>
</div> <div id="depotHeadAccountDlg" class="easyui-dialog" style="width:380px;padding:10px 20px;top:80px"
<div id="depotHeadAccountDlg" class="easyui-dialog" style="width:380px;padding:10px 20px;top:80px" closed="true" modal="true" buttons="#accountDlgButtons" cache="false" collapsible="false" closable="true">
closed="true" modal="true" buttons="#accountDlgButtons" cache="false" collapsible="false" closable="true"> <table class="account-dlg">
<table class="account-dlg"> <tr class="account-head-tmp">
<tr class="account-head-tmp"> <td style="width:30px;"></td>
<td style="width:30px;"></td> <td style="width:140px; padding:5px;">结算账户</td>
<td style="width:140px; padding:5px;">结算账户</td> <td style="width:100px; padding:5px;">金额</td>
<td style="width:100px; padding:5px;">金额</td> </tr>
</tr> <tr>
<tr> <td style="width:30px;"></td>
<td style="width:30px;"></td> <td style="width:140px;text-align: center;">合计：</td>
<td style="width:140px;text-align: center;">合计：</td> <td style="width:100px;"><span id="accountMoneyTotalDlg"></span></td>
<td style="width:100px;"><span id="accountMoneyTotalDlg"></span></td> </tr>
</tr> </table>
</table> <table class="tabs-tmp">
<table class="tabs-tmp"> <tr class="account-content-tmp">
<tr class="account-content-tmp"> <td style="width:30px;"></td>
<td style="width:30px;"></td> <td style="width:140px; padding:3px;"><select class="account-id-dlg" style="width:140px;"></select></td>
<td style="width:140px; padding:3px;"><select class="account-id-dlg" style="width:140px;"></select></td> <td style="width:100px; padding:3px;"><input class="account-money-dlg" style="width:100px;"/></td>
<td style="width:100px; padding:3px;"><input class="account-money-dlg" style="width:100px;"/></td> </tr>
</tr> </table>
</table> </div>
</div> <div id="accountDlgButtons">
<div id="accountDlgButtons"> <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="otherMoneyDlg" class="easyui-dialog" style="width:380px;padding:10px 20px;top:80px"
<div id="otherMoneyDlg" class="easyui-dialog" style="width:380px;padding:10px 20px;top:80px" closed="true" modal="true" buttons="#otherMoneyDlgBtn" cache="false" collapsible="false" closable="true">
closed="true" modal="true" buttons="#otherMoneyDlgBtn" cache="false" collapsible="false" closable="true"> <table class="money-dlg">
<table class="money-dlg"> <tr class="money-head-tmp">
<tr class="money-head-tmp"> <td style="width:30px;"></td>
<td style="width:30px;"></td> <td style="width:140px; padding:5px;">结算账户</td>
<td style="width:140px; padding:5px;">结算账户</td> <td style="width:100px; padding:5px;">金额</td>
<td style="width:100px; padding:5px;">金额</td> </tr>
</tr> <tr>
<tr> <td style="width:30px;"></td>
<td style="width:30px;"></td> <td style="width:140px;text-align: center;">合计：</td>
<td style="width:140px;text-align: center;">合计：</td> <td style="width:100px;"><span id="otherMoneyTotalDlg"></span></td>
<td style="width:100px;"><span id="otherMoneyTotalDlg"></span></td> </tr>
</tr> </table>
</table> <table class="tabs-tmp">
<table class="tabs-tmp"> <tr class="money-content-tmp">
<tr class="money-content-tmp"> <td style="width:30px;"></td>
<td style="width:30px;"></td> <td style="width:140px; padding:3px;"><select class="money-id-dlg" style="width:140px;"></select></td>
<td style="width:140px; padding:3px;"><select class="money-id-dlg" style="width:140px;"></select></td> <td style="width:100px; padding:3px;"><input class="other-money-dlg" style="width:100px;"/></td>
<td style="width:100px; padding:3px;"><input class="other-money-dlg" style="width:100px;"/></td> </tr>
</tr> </table>
</table> </div>
</div> <div id="otherMoneyDlgBtn">
<div id="otherMoneyDlgBtn"> <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> </body>
</body>
</html> </html>
\ No newline at end of file
erp_web/pages/materials/sale_out_list.html
View file @ 06ad056f
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>销售出库</title> <title>销售出库</title>
<meta charset="utf-8"> <meta charset="utf-8">
<!-- 指定以IE8的方式来渲染 --> <!-- 指定以IE8的方式来渲染 -->
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/> <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8"/>
<link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/> <link rel="shortcut icon" href="/images/favicon.ico" type="image/x-icon"/>
<link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/default/easyui.css"/> <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/default/easyui.css"/>
<link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/icon.css"/> <link rel="stylesheet" type="text/css" href="/js/easyui-1.3.5/themes/icon.css"/>
<link type="text/css" rel="stylesheet" href="/css/common.css"/> <link type="text/css" rel="stylesheet" href="/css/common.css"/>
<link type="text/css" rel="stylesheet" href="/css/in_out.css"/> <link type="text/css" rel="stylesheet" href="/css/in_out.css"/>
<script src="/js/jquery-1.8.0.min.js"></script> <script src="/js/jquery-1.8.0.min.js"></script>
<script src="/js/easyui-1.3.5/jquery.easyui.min.js"></script> <script src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
<script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script> <script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
<script src="/js/My97DatePicker/WdatePicker.js"></script> <script src="/js/My97DatePicker/WdatePicker.js"></script>
<script src="/js/common/common.js"></script> <script src="/js/common/common.js"></script>
<script src="/js/pages/materials/in_out.js"></script> <script src="/js/pages/materials/in_out.js"></script>
</head> </head>
<body> <body>
<!-- 查询 --> <!-- 查询 -->
<div id="searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true" <div id="searchPanel" class="easyui-panel" style="padding:3px;" title="查询窗口" iconCls="icon-search" collapsible="true"
closable="false"> closable="false">
<table id="searchTable"> <table id="searchTable">
<tr> <tr>
<td>单据编号：</td> <td>单据编号：</td>
<td> <td>
<input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/> <input type="text" name="searchNumber" id="searchNumber" style="width:100px;"/>
</td> </td>
<td>商品信息：</td> <td>商品信息：</td>
<td> <td>
<input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号" style="width:100px;"/> <input type="text" name="searchMaterial" id="searchMaterial" placeholder="名称，型号" style="width:100px;"/>
</td> </td>
<td>单据日期：</td> <td>单据日期：</td>
<td> <td>
<input type="text" name="searchBeginTime" id="searchBeginTime" <input type="text" name="searchBeginTime" id="searchBeginTime"
onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/> onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" class="txt Wdate" style="width:100px;"/>
</td> </td>
<td>-</td> <td>-</td>
<td> <td>
<input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" <input type="text" name="searchEndTime" id="searchEndTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})"
class="txt Wdate" style="width:100px;"/> class="txt Wdate" style="width:100px;"/>
</td> </td>
<td>&nbsp;</td> <td>&nbsp;</td>
<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-search" id="searchBtn">查询</a>&nbsp;
<a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchResetBtn">重置</a> <a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-redo" id="searchResetBtn">重置</a>
</td> </td>
</tr> </tr>
</table> </table>
</div> </div>
<!-- 数据显示table --> <!-- 数据显示table -->
<div id="tablePanel" class="easyui-panel" style="padding:1px; top:300px;" title="销售出库列表" iconCls="icon-list" <div id="tablePanel" class="easyui-panel" style="padding:1px; top:300px;" title="销售出库列表" iconCls="icon-list"
collapsible="true" closable="false"> collapsible="true" closable="false">
<table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table> <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>
</div> </div>
<div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px" <div id="depotHeadDlg" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true"> closed="true" buttons="#dlg-buttons" modal="true" cache="false" collapsible="false" closable="true">
<form id="depotHeadFM" method="post" novalidate> <form id="depotHeadFM" method="post" novalidate>
<table> <table>
<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;"/> <input id="OrganId" name="OrganId" style="width:130px;"/>
</td> </td>
<td style="width:70px;">销售人员：</td> <td style="width:70px;">销售人员：</td>
<td style="padding:5px"> <td style="padding:5px">
<input id="Salesman" name="Salesman" style="width:130px;"/> <input id="Salesman" name="Salesman" style="width:130px;"/>
</td> </td>
<td style="width:80px;">单据日期：</td> <td style="width:80px;">单据日期：</td>
<td style="padding:5px"> <td style="padding:5px">
<input type="text" name="OperTime" id="OperTime" <input type="text" name="OperTime" id="OperTime"
onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate" onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss'})" class="txt Wdate"
style="width:140px;"/> style="width:140px;" readonly/>
</td> </td>
<td style="width:70px;">单据编号：</td> <td style="width:70px;">单据编号：</td>
<td style="padding:5px"> <td style="padding:5px">
<input name="Number" id="Number" class="easyui-validatebox" <input name="Number" id="Number" class="easyui-validatebox"
data-options="required:true,validType:'length[2,30]'" style="width: 140px;"/> data-options="required:true,validType:'length[2,30]'" style="width: 140px;" readonly/>
</td> </td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
<td colspan="9"> <td colspan="9">
<!-- 商品列表table --> <!-- 商品列表table -->
<table id="materialData" style="top:100px;border-bottom-color:#FFFFFF"></table> <table id="materialData" style="top:100px;border-bottom-color:#FFFFFF"></table>
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="9"> <td colspan="9">
<textarea name="Remark" id="Remark" rows="2" cols="2" placeholder="暂无备注信息" <textarea name="Remark" id="Remark" rows="2" cols="2" placeholder="暂无备注信息"
style="width: 1130px; height:35px;"></textarea> style="width: 1130px; height:35px;"></textarea>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>优惠率：</td> <td>优惠率：</td>
<td style="padding:5px"> <td style="padding:5px">
<input id="Discount" name="Discount" style="width:110px;"/> <input id="Discount" name="Discount" style="width:110px;"/>
% %
</td> </td>
<td>收款优惠：</td> <td>收款优惠：</td>
<td style="padding:5px"> <td style="padding:5px">
<input id="DiscountMoney" name="DiscountMoney" style="width:120px;"/> <input id="DiscountMoney" name="DiscountMoney" style="width:120px;"/>
</td> </td>
<td>优惠后金额：</td> <td>优惠后金额：</td>
<td style="padding:5px"> <td style="padding:5px">
<input id="DiscountLastMoney" name="DiscountLastMoney" readonly="readonly" style="width:120px;"/> <input id="DiscountLastMoney" name="DiscountLastMoney" readonly="readonly" style="width:120px;"/>
</td> </td>
<td>本次收款：</td> <td>本次收款：</td>
<td style="padding:5px"> <td style="padding:5px">
<input id="ChangeAmount" name="ChangeAmount" data-changeamount="0" style="width:120px;"/> <input id="ChangeAmount" name="ChangeAmount" data-changeamount="0" style="width:120px;"/>
</td> </td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
<tr> <tr>
<td>结算账户：</td> <td>结算账户：</td>
<td style="padding:5px"> <td style="padding:5px">
<select name="AccountId" id="AccountId" style="width:120px;"></select> <select name="AccountId" id="AccountId" style="width:120px;"></select>
<img class="many-account-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg" <img class="many-account-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg"
style="display: none;"/> style="display: none;"/>
</td> </td>
<td>本次欠款：</td> <td>本次欠款：</td>
<td style="padding:5px"> <td style="padding:5px">
<input id="Debt" name="Debt" readonly="readonly" style="width:120px;"/> <input id="Debt" name="Debt" readonly="readonly" style="width:120px;"/>
</td> </td>
<td>销售费用：</td> <td>销售费用：</td>
<td style="padding:5px"> <td style="padding:5px">
<input id="OtherMoney" name="OtherMoney" style="width:120px;" readonly="readonly"/> <input id="OtherMoney" name="OtherMoney" style="width:120px;" readonly="readonly"/>
<img class="other-money-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg"/> <img class="other-money-ico" src="/js/easyui-1.3.5/themes/icons/filelist.jpg"/>
</td> </td>
<td>结算天数：</td> <td>结算天数：</td>
<td style="padding:5px"> <td style="padding:5px">
<input id="AccountDay" name="AccountDay" class="easyui-numberbox" <input id="AccountDay" name="AccountDay" class="easyui-numberbox"
data-options="validType:'length[1,3]'" style="width:120px;"/> data-options="validType:'length[1,3]'" style="width:120px;"/>
</td> </td>
<td style="width:100px;"></td> <td style="width:100px;"></td>
</tr> </tr>
</table> </table>
<input type="hidden" name="clientIp" id="clientIp" value="<%=clientIp %>"/> </form>
</form> </div>
</div> <div id="dlg-buttons">
<div id="dlg-buttons"> <a href="javascript:void(0)" id="saveDepotHead" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
<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"
<a href="javascript:void(0)" id="cancelDepotHead" class="easyui-linkbutton" iconCls="icon-cancel" onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a>
onclick="javascript:$('#depotHeadDlg').dialog('close')">取消</a> </div>
</div> <div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px"
<div id="depotHeadDlgShow" class="easyui-dialog" style="width:1200px;padding:10px 20px;top:20px" closed="true" modal="true" cache="false" collapsible="false" closable="true">
closed="true" modal="true" cache="false" collapsible="false" closable="true"> <table>
<table> <tr>
<tr> <td style="width:60px;">客户：</td>
<td style="width:60px;">客户：</td> <td style="padding:5px;width:130px;">
<td style="padding:5px;width:130px;"> <span id="OrganIdShow"></span>
<span id="OrganIdShow"></span> </td>
</td> <td style="width:70px;">销售人员：</td>
<td style="width:70px;">销售人员：</td> <td style="padding:5px;width:130px;">
<td style="padding:5px;width:130px;"> <span id="SalesmanShow"></span>
<span id="SalesmanShow"></span> </td>
</td> <td style="width:80px;">单据日期：</td>
<td style="width:80px;">单据日期：</td> <td style="padding:5px;width:140px;">
<td style="padding:5px;width:140px;"> <span id="OperTimeShow"></span>
<span id="OperTimeShow"></span> </td>
</td> <td style="width:70px;">单据编号：</td>
<td style="width:70px;">单据编号：</td> <td style="padding:5px;width:140px;">
<td style="padding:5px;width:140px;"> <span id="NumberShow"></span>
<span id="NumberShow"></span> </td>
</td> <td style="width:100px;"></td>
<td style="width:100px;"></td> </tr>
</tr> <tr>
<tr> <td colspan="9" style="width: 1130px;">
<td colspan="9" style="width: 1130px;"> <!-- 商品列表table -->
<!-- 商品列表table --> <table id="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table>
<table id="materialDataShow" style="top:100px;border-bottom-color:#FFFFFF"></table> </td>
</td> </tr>
</tr> <tr>
<tr> <td style="width:60px;">单据备注：</td>
<td style="width:60px;">单据备注：</td> <td colspan="8" style="height:35px;">
<td colspan="8" style="height:35px;"> <span id="RemarkShow" style="width: 1070px; height:35px;"></span>
<span id="RemarkShow" style="width: 1070px; height:35px;"></span> </td>
</td> </tr>
</tr> <tr>
<tr> <td>优惠率：</td>
<td>优惠率：</td> <td>
<td> <span id="DiscountShow" style="width: 110px;"></span>
<span id="DiscountShow" style="width: 110px;"></span> %
% </td>
</td> <td>收款优惠：</td>
<td>收款优惠：</td> <td>
<td> <span id="DiscountMoneyShow" style="width: 120px;"></span>
<span id="DiscountMoneyShow" style="width: 120px;"></span> </td>
</td> <td>优惠后金额：</td>
<td>优惠后金额：</td> <td>
<td> <span id="DiscountLastMoneyShow" style="width: 120px;"></span>
<span id="DiscountLastMoneyShow" style="width: 120px;"></span> </td>
</td> <td>本次收款：</td>
<td>本次收款：</td> <td style="padding:5px">
<td style="padding:5px"> <span id="ChangeAmountShow"></span>
<span id="ChangeAmountShow"></span> </td>
</td> <td style="width:100px;"></td>
<td style="width:100px;"></td> </tr>
</tr> <tr>
<tr> <td>结算账户：</td>
<td>结算账户：</td> <td style="padding:5px">
<td style="padding:5px"> <span id="AccountIdShow"></span>
<span id="AccountIdShow"></span> </td>
</td> <td>本次欠款：</td>
<td>本次欠款：</td> <td style="padding:5px">
<td style="padding:5px"> <span id="DebtShow"></span>
<span id="DebtShow"></span> </td>
</td> <td>销售费用：</td>
<td>销售费用：</td> <td style="padding:5px">
<td style="padding:5px"> <span id="OtherMoneyShow"></span>
<span id="OtherMoneyShow"></span> </td>
</td> <td>结算天数：</td>
<td>结算天数：</td> <td style="padding:5px">
<td style="padding:5px"> <span id="AccountDayShow"></span>
<span id="AccountDayShow"></span> </td>
</td> <td style="width:100px;"></td>
<td style="width:100px;"></td> </tr>
</tr> </table>
</table> </div>
</div> <div id="depotHeadAccountDlg" class="easyui-dialog" style="width:380px;padding:10px 20px;top:80px"
<div id="depotHeadAccountDlg" class="easyui-dialog" style="width:380px;padding:10px 20px;top:80px" closed="true" modal="true" buttons="#accountDlgButtons" cache="false" collapsible="false" closable="true">
closed="true" modal="true" buttons="#accountDlgButtons" cache="false" collapsible="false" closable="true"> <table class="account-dlg">
<table class="account-dlg"> <tr class="account-head-tmp">
<tr class="account-head-tmp"> <td style="width:30px;"></td>
<td style="width:30px;"></td> <td style="width:140px; padding:5px;">结算账户</td>
<td style="width:140px; padding:5px;">结算账户</td> <td style="width:100px; padding:5px;">金额</td>
<td style="width:100px; padding:5px;">金额</td> </tr>
</tr> <tr>
<tr> <td style="width:30px;"></td>
<td style="width:30px;"></td> <td style="width:140px;text-align: center;">合计：</td>
<td style="width:140px;text-align: center;">合计：</td> <td style="width:100px;"><span id="accountMoneyTotalDlg"></span></td>
<td style="width:100px;"><span id="accountMoneyTotalDlg"></span></td> </tr>
</tr> </table>
</table> <table class="tabs-tmp">
<table class="tabs-tmp"> <tr class="account-content-tmp">
<tr class="account-content-tmp"> <td style="width:30px;"></td>
<td style="width:30px;"></td> <td style="width:140px; padding:3px;"><select class="account-id-dlg" style="width:140px;"></select></td>
<td style="width:140px; padding:3px;"><select class="account-id-dlg" style="width:140px;"></select></td> <td style="width:100px; padding:3px;"><input class="account-money-dlg" style="width:100px;"/></td>
<td style="width:100px; padding:3px;"><input class="account-money-dlg" style="width:100px;"/></td> </tr>
</tr> </table>
</table> </div>
</div> <div id="accountDlgButtons">
<div id="accountDlgButtons"> <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="otherMoneyDlg" class="easyui-dialog" style="width:380px;padding:10px 20px;top:80px"
<div id="otherMoneyDlg" class="easyui-dialog" style="width:380px;padding:10px 20px;top:80px" closed="true" modal="true" buttons="#otherMoneyDlgBtn" cache="false" collapsible="false" closable="true">
closed="true" modal="true" buttons="#otherMoneyDlgBtn" cache="false" collapsible="false" closable="true"> <table class="money-dlg">
<table class="money-dlg"> <tr class="money-head-tmp">
<tr class="money-head-tmp"> <td style="width:30px;"></td>
<td style="width:30px;"></td> <td style="width:140px; padding:5px;">结算账户</td>
<td style="width:140px; padding:5px;">结算账户</td> <td style="width:100px; padding:5px;">金额</td>
<td style="width:100px; padding:5px;">金额</td> </tr>
</tr> <tr>
<tr> <td style="width:30px;"></td>
<td style="width:30px;"></td> <td style="width:140px;text-align: center;">合计：</td>
<td style="width:140px;text-align: center;">合计：</td> <td style="width:100px;"><span id="otherMoneyTotalDlg"></span></td>
<td style="width:100px;"><span id="otherMoneyTotalDlg"></span></td> </tr>
</tr> </table>
</table> <table class="tabs-tmp">
<table class="tabs-tmp"> <tr class="money-content-tmp">
<tr class="money-content-tmp"> <td style="width:30px;"></td>
<td style="width:30px;"></td> <td style="width:140px; padding:3px;"><select class="money-id-dlg" style="width:140px;"></select></td>
<td style="width:140px; padding:3px;"><select class="money-id-dlg" style="width:140px;"></select></td> <td style="width:100px; padding:3px;"><input class="other-money-dlg" style="width:100px;"/></td>
<td style="width:100px; padding:3px;"><input class="other-money-dlg" style="width:100px;"/></td> </tr>
</tr> </table>
</table> </div>
</div> <div id="otherMoneyDlgBtn">
<div id="otherMoneyDlgBtn"> <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>
</body>
</body>
</html> </html>
\ No newline at end of file
sql/jsh_erp.sql
View file @ 06ad056f
...@@ -5253,8 +5253,8 @@ ALTER TABLE jsh_depotitem DROP FOREIGN KEY jsh_depotitem_ibfk_1; ...@@ -5253,8 +5253,8 @@ ALTER TABLE jsh_depotitem DROP FOREIGN KEY jsh_depotitem_ibfk_1;
DROP TABLE IF EXISTS `tbl_sequence`; DROP TABLE IF EXISTS `tbl_sequence`;
CREATE TABLE tbl_sequence ( CREATE TABLE tbl_sequence (
seq_name VARCHAR(50) NOT NULL COMMENT '序列名称', seq_name VARCHAR(50) NOT NULL COMMENT '序列名称',
minvalue bigint(20) NOT NULL COMMENT '最小值', min_value bigint(20) NOT NULL COMMENT '最小值',
maxvalue bigint(20) NOT NULL COMMENT '最大值', max_value bigint(20) NOT NULL COMMENT '最大值',
current_val bigint(20) NOT NULL COMMENT '当前值', current_val bigint(20) NOT NULL COMMENT '当前值',
increment_val INT DEFAULT '1' NOT NULL COMMENT '增长步数', increment_val INT DEFAULT '1' NOT NULL COMMENT '增长步数',
remark VARCHAR(500) DEFAULT null COMMENT '备注', remark VARCHAR(500) DEFAULT null COMMENT '备注',
...@@ -5264,7 +5264,7 @@ CREATE TABLE tbl_sequence ( ...@@ -5264,7 +5264,7 @@ CREATE TABLE tbl_sequence (
-- ---------------------------- -- ----------------------------
-- 添加表单据编号sequence -- 添加表单据编号sequence
-- ---------------------------- -- ----------------------------
insert into tbl_sequence (seq_name, minvalue, maxvalue, current_val, increment_val,remark) values ('depot_number_seq', 1, 999999999999999999, 1, 1,'单据编号sequence'); insert into tbl_sequence (seq_name, min_value, max_value, current_val, increment_val,remark) values ('depot_number_seq', 1, 999999999999999999, 1, 1,'单据编号sequence');
-- ---------------------------- -- ----------------------------
-- 创建function _nextval() 用于获取当前序列号 -- 创建function _nextval() 用于获取当前序列号
-- ---------------------------- -- ----------------------------
...@@ -5276,7 +5276,7 @@ declare _cur bigint; ...@@ -5276,7 +5276,7 @@ declare _cur bigint;
declare _maxvalue bigint; -- 接收最大值 declare _maxvalue bigint; -- 接收最大值
declare _increment int; -- 接收增长步数 declare _increment int; -- 接收增长步数
set _increment = (select increment_val from tbl_sequence where seq_name = name); set _increment = (select increment_val from tbl_sequence where seq_name = name);
set _maxvalue = (select maxvalue from tbl_sequence where seq_name = name); set _maxvalue = (select max_value from tbl_sequence where seq_name = name);
set _cur = (select current_val from tbl_sequence where seq_name = name for update); set _cur = (select current_val from tbl_sequence where seq_name = name for update);
update tbl_sequence -- 更新当前值 update tbl_sequence -- 更新当前值
set current_val = _cur + increment_val set current_val = _cur + increment_val
......
src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
View file @ 06ad056f
...@@ -315,20 +315,25 @@ public class DepotHeadService { ...@@ -315,20 +315,25 @@ public class DepotHeadService {
//判断用户是否已经登录过，登录过不再处理 //判断用户是否已经登录过，登录过不再处理
User userInfo=userService.getCurrentUser(); User userInfo=userService.getCurrentUser();
depotHead.setOperpersonname(userInfo==null?null:userInfo.getUsername()); depotHead.setOperpersonname(userInfo==null?null:userInfo.getUsername());
//构造新的编号 /**
String dNumber = depotHead.getDefaultnumber(); * 2019-02-02
String number = dNumber.substring(0, 12); //截取前缀 * 使用最新生成的唯一单据编号，理论上可以保证唯一性
String beginTime = Tools.getNow() + " 00:00:00"; * 保存时就不再加判断，提高程序的效率
String endTime = Tools.getNow() + " 23:59:59"; * */
String newNumber = buildNumber(depotHead.getType(), depotHead.getSubtype(), beginTime, endTime); //从数据库查询最新的编号+1,这样能防止重复 // //构造新的编号
String allNewNumber = number + newNumber; // String dNumber = depotHead.getDefaultnumber();
String frontNumber = depotHead.getNumber(); // String number = dNumber.substring(0, 12); //截取前缀
if(frontNumber.indexOf(number) > -1) { // String beginTime = Tools.getNow() + " 00:00:00";
depotHead.setNumber(allNewNumber); //从后台取值 // String endTime = Tools.getNow() + " 23:59:59";
} else { // String newNumber = buildNumber(depotHead.getType(), depotHead.getSubtype(), beginTime, endTime); //从数据库查询最新的编号+1,这样能防止重复
depotHead.setNumber(frontNumber); //从前端文本框里面获取 // String allNewNumber = number + newNumber;
} // String frontNumber = depotHead.getNumber();
depotHead.setDefaultnumber(allNewNumber); //初始编号，一直都从后台取值 // if(frontNumber.indexOf(number) > -1) {
// depotHead.setNumber(allNewNumber); //从后台取值
// } else {
// depotHead.setNumber(frontNumber); //从前端文本框里面获取
// }
// depotHead.setDefaultnumber(allNewNumber); //初始编号，一直都从后台取值
depotHead.setCreatetime(new Timestamp(System.currentTimeMillis())); depotHead.setCreatetime(new Timestamp(System.currentTimeMillis()));
depotHead.setStatus(false); depotHead.setStatus(false);
depotHeadMapperEx.adddepotHead(depotHead); depotHeadMapperEx.adddepotHead(depotHead);
...@@ -396,7 +401,8 @@ public class DepotHeadService { ...@@ -396,7 +401,8 @@ public class DepotHeadService {
/**回收序列号*/ /**回收序列号*/
if(depotItemList!=null&&depotItemList.size()>0){ if(depotItemList!=null&&depotItemList.size()>0){
for(DepotItem depotItem:depotItemList){ for(DepotItem depotItem:depotItemList){
serialNumberService.cancelSerialNumber(depotItem.getMaterialid(), depotItem.getHeaderid(),depotItem.getOpernumber().intValue(),userInfo); //BasicNumber=OperNumber*ratio
serialNumberService.cancelSerialNumber(depotItem.getMaterialid(), depotItem.getHeaderid(),depotItem.getBasicnumber().intValue(),userInfo);
} }
} }
} }
......
src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
View file @ 06ad056f
...@@ -224,7 +224,11 @@ public class DepotItemService { ...@@ -224,7 +224,11 @@ public class DepotItemService {
return depotItemMapperEx.findGiftByTypeOut(subType, ProjectId, MId); return depotItemMapperEx.findGiftByTypeOut(subType, ProjectId, MId);
} }
} }
/**
* 2019-02-02修改
* 我之前对操作数量的理解有偏差
* 这里重点重申一下：BasicNumber=OperNumber*ratio
* */
@Transactional(value = "transactionManager", rollbackFor = Exception.class) @Transactional(value = "transactionManager", rollbackFor = Exception.class)
public String saveDetials(String inserted, String deleted, String updated, Long headerId) throws Exception{ public String saveDetials(String inserted, String deleted, String updated, Long headerId) throws Exception{
//查询单据主表信息 //查询单据主表信息
...@@ -259,7 +263,7 @@ public class DepotItemService { ...@@ -259,7 +263,7 @@ public class DepotItemService {
continue; continue;
} }
if(BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableSerialNumber())){ if(BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableSerialNumber())){
serialNumberMapperEx.cancelSerialNumber(depotItem.getMaterialid(),depotItem.getHeaderid(),depotItem.getOpernumber().intValue(), serialNumberMapperEx.cancelSerialNumber(depotItem.getMaterialid(),depotItem.getHeaderid(),depotItem.getBasicnumber().intValue(),
new Date(),userInfo==null?null:userInfo.getId()); new Date(),userInfo==null?null:userInfo.getId());
} }
} }
...@@ -279,14 +283,18 @@ public class DepotItemService { ...@@ -279,14 +283,18 @@ public class DepotItemService {
String Unit = tempInsertedJson.get("Unit").toString(); String Unit = tempInsertedJson.get("Unit").toString();
BigDecimal oNumber = tempInsertedJson.getBigDecimal("OperNumber"); BigDecimal oNumber = tempInsertedJson.getBigDecimal("OperNumber");
Long mId = Long.parseLong(tempInsertedJson.get("MaterialId").toString()); Long mId = Long.parseLong(tempInsertedJson.get("MaterialId").toString());
/***
* 为什么调用的方法要先把基础单位去掉，去掉之后后续还能获取到？
* */
//以下进行单位换算 //以下进行单位换算
String UnitName = findUnitName(mId); //查询计量单位名称 // String UnitName = findUnitName(mId); //查询计量单位名称
if (!StringUtil.isEmpty(UnitName)) { String unitName = materialService.findUnitName(mId);
String UnitList = UnitName.substring(0, UnitName.indexOf("(")); if (!StringUtil.isEmpty(unitName)) {
String RatioList = UnitName.substring(UnitName.indexOf("(")); String unitList = unitName.substring(0, unitName.indexOf("("));
String basicUnit = UnitList.substring(0, UnitList.indexOf(",")); //基本单位 String ratioList = unitName.substring(unitName.indexOf("("));
String otherUnit = UnitList.substring(UnitList.indexOf(",") + 1); //副单位 String basicUnit = unitList.substring(0, unitList.indexOf(",")); //基本单位
Integer ratio = Integer.parseInt(RatioList.substring(RatioList.indexOf(":") + 1).replace(")", "")); //比例 String otherUnit = unitList.substring(unitList.indexOf(",") + 1); //副单位
Integer ratio = Integer.parseInt(ratioList.substring(ratioList.indexOf(":") + 1).replace(")", "")); //比例
if (Unit.equals(basicUnit)) { //如果等于基础单位 if (Unit.equals(basicUnit)) { //如果等于基础单位
depotItem.setBasicnumber(oNumber); //数量一致 depotItem.setBasicnumber(oNumber); //数量一致
} else if (Unit.equals(otherUnit)) { //如果等于副单位 } else if (Unit.equals(otherUnit)) { //如果等于副单位
...@@ -353,7 +361,7 @@ public class DepotItemService { ...@@ -353,7 +361,7 @@ public class DepotItemService {
if(material==null){ if(material==null){
continue; continue;
} }
if(getCurrentInStock(depotItem.getMaterialid())<depotItem.getOpernumber().intValue()){ if(getCurrentInStock(depotItem.getMaterialid())<depotItem.getBasicnumber().intValue()){
throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_STOCK_NOT_ENOUGH_CODE, throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_STOCK_NOT_ENOUGH_CODE,
String.format(ExceptionConstants.MATERIAL_STOCK_NOT_ENOUGH_MSG,material==null?"":material.getName())); String.format(ExceptionConstants.MATERIAL_STOCK_NOT_ENOUGH_MSG,material==null?"":material.getName()));
} }
...@@ -391,9 +399,13 @@ public class DepotItemService { ...@@ -391,9 +399,13 @@ public class DepotItemService {
* 判断商品是否开启序列号，开启的收回序列号，未开启的跳过 * 判断商品是否开启序列号，开启的收回序列号，未开启的跳过
* */ * */
if(BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableSerialNumber())) { if(BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableSerialNumber())) {
serialNumberMapperEx.cancelSerialNumber(depotItem.getMaterialid(), depotItem.getHeaderid(), depotItem.getOpernumber().intValue(), serialNumberMapperEx.cancelSerialNumber(depotItem.getMaterialid(), depotItem.getHeaderid(), depotItem.getBasicnumber().intValue(),
new Date(), userInfo == null ? null : userInfo.getId()); new Date(), userInfo == null ? null : userInfo.getId());
} }
/**收回序列号的时候释放库存*/
depotItem.setOpernumber(BigDecimal.ZERO);
depotItem.setBasicnumber(BigDecimal.ZERO);
this.updateDepotItemWithObj(depotItem);
} }
depotItem.setId(tempUpdatedJson.getLong("Id")); depotItem.setId(tempUpdatedJson.getLong("Id"));
depotItem.setMaterialid(tempUpdatedJson.getLong("MaterialId")); depotItem.setMaterialid(tempUpdatedJson.getLong("MaterialId"));
...@@ -405,13 +417,14 @@ public class DepotItemService { ...@@ -405,13 +417,14 @@ public class DepotItemService {
BigDecimal oNumber = tempUpdatedJson.getBigDecimal("OperNumber"); BigDecimal oNumber = tempUpdatedJson.getBigDecimal("OperNumber");
Long mId = Long.parseLong(tempUpdatedJson.get("MaterialId").toString()); Long mId = Long.parseLong(tempUpdatedJson.get("MaterialId").toString());
//以下进行单位换算 //以下进行单位换算
String UnitName = findUnitName(mId); //查询计量单位名称 // String UnitName = findUnitName(mId); //查询计量单位名称
if (!StringUtil.isEmpty(UnitName)) { String unitName = materialService.findUnitName(mId);
String UnitList = UnitName.substring(0, UnitName.indexOf("(")); if (!StringUtil.isEmpty(unitName)) {
String RatioList = UnitName.substring(UnitName.indexOf("(")); String unitList = unitName.substring(0, unitName.indexOf("("));
String basicUnit = UnitList.substring(0, UnitList.indexOf(",")); //基本单位 String ratioList = unitName.substring(unitName.indexOf("("));
String otherUnit = UnitList.substring(UnitList.indexOf(",") + 1); //副单位 String basicUnit = unitList.substring(0, unitList.indexOf(",")); //基本单位
Integer ratio = Integer.parseInt(RatioList.substring(RatioList.indexOf(":") + 1).replace(")", "")); //比例 String otherUnit = unitList.substring(unitList.indexOf(",") + 1); //副单位
Integer ratio = Integer.parseInt(ratioList.substring(ratioList.indexOf(":") + 1).replace(")", "")); //比例
if (Unit.equals(basicUnit)) { //如果等于基础单位 if (Unit.equals(basicUnit)) { //如果等于基础单位
depotItem.setBasicnumber(oNumber); //数量一致 depotItem.setBasicnumber(oNumber); //数量一致
} else if (Unit.equals(otherUnit)) { //如果等于副单位 } else if (Unit.equals(otherUnit)) { //如果等于副单位
...@@ -457,7 +470,7 @@ public class DepotItemService { ...@@ -457,7 +470,7 @@ public class DepotItemService {
depotItem.setMtype(tempUpdatedJson.getString("MType")); depotItem.setMtype(tempUpdatedJson.getString("MType"));
/**出库时处理序列号*/ /**出库时处理序列号*/
if(BusinessConstants.DEPOTHEAD_TYPE_OUT.equals(depotHead.getType())){ if(BusinessConstants.DEPOTHEAD_TYPE_OUT.equals(depotHead.getType())){
if(getCurrentInStock(depotItem.getMaterialid())<depotItem.getOpernumber().intValue()){ if(getCurrentInStock(depotItem.getMaterialid())<depotItem.getBasicnumber().intValue()){
throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_STOCK_NOT_ENOUGH_CODE, throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_STOCK_NOT_ENOUGH_CODE,
String.format(ExceptionConstants.MATERIAL_STOCK_NOT_ENOUGH_MSG,material==null?"":material.getName())); String.format(ExceptionConstants.MATERIAL_STOCK_NOT_ENOUGH_MSG,material==null?"":material.getName()));
} }
......
src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java
View file @ 06ad056f
...@@ -286,14 +286,15 @@ public class SerialNumberService { ...@@ -286,14 +286,15 @@ public class SerialNumberService {
if(depotItem!=null){ if(depotItem!=null){
//查询商品下已分配的可用序列号数量 //查询商品下已分配的可用序列号数量
int SerialNumberSum= serialNumberMapperEx.countSerialNumberByMaterialIdAndDepotheadId(depotItem.getMaterialid(),null,BusinessConstants.IS_SELL_HOLD); int SerialNumberSum= serialNumberMapperEx.countSerialNumberByMaterialIdAndDepotheadId(depotItem.getMaterialid(),null,BusinessConstants.IS_SELL_HOLD);
if(depotItem.getOpernumber().intValue()>SerialNumberSum){ //BasicNumber=OperNumber*ratio
if(depotItem.getBasicnumber().intValue()>SerialNumberSum){
//获取商品名称 //获取商品名称
Material material= materialMapper.selectByPrimaryKey(depotItem.getMaterialid()); Material material= materialMapper.selectByPrimaryKey(depotItem.getMaterialid());
throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_SERIAL_NUMBERE_NOT_ENOUGH_CODE, throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_SERIAL_NUMBERE_NOT_ENOUGH_CODE,
String.format(ExceptionConstants.MATERIAL_SERIAL_NUMBERE_NOT_ENOUGH_MSG,material==null?"":material.getName())); String.format(ExceptionConstants.MATERIAL_SERIAL_NUMBERE_NOT_ENOUGH_MSG,material==null?"":material.getName()));
} }
//商品下序列号充足，分配序列号 //商品下序列号充足，分配序列号
sellSerialNumber(depotItem.getMaterialid(),depotItem.getHeaderid(),depotItem.getOpernumber().intValue(),userInfo); sellSerialNumber(depotItem.getMaterialid(),depotItem.getHeaderid(),depotItem.getBasicnumber().intValue(),userInfo);
} }
} }
......
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