From b0c4fd3d7c914dd8aee43804fa77f1ee5d04a11d Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 06 三月 2023 09:10:32 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html | 710 +++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 493 insertions(+), 217 deletions(-)
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
index 0562655..32b2be7 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html"
@@ -9,7 +9,7 @@
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<style>
-
+
.layui-col-xs8 {
width: 55.666667%;
}
@@ -62,27 +62,12 @@
<div class="layui-form-item">
<div class="layui-row">
<div class="layui-col-xs3">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁绫诲瀷</label>
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟绫诲瀷</label>
</div>
<div class="layui-col-xs8">
<select name=" HBillType" id="HBillType">
<option value="1402">鍙戣揣閫氱煡鍗�</option>
<option value="1401">閿�鍞鍗�</option>
- </select>
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <div class="layui-row">
- <div class="layui-col-xs3">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">鎵弿绫诲瀷</label>
- </div>
- <div class="layui-col-xs8">
- <select name=" HScanStyle" id="HScanStyle">
- <option value="鏁存墭鎵爜">鏁存墭鎵爜</option>
- <option value="鍗曚釜鎷嗙爜">鍗曚釜鎷嗙爜</option>
- <option value="鍙嶅悜鎷嗙爜">鍙嶅悜鎷嗙爜</option>
- <option value="鏁存墭鍒犻櫎">鏁存墭鍒犻櫎</option>
</select>
</div>
</div>
@@ -97,6 +82,45 @@
</div>
<div class="layui-col-xs2">
<button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin2">纭畾</button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鎵弿绫诲瀷</label>
+ </div>
+ <div class="layui-col-xs8">
+ <select name=" HScanStyle" id="HScanStyle" disabled:"disabled">
+ <option value="鏁存墭鎵爜">鏁存墭鎵爜</option>
+ <option value="鍗曚釜鎷嗙爜">鍗曚釜鎷嗙爜</option>
+ <option value="鍙嶅悜鎷嗙爜">鍙嶅悜鎷嗙爜</option>
+ <option value="鏁存墭鍒犻櫎">鏁存墭鍒犻櫎</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鍏堣繘鍏堝嚭浠撳簱</label>
+ </div>
+ <div class="layui-col-xs6">
+ <input type="text" name="HWHNAME_FIFO" id="HWHNAME_FIFO" lay-verify="HWHNAME_FIFO" autocomplete="off" class="layui-input">
+ <input type="hidden" name="HWHID_FIFO" id="HWHID_FIFO" lay-verify="HWHID_FIFO" value="0" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs3">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HWHID_FIFO-BT" disabled:"disabled">...</button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鏃ユ湡</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="date" name="HDate" id="HDate" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -127,7 +151,7 @@
<input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
</div>
<div class="layui-col-xs3">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT" >...</button>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT">...</button>
</div>
</div>
</div>
@@ -216,20 +240,21 @@
<!--鐗╂枡娓呭崟-->
<div class="layui-tab-item">
- <!--<div class="layui-form-item" style="padding:0px;margin:0px">
- <div class="layui-row">
- <div class="layui-col-xs4">
- <label class="layui-form-label" style="width:40px;padding-left:0px;">鏉＄爜</label>
- </div>
- <div class="layui-col-xs8">
- <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
- </div>
- </div>
- </div>-->
+ <div class="layui-form-item" style="padding:0px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs4">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鏉＄爜</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
<table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
</div>
<!--鏄庣粏娓呭崟-->
+
<div class="layui-tab-item">
<table class="layui-hide" id="mx-table" lay-filter="mx-table"></table>
</div>
@@ -313,14 +338,13 @@
index: 'lib/index' //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'laydate', 'table', 'element'], function () {
var $ = layui.$
- , admin = layui.admin
- , layer = layui.layer
- , table = layui.table
- , form = layui.form
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
, element = layui.element;
-
-
-
+ var HStockOrgID = sessionStorage["OrganizationID"]
var option = [];
//婧愬崟鎵捐揣鍒楄〃
@@ -331,7 +355,7 @@
, page: true
, cellMinWidth: 90
, cols: [[
- { field: '鍦ㄥ簱鐘舵��', title: '鍦ㄥ簱鐘舵��',width:180 }
+ { field: '鍦ㄥ簱鐘舵��', title: '鍦ㄥ簱鐘舵��', width: 180 }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
, { field: '鎵规', title: '鎵规' }
, { field: '鏁伴噺', title: '鏁伴噺' }
@@ -365,8 +389,21 @@
$("#HMakerID").hide();
$("#HBillerID").val(sessionStorage["HBillerID"]);
$("#HBillerID").hide();
+ $("#HDate").val(formatDate(sessionStorage["HDate"]));
var HSourceFlag = sessionStorage["SourceFlag"];
+ // 缂栬緫鑾峰彇琛ㄥご鏃舵椂闂存牸寮忕煫姝ｆ柟寮�
+ function formatDate(date) {
+ var d = new Date(date),
+ month = '' + (d.getMonth() + 1),
+ day = '' + d.getDate(),
+ year = d.getFullYear();
+
+ if (month.length < 2) month = '0' + month;
+ if (day.length < 2) day = '0' + day;
+
+ return [year, month, day].join('-');
+ }
//鍒濆鍖栨槑缁嗚〃鏍�
function set_InitGrid() {
@@ -428,10 +465,20 @@
var params = getUrlVars();
var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
-
-
- function RoadBillMain(linterid)//鍔犺浇琛ㄥご
+
+ //鍒濆鍖栬〃鍗曟彃浠�
+ set_InitFrom();
+
+ //鍒濆鍖栬〃鍗曟彃浠�
+ function set_InitFrom() {
+ //甯歌鐢ㄦ硶
+ laydate.render({
+ elem: '#HDate'
+ });
+ }
+
+ function RoadBillMain(linterid)//鍔犺浇琛ㄥご
{
$.ajax({
url: GetWEBURL() + "/Web/GetPonderationBill",
@@ -441,10 +488,36 @@
// console.log(d.data);
$("#HInterID").val(d.data[0].HInterID);
$("#HBillNo").val(d.data[0].HBillNo);
- $("#HBillType").val(d.data[0].HSourceBillType);
+ $("#HBillType").val(d.data[0].HSourceBillType == null ? "1402" : d.data[0].HSourceBillType);
+ //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+ if (d.data[0].HSourceBillType == "1402") {
+ $("#HBillType").empty();
+ $("#HBillType").val("1402");
+ var optionHtml = '';
+ optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '鍙戣揣閫氱煡鍗�' + "</option>";
+ $("#HBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HBillType").attr("readonly", "readonly");
+ }
+ else if (d.data[0].HSourceBillType == "1401") {
+ $("#HBillType").empty();
+ $("#HBillType").val("1401");
+ var optionHtml = '';
+ optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '閿�鍞鍗�' + "</option>";
+ $("#HBillType").append(optionHtml);
+ layui.form.render('select');
+ $("#HBillType").attr("readonly", "readonly");
+ }
+ else {
+ //$("#HBillType").val("-1");
+ }
$("#HSourceBillNo").val(d.data[0].HSourceBillNo);
$("#HSourceBillNo").attr("disabled", "true");
HSourceFlag = true;
+ $("#HDeptID").val(d.data[0].HDeptID);
+ $("#HDeptName").val(d.data[0].HDeptName);
+ $("#HDate").val(formatDate(new Date(), "yyyy-MM-dd"));
+
//$("#HWHID").val(d.data[0].HWhID);
//$("#HStockPlaceID").val(d.data[0].HSPID);
//$("#HKeeperID").val(d.data[0].HKeeperID);
@@ -522,34 +595,64 @@
layer.closeAll("loading");
}
});
+
+ //$.ajax({
+ // url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_New_Json1',
+ // type: "GET",
+ // data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: HBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
+ // success: function (result) {
+ // if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ // listOption.data = result.data.list;
+ // table.render(listOption);
+ // listOption1.data = result.data.list2;
+ // table.render(listOption1);
+
+ // //console.log(result.data.list2);
+ // var count = 0;
+ // var count1 = 0;
+ // for (var i = 0; i < result.data.list.length; i++) {
+ // count += result.data.list[i].HQty;
+ // count1 += result.data.list[i].HPieceQty;
+ // }
+ // $("#HSumQtys").val(count);
+ // $("#HBarCodeQtys").val(count1);
+ // //return;
+ // }
+ // else {
+ // layer.msg(result.Message);
+ // }
+ // layer.closeAll("loading");
+ // }
+ //});
}
-
+
//鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
-
-
-
+
+
+
//鍒ゆ柇鏄惁鏂板
if (linterid == null || linterid == 0) {
//鑾峰彇鏈�澶у崟鎹彿 new
$("#HInterID").val("");
- $("#HBillNo").val("");
+ $("#HBillNo").val("");
$.ajax({
- url: GetWEBURL() + "/Web/GetMAXNumPDA",
+ url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
data: { "HBillType": '1205' },
success: function (d) {
//console.log(d.data);
$("#HInterID").val(d.data[0].HInterID);
$("#HBillNo").val(d.data[0].HBillNo);
+ $("#HDate").val(formatDate(new Date(), "yyyy-MM-dd"));
//$("#HInterID").val('132522535');
//$("#HBillNo").val('421458026');
set_InitGrid();
}
- });
+ });
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new-----涓嶄細璧�
RoadBillMain(linterid);
@@ -565,7 +668,36 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseListNew.html?Type=HWHID&HOrgID=' + HStockOrgID + '', 'yes']
+ , resize: false
+ , cancel: function () {
+ }
+ })
+ });
+ //form.on('submit(HWHID-BT)', function () {//閫夋嫨浠撳簱
+ // layer.open({
+ // type: 2
+ // , area: ['100%', '100%']
+ // , title: '浠撳簱鍒楄〃'
+ // , shade: 0.6 //閬僵閫忔槑搴�
+ // , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ // , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ // , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes']
+ // , resize: false
+ // , cancel: function () {
+ // //$(".layui-btn").removeClass("layui-btn-disabled");
+ // }
+ // })
+ //});
+ form.on('submit(HWHID_FIFO-BT)', function () {//閫夋嫨鍏堣繘鍏堝嚭浠撳簱
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '浠撳簱鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HFIFOWHID', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -697,9 +829,6 @@
});
form.on('submit(Cancel)', function () {
- //sessionStorage["SourceFlag"] = false;
- //parent.location.href = "../../../views/index.html"
- //window.close();//鍏抽棴褰撳墠椤�
layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
window.close();
});
@@ -798,61 +927,61 @@
//鍒犻櫎
form.on('submit(cmdDelete)', function () {//鍒犻櫎
- var checkStatus = table.checkStatus('wl-table')
- , data = checkStatus.data;
- // console.log(data);
- var sInterID = $('#HInterID').val()
- var sMaterID = data[0].HMaterID
- var sBillType = '1205'
- var sAuxPropID = data[0].HAuxPropID
- //var sMTONo = data[0].HMTONo
- var sMTONo = ''
- var sSourceInterID = data[0].HSourceInterID
- var sSourceEntryID = data[0].HSourceEntryID
- $.ajax(
- {
- type: "Get",
- //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- url: GetWEBURL() + "/SellOut/Delete_Json",
- async: true,
- data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "sHBillType": sBillType, },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
- table.render({
- elem: '#wl-table'
- , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
- , cellMinWidth: 80
- , toolbar: '#toolbarDemo'
- , defaultToolbar: []
- , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
- , cols: [[
- { type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', width: 80 }
- , { field: 'HAuxQty', title: '杈呭姪鏁伴噺', width: 80 }
- , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 80 }
- , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 100 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 }
- , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 100 }
- , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
- , { field: 'HBatchNo', title: '鎵规', width: 100 }
- , { field: 'HAuxPropID', title: '杈呭姪灞炴��', width: 100 }
- , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100 }
- , { field: 'HWHID', title: 'ck', width: 100 }
- ]]
- //, height: 500
- })
- }
- else {
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- },
- error: function (err) {
- layer.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- });
+ //var checkStatus = table.checkStatus('wl-table')
+ //, data = checkStatus.data;
+ //// console.log(data);
+ //var sInterID = $('#HInterID').val()
+ //var sMaterID = data[0].HMaterID
+ //var sBillType = '1205'
+ //var sAuxPropID = data[0].HAuxPropID
+ ////var sMTONo = data[0].HMTONo
+ //var sMTONo = ''
+ //var sSourceInterID = data[0].HSourceInterID
+ //var sSourceEntryID = data[0].HSourceEntryID
+ //$.ajax(
+ // {
+ // type: "Get",
+ // //url: "http://61.130.49.162:9090/WMSAPI///POStockInBill/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ // url: GetWEBURL() + "/SellOut/Delete_Json",
+ // async: true,
+ // data: { "HInterID": sInterID, "HMaterID": sMaterID, "HAuxPropID": sAuxPropID, "HMTONo": sMTONo, "HSourceInterID": sSourceInterID, "HSourceEntryID": sSourceEntryID, "sHBillType": sBillType, },
+ // dataType: "json",
+ // success: function (data) {
+ // if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+ // table.render({
+ // elem: '#wl-table'
+ // , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
+ // , cellMinWidth: 80
+ // , toolbar: '#toolbarDemo'
+ // , defaultToolbar: []
+ // , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
+ // , cols: [[
+ // { type: 'radio' }
+ // , { field: 'HQty', title: '鏁伴噺', width: 80 }
+ // , { field: 'HAuxQty', title: '杈呭姪鏁伴噺', width: 80 }
+ // , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 80 }
+ // , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 100 }
+ // , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ // , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 100 }
+ // , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 100 }
+ // , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 100 }
+ // , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 100 }
+ // , { field: 'HBatchNo', title: '鎵规', width: 100 }
+ // , { field: 'HAuxPropID', title: '杈呭姪灞炴��', width: 100 }
+ // , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100 }
+ // , { field: 'HWHID', title: 'ck', width: 100 }
+ // ]]
+ // //, height: 500
+ // })
+ // }
+ // else {
+ // layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // }
+ // },
+ // error: function (err) {
+ // layer.msg("閿欒" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // }
+ // });
});
@@ -864,60 +993,60 @@
var sSourceType = $("#HBillType").val();
if (AllowLoadData(sSubStr) != false)//闈炵┖楠岃瘉
{
- var flage = true;
- for (var i = 0; i < sSubStr.length; i++) {
- if (sSubStr[i].HQty == 0) {
- flage = false;
- }
- }
- if (!flage) {
- layer.confirm('瀹為檯鎵弿鍗锋暟涓�0灏忎簬鎵捐揣鍗曟暟閲忥紒鏄惁缁х画鎻愪氦锛�', {
- btn: ['缁х画', '鍙栨秷'], skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず"
- }, function () {
- Saver(sMainStr);
- }, function () {
- layer.closeAll("loading");
- });
- } else {
+ //var flage = true;
+ //for (var i = 0; i < sSubStr.length; i++) {
+ // if (sSubStr[i].HQty == 0) {
+ // flage = false;
+ // }
+ //}
+ //if (!flage) {
+ // layer.confirm('瀹為檯鎵弿鍗锋暟涓�0灏忎簬鎵捐揣鍗曟暟閲忥紒鏄惁缁х画鎻愪氦锛�', {
+ // btn: ['缁х画', '鍙栨秷'], skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず"
+ // }, function () {
+ // Saver(sMainStr);
+ // }, function () {
+ // layer.closeAll("loading");
+ // });
+ //} else {
Saver(sMainStr);
- }
-
+ //}
+
}
});
//鎻愪氦鏂规硶璋冪敤鐨刟jax
function Saver(sMainStr) {
layer.load(1);
$.ajax(
- {
- type: "POST",
- // url: "http://61.130.49.162:9090/WMSAPI///SellOut/set_SaveSellOutBill_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- url: GetWEBURL() + "/SellOut/set_SaveSellOutBill_Json",
- async: true,
- data: { "oMain": sMainStr },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
- layer.confirm(data.Message , {
- icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
- btn2: function () {
- //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
- //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
- parent.location.href = "../../../views/index.html";
- }//鍏抽棴
- }, function () {
- //sessionStorage["SourceFlag"] = false;
- window.location.reload();
- });//鏂板
+ {
+ type: "POST",
+ // url: "http://61.130.49.162:9090/WMSAPI///SellOut/set_SaveSellOutBill_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ url: GetWEBURL() + "/SellOut/set_SaveSellOutBill_Json",
+ async: true,
+ data: { "oMain": sMainStr },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
+ layer.confirm(data.Message, {
+ icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
+ btn2: function () {
+ //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
+ //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
+ parent.location.href = "../../../views/index.html";
+ }//鍏抽棴
+ }, function () {
+ //sessionStorage["SourceFlag"] = false;
+ window.location.reload();
+ });//鏂板
+ }
+ else {
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
- else {
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- layer.closeAll("loading");
- },
- error: function (err) {
- layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- });
+ });
}
//鐩戝惉鎻愪氦
@@ -942,7 +1071,7 @@
form.on('submit(QueDin)', function (data) {
GetMeesageByBarCode();
});
-
+
$('#HStockPlaceName').on('keydown', function (event) { //鎵粨浣�
var HBarCode = $('#HStockPlaceName').val()
@@ -1045,7 +1174,7 @@
//});
//鎵簮鍗�
- $('#HSourceBillNo').on('keydown', function (event) {
+ $('#HSourceBillNo').on('keydown', function (event) {
if (event.keyCode == 13) {
GetMeesageBySourceBillNo();
}
@@ -1061,13 +1190,13 @@
// , url: 'http://localhost:8083/Web/SellOut/GetHBarCodeShowBillSub'
//, toolbar: '#toolbarDemo'
// , where: { sMsg: linterid, sMsg2: lentryid }
- , cols: [[
- , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
- ]]
- , page: true
- , height: 500
- , done: function () {
- }
+ , cols: [[
+ , { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
+ ]]
+ , page: true
+ , height: 500
+ , done: function () {
+ }
});
//鎵簮鍗曟煡璐�
@@ -1120,7 +1249,7 @@
}
});
}
-
+
//鎵潯鐮�
function GetMeesageByBarCode(obj) { //杩斿洖宸ヤ綔涓績
var sOldBarCode = $('#HBarCode').val()
@@ -1133,6 +1262,8 @@
var sHWHID = $("#HWHID").val();//浠撳簱ID
var sHSPID = $("#HStockPlaceID").val();//浠撲綅ID
var sQty = $("#HQty").val()//鏁伴噺
+ var sMouldManagerCtl = 'N'
+ var sFIFOCtl = 'N'
if (sQty == "") {
sQty = 0;
}
@@ -1174,10 +1305,10 @@
}
});
}
- else if (HScanStyle =="鏁存墭鍒犻櫎") {
+ else if (HScanStyle == "鏁存墭鍒犻櫎") {
var HBarCode = $('#HBarCode').val();
var HInterID = $('#HInterID').val();
- if (HBarCode=="") {
+ if (HBarCode == "") {
layer.msg("鏁存墭鍒犻櫎鏉＄爜涓嶈兘涓虹┖", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
@@ -1238,10 +1369,19 @@
if (sBarCode != "") {
$('#HBarCode').val("");
}
+ //浠撲綅蹇呴』褰曞叆
+ //if (sHSPID == '' || sHSPID == 0) {
+ // //
+ // playSound();
+ // layer.msg("浠撲綅涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
+ // //11
+ // return false;
+ //}
+ //
$.ajax({
url: GetWEBURL() + "/SellOut/get_CheckTypeByBarCode_Json",
type: "GET",
- data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sBillType, "sBillNo": sBillNo, "sMaker": sMaker, "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"], "HScanStyle": HScanStyle},
+ data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sBillType, "sBillNo": sBillNo, "sMaker": sMaker, "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"], "HScanStyle": HScanStyle },
success: function (result) {
playSound1();
if (result.count == 1) {
@@ -1317,39 +1457,70 @@
//$("#HSupName").val(result.data.HSupName);
//$("#HDeptID").val(result.data.HDeptID);
//$("#HDeptName").val(result.data.HDeptName);
- table.render({
- elem: '#wl-table'
- , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
- , toolbar: '#toolbarDemo'
- , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
- , cols: [[
- { type: 'radio' }
- , { field: 'HSNO', title: '搴忓彿', width: 60 }
- , { field: 'HQty', title: '鏁伴噺', width: 80 }
- , { field: 'HAuxQty', title: '杈呭姪鏁伴噺', width: 80 }
- , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 80 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 90 }
- , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 90 }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 90 }
- , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 90 }
- , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 90 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 90 }
- , { field: 'HBatchNo', title: '鎵规', width: 90 }
- ]]
- , height: 500
- , done: function () {
+
+
+ //table.render({
+ // elem: '#wl-table'
+ // , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
+ // , toolbar: '#toolbarDemo'
+ // , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
+ // , cols: [[
+ // { type: 'radio' }
+ // , { field: 'HSNO', title: '搴忓彿', width: 60 }
+ // , { field: 'HQty', title: '鏁伴噺', width: 80 }
+ // , { field: 'HAuxQty', title: '杈呭姪鏁伴噺', width: 80 }
+ // , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 80 }
+ // , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 90 }
+ // , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 90 }
+ // , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 90 }
+ // , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 90 }
+ // , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 90 }
+ // , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 90 }
+ // , { field: 'HBatchNo', title: '鎵规', width: 90 }
+ // ]]
+ // , height: 500
+ // , done: function () {
+ // layer.closeAll("loading");
+ // }
+ //});
+
+ $.ajax({
+ url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_New_Json1',
+ type: "GET",
+ data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: sBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ listOption.data = result.data.list;
+ table.render(listOption);
+ listOption1.data = result.data.list2;
+ table.render(listOption1);
+
+ //console.log(result.data.list2);
+ var count = 0;
+ var count1 = 0;
+ for (var i = 0; i < result.data.list.length; i++) {
+ count += result.data.list[i].HQty;
+ count1 += result.data.list[i].HPieceQty;
+ }
+ $("#HSumQtys").val(count);
+ $("#HBarCodeQtys").val(count1);
+ //return;
+ }
+ else {
+ layer.msg(result.Message);
+ }
layer.closeAll("loading");
}
});
- var count = 0;
- var count1 = 0;
- for (var i = 0; i < result.data.length; i++) {
- count += result.data.HQty;
- count1 += result.data.HPieceQty;
- }
- $("#HSumQtys").val(count);
- $("#HBarCodeQtys").val(count1);
+ //var count = 0;
+ //var count1 = 0;
+ //for (var i = 0; i < result.data.length; i++) {
+ // count += result.data.HQty;
+ // count1 += result.data.HPieceQty;
+ //}
+ //$("#HSumQtys").val(count);
+ //$("#HBarCodeQtys").val(count1);
playSound1();
}
else {
@@ -1368,6 +1539,58 @@
//11
}
});
+ }
+ }
+
+
+
+
+ var listOption = {
+ elem: '#wl-table'
+ , toolbar: '#toolbarDemo'
+ , cellMinWidth: 90
+ , limit: 3000
+ , totalRow: true
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HSNO', title: '搴忓彿', width: 60 }
+ , { field: 'HQty', title: '鏁伴噺', width: 80, totalRow: true }
+ , { field: 'HAuxQty', title: '杈呭姪鏁伴噺', width: 80, totalRow: true }
+ , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 80 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 90 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 90 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 90 }
+ , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 90 }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 90 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 90 }
+ , { field: 'HBatchNo', title: '鎵规', width: 90 }
+ , { field: 'HPieceQty', title: '鏉＄爜鏁伴噺', width: 150 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ }
+ var listOption1 = {
+ elem: '#mx-table'
+ , toolbar: '#toolbarDemo'
+ , cellMinWidth: 90
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HQty', title: '鏁伴噺', width: 150, totalRow: true }
+ , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 150 }
+ , { field: 'HBarCode', title: '鏉＄爜缂栧彿', width: 150 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: 'HBatchNo', title: '鎵瑰彿', width: 150 }
+ //, { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+ //, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
}
}
function playSound() {
@@ -1396,6 +1619,10 @@
var sInterID = $("#HInterID").val()
var sBillNo = $("#HBillNo").val()
var HSourceBillType = $("#HBillType").val()
+ var HBillType = '1205'
+ var HWHID_FIFO = $("#HWHID_FIFO").val();//鍏堣繘鍏堝嚭浠撳簱ID
+ var sMouldManagerCtl = 'N'
+ var sFIFOCtl = 'N'
if (HSourceBillNo == "" || sInterID <= 0) {
layer.msg("婧愬崟鍙蜂负绌猴紝鎴栬�呭唴鐮佷笉瀛樺湪锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
@@ -1403,7 +1630,7 @@
$.ajax({
url: GetWEBURL() + "/SellOut/set_SavePonderationBillMain_Temp_Source_Fast_Json",
type: "GET",
- data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
+ data: { sInterID: sInterID, sBillNo: sBillNo, HBillType: '1205', "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
//GetSellOutFindSP();
@@ -1417,27 +1644,56 @@
// where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
//});
- table.render({
- elem: '#wl-table'
- , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
- , toolbar: '#toolbarDemo'
- , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
- , cols: [[
- { type: 'radio' }
- , { field: 'HSNO', title: '搴忓彿', width: 60 }
- , { field: 'HQty', title: '鏁伴噺', width: 80 }
- , { field: 'HAuxQty', title: '杈呭姪鏁伴噺', width: 80 }
- , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 80 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 90 }
- , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 90 }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 90 }
- , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 90 }
- , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 90 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 90 }
- , { field: 'HBatchNo', title: '鎵规', width: 90 }
- ]]
- , height: 500
- , done: function () {
+ //table.render({
+ // elem: '#wl-table'
+ // , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
+ // , toolbar: '#toolbarDemo'
+ // , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
+ // , cols: [[
+ // { type: 'radio' }
+ // , { field: 'HSNO', title: '搴忓彿', width: 60 }
+ // , { field: 'HQty', title: '鏁伴噺', width: 80 }
+ // , { field: 'HAuxQty', title: '杈呭姪鏁伴噺', width: 80 }
+ // , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 80 }
+ // , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 90 }
+ // , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 90 }
+ // , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 90 }
+ // , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 90 }
+ // , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 90 }
+ // , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 90 }
+ // , { field: 'HBatchNo', title: '鎵规', width: 90 }
+ // ]]
+ // , height: 500
+ // , done: function () {
+ // layer.closeAll("loading");
+ // }
+ //});
+
+ $.ajax({
+ url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_New_Json1',
+ type: "GET",
+ data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: HBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ listOption.data = result.data.list;
+ table.render(listOption);
+ listOption1.data = result.data.list2;
+ table.render(listOption1);
+
+ //console.log(result.data.list2);
+ var count = 0;
+ var count1 = 0;
+ for (var i = 0; i < result.data.list.length; i++) {
+ count += result.data.list[i].HQty;
+ count1 += result.data.list[i].HPieceQty;
+ }
+ $("#HSumQtys").val(count);
+ $("#HBarCodeQtys").val(count1);
+ //return;
+ }
+ else {
+ layer.msg(result.Message);
+ }
layer.closeAll("loading");
}
});
@@ -1449,8 +1705,9 @@
}
});
}
-
+
});
+
//浠ヤ笂涓簂ayui妯″潡
@@ -1459,6 +1716,11 @@
$("#HWHNAME").val(obj[0].HName);
//sessionStorage["HWHID"] = obj[0].HItemID;
$("#HWHID").val(obj[0].HItemID);
+ }
+ function GetHFIFOWHNAMEValue(obj) //杩斿洖鍏堣繘鍏堝嚭浠撳簱
+ {
+ $("#HWHNAME_FIFO").val(obj[0].HName);
+ $("#HWHID_FIFO").val(obj[0].HItemID);
}
function GetHSpValue(obj) { //杩斿洖璋冨叆浠撲綅
$("#HStockPlaceName").val(obj[0].HName);
@@ -1483,6 +1745,20 @@
$("#HDeptID").val(obj[0].HItemID);
}
function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
+ //鏁板瓧姝ｅ垯(鍖呭惈灏忔暟)
+ var reg = /^\d+(\.\d+)?$/;
+ //if (reg.test($("#HQty").val()) == false || $("#HQty").val() == '') {
+ // layer.msg("鏁伴噺蹇呴』涓烘暟閲忔垨灏忔暟", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ //}
+ //if (reg.test($("#HBarcodeQtys").val()) == false || $("#HBarcodeQtys").val() == '') {
+ // layer.msg("鏉＄爜鏁伴噺蹇呴』涓烘暟閲忔垨灏忔暟", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ //}
+ //if (reg.test($("#HSumQtys").val()) == false || $("#HSumQtys").val() == '') {
+ // layer.msg("鎬绘暟閲忓繀椤讳负鏁伴噺鎴栧皬鏁�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ //}
//if ($("#HSourceBillNo").val() == '') {
// layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
// return false;
--
Gitblit v1.9.1