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

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

Merge pull request !25 from 乾坤平台/master
parents 86e7b3e7 01905d2a
...@@ -611,7 +611,6 @@ ...@@ -611,7 +611,6 @@
//增加 //增加
function addAccountHead(){ function addAccountHead(){
$("#clientIp").val(clientIp);
$('#accountHeadFM').form('clear'); $('#accountHeadFM').form('clear');
var thisDateTime = getNowFormatDateTime(); //当前时间 var thisDateTime = getNowFormatDateTime(); //当前时间
$("#BillTime").val(thisDateTime); $("#BillTime").val(thisDateTime);
...@@ -643,7 +642,6 @@ ...@@ -643,7 +642,6 @@
//编辑信息 //编辑信息
function editAccountHead(accountHeadTotalInfo){ function editAccountHead(accountHeadTotalInfo){
var accountHeadInfo = accountHeadTotalInfo.split("AaBb"); var accountHeadInfo = accountHeadTotalInfo.split("AaBb");
$("#clientIp").val(clientIp);
$("#BillNo").val(accountHeadInfo[1]); $("#BillNo").val(accountHeadInfo[1]);
$("#BillTime").val(accountHeadInfo[2]); $("#BillTime").val(accountHeadInfo[2]);
$("#Remark").val(accountHeadInfo[3]); $("#Remark").val(accountHeadInfo[3]);
......
...@@ -1523,7 +1523,6 @@ ...@@ -1523,7 +1523,6 @@
//新增信息 //新增信息
function addDepotHead(){ function addDepotHead(){
$("#clientIp").val(clientIp);
$('#depotHeadFM').form('clear'); $('#depotHeadFM').form('clear');
var thisDateTime = getNowFormatDateTime(); //当前时间 var thisDateTime = getNowFormatDateTime(); //当前时间
$("#OperTime").val(thisDateTime); $("#OperTime").val(thisDateTime);
...@@ -1625,7 +1624,6 @@ ...@@ -1625,7 +1624,6 @@
return; return;
} }
var depotHeadInfo = depotHeadTotalInfo.split("AaBb"); var depotHeadInfo = depotHeadTotalInfo.split("AaBb");
$("#clientIp").val(clientIp);
if(listSubType==="礼品销售"){ if(listSubType==="礼品销售"){
$("#GiftId").combobox('setValue',depotHeadInfo[1]); $("#GiftId").combobox('setValue',depotHeadInfo[1]);
} }
......
...@@ -68,12 +68,12 @@ ...@@ -68,12 +68,12 @@
<td style="padding:5px;width:170px;"> <td style="padding:5px;width:170px;">
<input type="text" name="BillTime" id="BillTime" <input type="text" name="BillTime" id="BillTime"
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:80px;">单据编号:</td> <td style="width:80px;">单据编号:</td>
<td style="padding:5px;width:170px;"> <td style="padding:5px;width:170px;">
<input name="BillNo" id="BillNo" class="easyui-validatebox" <input name="BillNo" id="BillNo" 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>
...@@ -97,7 +97,6 @@ ...@@ -97,7 +97,6 @@
</td> </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">
......
...@@ -64,12 +64,12 @@ ...@@ -64,12 +64,12 @@
<td style="padding:5px;width:170px;"> <td style="padding:5px;width:170px;">
<input type="text" name="BillTime" id="BillTime" <input type="text" name="BillTime" id="BillTime"
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:80px;">单据编号:</td> <td style="width:80px;">单据编号:</td>
<td style="padding:5px;width:170px;"> <td style="padding:5px;width:170px;">
<input name="BillNo" id="BillNo" class="easyui-validatebox" <input name="BillNo" id="BillNo" 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:70px;"></td> <td style="width:70px;"></td>
<td style="padding:5px"> <td style="padding:5px">
......
...@@ -68,12 +68,12 @@ ...@@ -68,12 +68,12 @@
<td style="padding:5px;width:170px;"> <td style="padding:5px;width:170px;">
<input type="text" name="BillTime" id="BillTime" <input type="text" name="BillTime" id="BillTime"
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;width:170px;"> <td style="padding:5px;width:170px;">
<input name="BillNo" id="BillNo" class="easyui-validatebox" <input name="BillNo" id="BillNo" 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>
......
...@@ -68,12 +68,12 @@ ...@@ -68,12 +68,12 @@
<td style="padding:5px;width:170px;"> <td style="padding:5px;width:170px;">
<input type="text" name="BillTime" id="BillTime" <input type="text" name="BillTime" id="BillTime"
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;width:170px;"> <td style="padding:5px;width:170px;">
<input name="BillNo" id="BillNo" class="easyui-validatebox" <input name="BillNo" id="BillNo" 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>
......
...@@ -68,12 +68,12 @@ ...@@ -68,12 +68,12 @@
<td style="padding:5px;width:170px;"> <td style="padding:5px;width:170px;">
<input type="text" name="BillTime" id="BillTime" <input type="text" name="BillTime" id="BillTime"
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;width:170px;"> <td style="padding:5px;width:170px;">
<input name="BillNo" id="BillNo" class="easyui-validatebox" <input name="BillNo" id="BillNo" 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>
......
...@@ -67,12 +67,12 @@ ...@@ -67,12 +67,12 @@
<td style="width:70px;">单据日期:</td> <td style="width:70px;">单据日期:</td>
<td style="padding:5px;width:170px;"> <td style="padding:5px;width:170px;">
<input type="text" name="BillTime" id="BillTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})" <input type="text" name="BillTime" id="BillTime" onClick="WdatePicker({dateFmt:'yyyy-MM-dd'})"
class="txt Wdate" style="width:140px;"/> class="txt Wdate" style="width:140px;" readonly/>
</td> </td>
<td style="width:70px;">单据编号:</td> <td style="width:70px;">单据编号:</td>
<td style="padding:5px;width:170px;"> <td style="padding:5px;width:170px;">
<input name="BillNo" id="BillNo" class="easyui-validatebox" <input name="BillNo" id="BillNo" 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>
......
...@@ -105,7 +105,6 @@ ...@@ -105,7 +105,6 @@
</td> </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">
......
...@@ -65,12 +65,12 @@ ...@@ -65,12 +65,12 @@
<td style="padding:5px;width:170px;"> <td style="padding:5px;width:170px;">
<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:80px;"></td> <td style="width:80px;"></td>
<td style="padding:5px;width:170px;"></td> <td style="padding:5px;width:170px;"></td>
......
...@@ -16,11 +16,6 @@ ...@@ -16,11 +16,6 @@
<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>
<script>
var kid = ${sessionScope.user.id};
var path = "<%=path%>";
var clientIp = "<%=clientIp%>";
</script>
</head> </head>
<body> <body>
<!-- 查询 --> <!-- 查询 -->
...@@ -70,12 +65,12 @@ ...@@ -70,12 +65,12 @@
<td style="padding:5px;width:170px;"> <td style="padding:5px;width:170px;">
<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:80px;"></td> <td style="width:80px;"></td>
<td style="padding:5px;width:170px;"></td> <td style="padding:5px;width:170px;"></td>
...@@ -96,7 +91,6 @@ ...@@ -96,7 +91,6 @@
</td> </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">
......
...@@ -70,12 +70,12 @@ ...@@ -70,12 +70,12 @@
<td style="padding:5px;width:170px;"> <td style="padding:5px;width:170px;">
<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:80px;"></td> <td style="width:80px;"></td>
<td style="padding:5px;width:170px;"></td> <td style="padding:5px;width:170px;"></td>
......
...@@ -65,12 +65,12 @@ ...@@ -65,12 +65,12 @@
<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></td> <td></td>
<td></td> <td></td>
...@@ -91,7 +91,6 @@ ...@@ -91,7 +91,6 @@
</td> </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">
......
...@@ -65,12 +65,12 @@ ...@@ -65,12 +65,12 @@
<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></td> <td></td>
<td></td> <td></td>
......
...@@ -75,12 +75,12 @@ ...@@ -75,12 +75,12 @@
<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:80px;">单据编号:</td> <td style="width:80px;">单据编号:</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:70px;"></td> <td style="width:70px;"></td>
<td style="padding:5px"> <td style="padding:5px">
...@@ -100,7 +100,6 @@ ...@@ -100,7 +100,6 @@
</td> </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">
......
...@@ -69,12 +69,12 @@ ...@@ -69,12 +69,12 @@
<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:80px;">单据编号:</td> <td style="width:80px;">单据编号:</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:70px;"></td> <td style="width:70px;"></td>
<td style="padding:5px"> <td style="padding:5px">
...@@ -94,7 +94,6 @@ ...@@ -94,7 +94,6 @@
</td> </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">
......
...@@ -75,12 +75,12 @@ ...@@ -75,12 +75,12 @@
<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:80px;">单据编号:</td> <td style="width:80px;">单据编号:</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:70px;"></td> <td style="width:70px;"></td>
<td style="padding:5px"> <td style="padding:5px">
......
...@@ -75,12 +75,12 @@ ...@@ -75,12 +75,12 @@
<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:80px;">单据编号:</td> <td style="width:80px;">单据编号:</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:70px;"></td> <td style="width:70px;"></td>
<td style="padding:5px"> <td style="padding:5px">
......
...@@ -69,12 +69,12 @@ ...@@ -69,12 +69,12 @@
<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:80px;">单据编号:</td> <td style="width:80px;">单据编号:</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:70px;"></td> <td style="width:70px;"></td>
<td style="padding:5px;width:150px;"></td> <td style="padding:5px;width:150px;"></td>
......
...@@ -69,12 +69,12 @@ ...@@ -69,12 +69,12 @@
<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:80px;">单据编号:</td> <td style="width:80px;">单据编号:</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:70px;">付款类型:</td> <td style="width:70px;">付款类型:</td>
<td style="padding:5px;width:150px;"> <td style="padding:5px;width:150px;">
......
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