From 5e9c87d9524a3a31b7691e61d8da9a757377e9bd Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 20 八月 2025 10:51:09 +0800
Subject: [PATCH] 条码生成转换特殊字符；标准包装添加控制；
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html | 469 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 402 insertions(+), 67 deletions(-)
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
index b9bb524..929325e 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
@@ -21,12 +21,16 @@
<div class="layui-row layui-col-space15">
<div class="layui-col-md12">
<div class="layui-card">
- <form id="form0" class="layui-form" action="">
+ <form id="form0" class="layui-form" action="" lay-filter="formData">
<div class="layui-card-header">
<div class="layui-btn-group">
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
<button type="button" id="aduit-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Aduit">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Print">鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Print_Convenient">涓�閿墦鍗�</button>
+ <button type="button" id="ChooseSource-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="ChooseSource">閫夋簮鍗�</button>
+ <!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="BuildBarcode">鐢熸垚鏉＄爜</button>-->
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="MergeBuildBarcode">鍚堝苟鐢熸垚鏉＄爜</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
</div>
</div>
@@ -45,6 +49,7 @@
<label class="layui-form-label">鍗� 鎹� 鍙凤細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" readonly="readonly" autocomplete="off">
+ <input class="layui-input" name="HInterID" lay-verify="HInterID" id="HInterID" readonly="readonly" autocomplete="off" style="display:none;">
</div>
</div>
<div class="layui-col-xs3">
@@ -92,7 +97,7 @@
</div>
</div>
- <div class="layui-col-xs3">
+ <div class="layui-col-xs3" style="display:none;">
<label class="layui-form-label"> 閮� 闂細</label>
<div class="layui-input-inline">
<input class="layui-input" name="HDeptName" lay-verify="HDeptName" id="HDeptName" readonly="readonly" autocomplete="off">
@@ -127,9 +132,9 @@
<div class="layui-input-inline">
<input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
</div>
- </div>
+ </div>
</div>
- </div>
+ </div>
<div class="layui-form-item">
<div class="layui-row">
<div class="layui-col-xs3">
@@ -145,9 +150,31 @@
</div>
</div>
<div class="layui-col-xs3">
- <label class="layui-form-label"> 鑱旂郴鏂瑰紡锛�</label>
+ <label class="layui-form-label"> 鑱旂郴鏂瑰紡(鏀�)锛�</label>
<div class="layui-input-inline">
<input class="layui-input" name="HReceiveGoodsLink" id="HReceiveGoodsLink" autocomplete="off">
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label"> 閫佽揣浜猴細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HSendGoodsMan" id="HSendGoodsMan" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-col-xs3">
+ <label class="layui-form-label"> 閫佽揣鍦板潃锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HSendGoodsAddr" id="HSendGoodsAddr" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-col-xs3">
+ <label class="layui-form-label"> 鑱旂郴鏂瑰紡(閫�)锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HSendGoodsLink" id="HSendGoodsLink" autocomplete="off">
</div>
</div>
</div>
@@ -222,6 +249,7 @@
<script src="../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
<!--<script src="../../../../Scripts/jquery-1.8.2.js"></script>-->
<script src="../../../../Scripts/webConfig.js"></script>
+ <script src="../../layuiadmin/Scripts/general.js"></script>
<script>
function getUrlVars() {
var vars = [], hash;
@@ -237,46 +265,59 @@
var linterid = params[params[0]];
var lentryid = params[params[1]];
var lSourceBillType = params[params[2]];
+ var HType = params[params[3]];
// debugger;
- $.ajax({
- url: GetWEBURL() + "GetNewPOInStockBillNo",
- type: "GET",
- data: { "sMsg": linterid, "sMsg3": lSourceBillType },
- success: function (d) {
- //console.log(d.data);
- $("#HBillNo").val(d.data[0].HBillNo);
- $("#HInnerBillNo").val(d.data[0].HInnerBillNo);
- $("#HDate").val(d.data[0].HDate);
- }
- });
- $.ajax({
- url: GetWEBURL() + "GetNewPOInStockShowBillMain",
- type: "GET",
- data: { "sMsg": linterid, "sMsg3": lSourceBillType },
- success: function (d) {
- //console.log(d.data);
- //$("#HDate").val(d.)
- $("#HInterID").val(d.data[0].HInterID);
- //$("#HBillNo").val(d.data[0].HBillNo);
- $("#HRemark").val(d.data[0].HRemark);
- //$("#HDate").val(d.data[0].HDateForWeb);
- $("#HMaker").val(sessionStorage["HUserName"]);
- //$("#HMakerDate").val(d.data[0].HMakerDate)
- //$("#HChecker").val(d.data[0].HChecker);
- //$("#HCheckDate").val(d.data[0].HCheckDate);
- $("#HSupID").val(d.data[0].HSupID);
- $("#HSupName").val(d.data[0].HSupName);
- $("#HDeptID").val(d.data[0].HDeptID);
- $("#HDeptName").val(d.data[0].HDepName);
- $("#HEmpID").val(d.data[0].HEmpID);
- $("#HEmpName").val(d.data[0].HEmpName);
- $("#HManagerID").val(d.data[0].HManagerID);
- $("#HManagerName").val(d.data[0].HManagerName);
- $("#HPURCHASEORGID").val(d.data[0].FPURCHASEORGID);
- $("#HPURCHASEORGName").val(d.data[0].HOrgName);
- }
- });
+ if (HType == "edit") {
+ //缂栬緫
+
+ } else {
+ //鏂板
+ $.ajax({
+ url: GetWEBURL() + "GetNewPOInStockBillNo",
+ type: "GET",
+ data: { "sMsg": linterid, "sMsg3": lSourceBillType },
+ async: false,
+ success: function (d) {
+ //console.log(d.data);
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HInnerBillNo").val(d.data[0].HInnerBillNo);
+ $("#HDate").val(d.data[0].HDate);
+ }
+ });
+ $.ajax({
+ url: GetWEBURL() + "GetNewPOInStockShowBillMain",
+ type: "GET",
+ data: { "sMsg": linterid, "sMsg3": lSourceBillType },
+ success: function (d) {
+ //console.log(d.data);
+ //$("#HDate").val(d.)
+ //$("#HInterID").val(d.data[0].HInterID);
+ //$("#HBillNo").val(d.data[0].HBillNo);
+ $("#HRemark").val(d.data[0].HRemark);
+ //$("#HDate").val(d.data[0].HDateForWeb);
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ //$("#HMakerDate").val(d.data[0].HMakerDate)
+ //$("#HChecker").val(d.data[0].HChecker);
+ //$("#HCheckDate").val(d.data[0].HCheckDate);
+ $("#HSupID").val(d.data[0].HSupID);
+ $("#HSupName").val(d.data[0].HSupName);
+ $("#HDeptID").val(d.data[0].HDeptID);
+ $("#HDeptName").val(d.data[0].HDepName);
+ $("#HEmpID").val(d.data[0].HEmpID);
+ $("#HEmpName").val(d.data[0].HEmpName);
+ $("#HManagerID").val(d.data[0].HManagerID);
+ $("#HManagerName").val(d.data[0].HManagerName);
+ $("#HPURCHASEORGID").val(d.data[0].FPURCHASEORGID);
+ $("#HPURCHASEORGName").val(d.data[0].HOrgName);
+ $("#HReceiveGoodsMan").val(d.data[0].HReceiveGoodsMan);
+ $("#HAddress").val(d.data[0].HAddress);
+ //$("#HSendGoodsAddr").val(d.data[0].HPROVIDERADDRESS);
+ }
+ });
+ }
+
layui.config({
base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -289,19 +330,31 @@
, layer = layui.layer
, laydate = layui.laydate
, element = layui.element; //Tab鐨勫垏鎹㈠姛鑳斤紝鍒囨崲浜嬩欢鐩戝惉绛夛紝闇�瑕佷緷璧杄lement妯″潡
+ window.table = layui.table
//甯歌鐢ㄦ硶
laydate.render({
elem: '#HDHDate'
});
- RoadHBillSub();
+
+ if (HType == "edit") {
+ //缂栬緫
+ RoadBillMain_Edit(linterid);
+ } else {
+ //鏂板
+ RoadHBillSub();
+ }
+
layer.load(3)
+ var HIsAduit = false;
var HModName = "SRM_POInStockBill_Edit";
+ var option = ""
+ window.HSubData = "";//鍏ㄥ眬鍙橀噺
var option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, cols: [[
- { type: 'checkbox', fixed: 'left' }
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
, { field: 'sorderid', title: '搴忓彿', width: 80, hide: true, fixed: true }
, { field: 'HMTONO', title: '璁″垝璺熻釜鍗曞彿', width: 100, fixed: true, edit: 'text', hide: true }
, { field: 'HMaterID', title: '鐗╂枡ID', width: 100, hide: true }
@@ -314,26 +367,29 @@
, { field: 'HUnitNumber', title: '璁￠噺鍗曚綅浠ｇ爜', width: 100, hide: true }
, { field: 'HUnitID', title: '璁￠噺鍗曚綅ID', width: 100, hide: true }
, { field: 'FPrintCount', title: '鎵撳嵃鏉＄爜鏁伴噺', width: 120, hide: true }
- , { field: 'HQty', title: '閫佽揣鏁伴噺', width: 100, edit: 'text', event: "inputHQty" }
- , { field: 'HRQty', title: '鍓╀綑鍙彂璐ф暟閲�', width: 100 }
- , { field: 'HSQty', title: '婧愬崟鏁伴噺', width: 100 }
- , { field: 'HBatchNo', title: '鐢熶骇鏃ユ湡D/C', width: 120, edit: 'text' }
- , { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate", hide: true }
+ , { field: 'HQty', title: '閫佽揣鏁伴噺*', width: 100, edit: 'text', event: "inputHQty", totalRow: true}
+ , { field: 'HRQty', title: '鍓╀綑鍙彂璐ф暟閲�', width: 100, totalRow: true }
+ , { field: 'HSQty', title: '婧愬崟鏁伴噺', width: 100, totalRow: true }
+ , { field: 'HBatchNo', title: '鎵瑰彿', width: 120, edit: 'text' }
+ , { field: 'HBatchManager', title: '鍚敤鎵规绠＄悊', width: 120, hide: true }
+ , { field: 'HOrderType', title: '璁㈠崟绫诲瀷', width: 120, hide: true }
+ , { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate" }
, { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100, hide: true }
, { field: 'HDate', title: '棰勮鍒拌揣鏃ユ湡', align: 'center', width: 150, data_field: 'HDate', event: "chooseHDate", hide: true }
, { field: 'HPrice', title: '鍗曚环', width: 100, hide: true }
, { field: 'HMoney', title: '閲戦', width: 100, hide: true }
, { field: 'HRemark', title: '澶囨敞', width: 200, edit: true }
+ , { field: 'HTAXPRICE_T', title: '鍚◣閲嶉噺鍗曚环/鍚�', width: 200, edit: true, hide: true }
//, { field: 'HRemark', title: '澶囨敞', width: 100 }
, { field: 'HPOOrderInterID', title: '閲囪喘璁㈠崟涓诲唴鐮�', width: 150, hide: true }
, { field: 'HPOOrderEntryID', title: '閲囪喘璁㈠崟瀛愬唴鐮�', width: 150, hide: true }
, { field: 'HPOOrderBillNo', title: '閲囪喘璁㈠崟鍙�', width: 200 }
, { field: 'HWWOrderInterID', title: '濮斿璁㈠崟涓诲唴鐮�', width: 150, hide: true }
, { field: 'HWWOrderEntryID', title: '濮斿璁㈠崟瀛愬唴鐮�', width: 150, hide: true }
- , { field: 'HWWOrderBillNo', title: '濮斿璁㈠崟鍙�', width: 200 }
+ , { field: 'HWWOrderBillNo', title: '濮斿璁㈠崟鍙�', width: 200, hide: true }
, { field: 'HBillType', title: '鍗曟嵁绫诲瀷', width: 100, hide: true }
, { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100, hide: true }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 200 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 200, hide: true }
, { field: 'HSupMaterNumber', title: '渚涘簲鍟嗘枡鍙�', width: 200, edit: 'text' }
, { field: 'HSupBatchNo', title: '渚涘簲鍟嗘壒娆�', width: 200, edit: 'text' }
, { field: 'HExpressNumberSub', title: '鐗╂祦鍗曞彿', width: 200, edit: true, hide: true }//鐟炵惇,鍑礉
@@ -346,7 +402,8 @@
// , data: [linterid]
// , page: true
, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
- //, height: 500
+ , totalRow: true
+ , height: 'full-1000'
, done: function () {
layer.closeAll("loading");
}
@@ -484,7 +541,7 @@
//鍒楄缃�
case 'set_HideColumn':
get_HideColumn();
- break;
+ break;
};
});
//鐩戝惉琛屽伐鍏蜂簨浠�
@@ -536,8 +593,9 @@
$(obj.tr).find(".layui-table-edit").keyup(function () {
var $input = $(this), val = $input.val();
if (!val) val = "0";
- $input.val(parseInt(val.replace(/[^\d*\.?\d*]/g, '')));
- });
+ //$input.val(parseInt(val.replace(/[^\d*\.?\d*]/g, '')));
+ $input.val(val.replace(/[^\d*\.?\d*]/g, ''));
+ });
}
});
@@ -575,6 +633,7 @@
layer.msg("閿欒:" + "涓嬫帹閫佽揣鍗曪紝鍚堣閫佽揣鏁伴噺涓嶈兘瓒呰繃鍓╀綑鍙彂璐ф暟閲忥紒", { icon: 5 });
}
}
+ table.reload('mainTable');//鍒锋柊琛ㄦ牸淇℃伅锛屽悎璁℃暟閲�
}
});
@@ -588,9 +647,13 @@
success: function (result) {
if (result.count == 10000) {
for (let i = 0; i < result.data.length; i++) {
- result.data[i].HBatchNo = result.data[i].HBatchNo.substring(0,6);
+ if (sessionStorage["Organization"] == "浜嬩笟涓�澶�") {
+ result.data[i].HBatchNo = result.data[i].HBatchNo.substring(0, 6);
+ }
}
ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
+ HSubData = ajaxReturnData;
+ console.log(ajaxReturnData);
table.reload('mainTable', {
data: ajaxReturnData
, height: 'full-10'
@@ -614,9 +677,19 @@
};
form.on('submit(Saver)', function (data) {//淇濆瓨
//debugger;
+
+ for (var i = 0; i < table.cache["mainTable"].length; i++) {
+ if (table.cache["mainTable"][i].HMaterName.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterName.indexOf(";") != -1) {
+ table.cache["mainTable"][i].HMaterName = table.cache["mainTable"][i].HMaterName.replace("\"", "鈥�").replace(";", "锛�")
+ }
+ if (table.cache["mainTable"][i].HMaterModel.indexOf("\"") != -1 || table.cache["mainTable"][i].HMaterModel.indexOf(";") != -1) {
+ table.cache["mainTable"][i].HMaterModel = table.cache["mainTable"][i].HMaterModel.replace("\"", "鈥�").replace(";", "锛�")
+ }
+ }
+
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
- var sMainSub = sMainStr + ';' + sSubStr;
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + HType;
if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
{
@@ -633,6 +706,7 @@
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { icon: 1 });
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#ChooseSource-btn').addClass("layui-btn-disabled").attr("disabled", true);
}
else {
f_alert(data.Message);
@@ -654,6 +728,7 @@
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ HIsAduit = true;
$('#aduit-btn').addClass("layui-btn-disabled").attr("disabled", true);
layer.msg(data.Message, { icon: 1 });
}
@@ -667,7 +742,11 @@
}
});
});
- form.on('submit(Print)', function (data) {//瀹℃牳
+ form.on('submit(Print)', function (data) {//鎵撳嵃
+ if (HIsAduit == false) {
+ layer.msg("璇峰鏍搁�佽揣鍗曞悗鍦ㄨ繘琛屾墦鍗�( 麓鈼旓笌 鈥糕棓锔巂)", { icon: 5 });
+ return;
+ }
$.ajax(
{
type: "GET",
@@ -679,7 +758,7 @@
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.open({
type: 2
- , area: ['50%', '50%']
+ , area: ['40%', '80%']
, title: '鎵撳嵃妯＄増閫夋嫨'
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
@@ -701,7 +780,90 @@
}
});
});
- form.on('submit(Exit)', function (data) {//淇濆瓨
+
+ //涓�閿墦鍗�
+ form.on('submit(Print_Convenient)', function (data) {
+ if (HIsAduit == false) {
+ layer.msg("璇峰鏍搁�佽揣鍗曞悗鍦ㄨ繘琛屾墦鍗�( 麓鈼旓笌 鈥糕棓锔巂)", { icon: 5 });
+ return;
+ }
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/GetHinterID", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "HBillNo": $("#HBillNo").val() },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Open_PrintTem/GetDefaultOpenTmp_Json",
+ async: true,
+ data: { "HNumber": 'SRM_POInStockBillList' },
+ //data: { "Value": Value },
+ success: function (result) {
+ if (result.count == 1) {
+ var OpenTmp = result.data[0].妯℃澘鍚嶇О
+ window.open("../../views/SRM/HBarPlanPrint.html?linterid=" + data.data.toString() + "&Type=SRM_POInStockBillList" + "&OpenTmp=" + OpenTmp.toString());
+ } else {
+ layer.msg(result.Message);
+ }
+ },
+ error: function (result) {
+ console.log(result);
+ }
+ });
+ }
+ else {
+ f_alert(data.Message);
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ f_alert("閿欒:" + err);
+ }
+ });
+ });
+
+ form.on('submit(ChooseSource)', function (data) {
+ var HOrderType = HSubData[0].HOrderType == undefined ? HSubData[0].璁㈠崟绫诲瀷 : HSubData[0].HOrderType
+
+ layer.open({
+ type: 2
+ , area: ['95%', '95%']
+ , title: '閲囪喘璁㈠崟鍒楄〃'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../views/SRM/SRM_POOrderBillList.html?Type=AddRow&HSupName=' + $("#HSupName").val() + '&HOrderType=' + HOrderType, 'yes']
+ , resize: false
+ //, cancel: function () {
+ // $(".layui-btn").removeClass("layui-btn-disabled");
+ //}
+ })
+ });
+
+ form.on('submit(MergeBuildBarcode)', function (data) {
+ if (HIsAduit == false) {
+ layer.msg("璇峰鏍搁�佽揣鍗曞悗鍦ㄧ敓鎴愭潯鐮�( 麓鈼旓笌 鈥糕棓锔巂)", { icon: 5 });
+ return;
+ }
+ layer.open({
+ type: 2
+ , area: ['95%', '95%']
+ , title: '鏉＄爜鐢熸垚'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../views/SRM/SRM_BarCodeBill.html?linterid=' + $("#HInterID").val() + '&lentryid=0' + '&type=0' + '&mergeTags=1', 'yes']
+ , resize: false
+ //, done: function () {
+ // layer.closeAll("loading");
+ //}
+ })
+ });
+
+ form.on('submit(Exit)', function (data) {//閫�鍑�
var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
parent.layer.close(index); //鍐嶆墽琛屽叧闂�
});
@@ -769,13 +931,18 @@
// layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,閫佽揣鍗曟暟閲忎笉鑳借秴杩囧凡鐢熸垚鏉＄爜鏁伴噺!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
// return Result = false;
//}
- //if (sSubStr[i].HBatchNo == "") {
- // layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鎵规涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- // return Result = false;
- //}
- if (sSubStr[i].HBatchNo == "") {
+ if (sSubStr[i].HBatchNo == "" && sSubStr[i].HBatchManager == "鏄�") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐗╂枡鍚敤鎵规绠＄悊锛屾壒娆′负绌猴紝璇峰～鍐欐壒娆′俊鎭�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (sSubStr[i].HKFDate == "") {
//鍑礉
- layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐢熶骇鏃ユ湡D/C涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐢熶骇鏃ユ湡涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (sSubStr[i].HKFDate > Format(new Date(), "yyyy-MM-dd")) {
+ //鍑礉
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐢熶骇鏃ユ湡澶т簬褰撳墠鏃ユ湡锛岃閲嶆柊閫夋嫨锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
}
@@ -784,6 +951,101 @@
return Result = true;
}
return Result;
+ }
+
+ //缂栬緫閫佽揣鍗曞姞杞借〃澶磋〃浣撴暟鎹�
+ function RoadBillMain_Edit(linterid) {
+ $.ajax({
+ url: GetWEBURL() + "/Cg_POInStockBill/cx",
+ type: "GET",
+ data: { "HInterID": linterid },
+ success: function (data) {
+ if (data.code == 1) {
+ var data = data.data;
+
+ ajaxReturnData = JSON.parse(JSON.stringify(data));
+ HSubData = ajaxReturnData;
+
+ //涓昏〃
+ form.val("formData", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HInterID": data[0].hmainid
+ , "HBillNo": data[0].鍗曟嵁鍙�
+ , "HDate": Format(new Date(data[0].鍗曟嵁鏃ユ湡), "yyyy-MM-dd")
+ , "HSupName": data[0].渚涘簲鍟嗗悕绉�
+ , "HSupID": data[0].HSupID
+ , "HDHDate": Format(new Date(data[0].棰勮鍒拌揣鏃ユ湡), "yyyy-MM-dd")
+ , "HManagerName": data[0].涓荤鍚嶇О
+ , "HManagerID": data[0].HManagerID
+ , "HEmpName": data[0].涓氬姟鍛樺悕绉�
+ , "HEmpID": data[0].HEmpID
+ , "HDeptName": data[0].閮ㄩ棬鍚嶇О
+ , "HDeptID": data[0].HDeptID
+ , "HPURCHASEORGName": data[0].閲囪喘缁勭粐鍚嶇О
+ , "HPURCHASEORGID": data[0].HPURCHASEORGID
+ , "HDeliveryNo": data[0].鐗╂祦鍗曞彿
+ , "HExpressSupplier": data[0].鐗╂祦鍏徃
+ , "HInnerBillNo": data[0].閫佽揣鍗曞彿
+ , "HReceiveGoodsMan": data[0].鏀惰揣浜�
+ , "HAddress": data[0].鏀惰幏鍦板潃
+ , "HReceiveGoodsLink": data[0].鏀惰揣浜鸿仈绯绘柟寮�
+ , "HSendGoodsMan": data[0].閫佽揣浜�
+ , "HSendGoodsAddr": data[0].閫佽揣鍦板潃
+ , "HSendGoodsLink": data[0].閫佽揣浜鸿仈绯绘柟寮�
+ //鍏朵粬淇℃伅
+ //, "HMaker": data[0].鍒跺崟浜�
+ //, "HChecker": data[0].
+ //, "HUpDater": data[0].
+ //, "HMakeDate": data[0].
+ //, "HCheckDate": data[0].
+ //, "HUpDateDate": data[0].
+ });
+ //瀛愯〃 璧嬪��
+ var rowdata = [];
+ for (var i = 0; i < data.length; i++) {
+ rowdata.push(
+ {
+ "sorderid": (i + 1),"HMTONO": data[i].璁″垝璺熻釜鍗曞彿, "HMaterID": data[i].HMaterID, "HMaterNumber": data[i].鐗╂枡浠ｇ爜
+ , "HOldMaterNumber": data[i].鐗╂枡浠ｇ爜, "HMaterShortNumber": data[i].鐗╂枡浠ｇ爜, "HMaterName": data[i].鐗╂枡鍚嶇О
+ , "HMaterModel": data[i].瑙勬牸鍨嬪彿, "HUnitName": data[i].璁￠噺鍗曚綅鍚嶇О, "HUnitNumber": data[i].璁￠噺鍗曚綅浠ｇ爜
+ , "HUnitID": data[i].HUnitID, "FPrintCount": data[i].鎵撳嵃鏉＄爜鏁伴噺, "HQty": data[i].閫佽揣鏁伴噺
+ , "HRQty": data[i].鍓╀綑鍙彂璐ф暟閲�, "HSQty": data[i].婧愬崟鏁伴噺, "HBatchNo": data[i].鎵瑰彿
+ , "HBatchManager": data[i].鍚敤鎵规绠＄悊, "HOrderType": data[i].璁㈠崟绫诲瀷, "HKFDate": Format(new Date(data[i].鐢熶骇鏃ユ湡), "yyyy-MM-dd")
+ , "HKFPeriod": data[i].淇濊川鏈�, "HDate": data[i].瀛愰璁″埌璐ф棩鏈�, "HPrice": data[i].鍗曚环
+ , "HMoney": data[i].閲戦, "HRemark": data[i].瀛愬娉�, "HTAXPRICE_T": data[i].鍚◣閲嶉噺鍗曚环鍚�
+ , "HPOOrderInterID": data[i].HPOOrderInterID, "HPOOrderEntryID": data[i].HPOOrderEntryID
+ , "HPOOrderBillNo": data[i].閲囪喘璁㈠崟鍙�, "HWWOrderInterID": data[i].HWWOrderInterID
+ , "HWWOrderEntryID": data[i].HWWOrderEntryID, "HWWOrderBillNo": data[i].濮斿璁㈠崟鍙�, "HBillType": data[i].鍗曟嵁绫诲瀷
+ , "HSourceBillType": data[i].HSourceBillType, "HSourceBillNo": data[i].婧愬崟鍗曞彿, "HSupMaterNumber": data[i].渚涘簲鍟嗘枡鍙�
+ , "HSupBatchNo": data[i].渚涘簲鍟嗘壒娆�, "HExpressNumberSub": data[i].瀛愮墿娴佸崟鍙�, "HExpressSupplierSub": data[i].瀛愮墿娴佸叕鍙�
+ , "HPlanArrivalDate": data[i].鍒拌揣鏃ユ湡, "HBoxNumber": data[i].绠卞彿, "HSourceInterID": data[i].HSourceInterID
+ , "HSourceEntryID": data[i].HSourceEntryID, "FSHDD": "", "F_xbkf_Combo": ""
+ }
+ )
+ }
+ //鍒锋柊琛ㄤ綋鏁版嵁
+ table.reload('mainTable', {
+ data: rowdata
+ , height: 'full-10'
+ , loading: false
+ , done: function (index, res) {
+ layer.closeAll("loading");
+ }
+ });
+
+ //option.data = rowdata;
+ //table.render(option);
+ }
+ else {
+ layer.msg(data.Message, { icon: 2, time: 3000 });
+ }
+
+ layer.closeAll("loading");
+ },
+ error: function (result) {
+ layer.closeAll("loading");
+ layer.msg(data.Message, { icon: 2, time: 3000 });
+ }
+ });
}
////闅愯棌鍒楄缃�
@@ -907,6 +1169,79 @@
//}
});
+
+ function GetPoorderValue(obj) {
+ var Batchno = Format(new Date(), "yyyy-MM-dd").replaceAll('-', '').substr(2, 6);//6浣嶆暟褰撳墠鏃ユ湡
+
+ var HSubLen = HSubData.length + 1;
+ var a = [];
+ var HOrderType = HSubData[0].璁㈠崟绫诲瀷 == undefined ? HSubData[0].HOrderType : HSubData[0].璁㈠崟绫诲瀷
+ var HSupNum = HSubData[0].HOrderType
+ var HError = "";
+
+ //for (let i = 0; i < HSubData.length; i++) {
+ // if (obj[i].hmaterid == HSubData[i].HMaterID) {
+ // obj[i].HBatchNo = HSubData[i].HBatchNo
+ // Batchno = HSubData[i].HBatchNo
+ // break;
+ // }
+ //}
+
+ var HData_Sub = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+
+ for (let i = 0; i < obj.length; i++) {
+ for (let j = 0; j < HSubData.length; j++) {
+ if (obj[i].hmaterid == HSubData[j].HMaterID) {
+ obj[i].HBatchNo = HSubData[j].鎵瑰彿
+ Batchno = HSubData[j].HBatchNo
+ }
+ }
+ }
+
+ for (let i = 0; i < obj.length; i++) {
+ if (obj[i].璁㈠崟绫诲瀷 != HOrderType) {
+ HError += obj[i].璁㈠崟绫诲瀷;
+ }
+ var row_options = {
+ //"sorderid": HSubLen, "HPOOrderInterID": obj[i].hmainid, "HPOOrderEntryID": obj[i].hentryid, "HPOOrderBillNo": obj[i].鍗曟嵁鍙�, "HWWOrderInterID": 0,
+ //"HWWOrderEntryID": 0, "HWWOrderDetaiLID": 0., "HWWOrderBillNo": '', "HBillType": "1102", "HBatchNo": obj[i].HBatchNo, "HMaterID": obj[i].hmaterid,
+ //"HMaterNumber": obj[i].鐗╂枡浠ｇ爜, "HOldMaterNumber": obj[i].鏃х墿鏂欑紪鐮�, "HMaterShortNumber": obj[i].鐗╂枡缂栫爜, "HMaterName": obj[i].鐗╂枡鍚嶇О,
+ //"HMaterModel": obj[i].瑙勬牸鍨嬪彿, "HUnitID": obj[i].hunitid, "HUnitNumber": obj[i].璁￠噺鍗曚綅浠ｇ爜, "HUnitName": obj[i].璁￠噺鍗曚綅, "HQty": obj[i].鍙彂璐ф暟閲�,
+ //"HRQty": obj[i].鍙彂璐ф暟閲�, "HSQty": obj[i].璁㈠崟鏁伴噺, "HPrice": obj[i].鍗曚环, "HMoney": obj[i].閲戦, "HDate": new Date(), "HKFDate": new Date(),
+ //"HKFPeriod": 0, "HSourceInterID": obj[i].hmainid, "HSourceEntryID": obj[i].hentryid, "HSourceBillType": "1102", "HSourceBillNo": obj[i].鍗曟嵁鍙�,
+ //"HMTONO": obj[i].HBatchNo, "F_xbkf_Combo": '', "FSHDD": '', "FPrintCount": obj[i].鎵撳嵃鏉＄爜鏁伴噺, "HPlanArrivalDate": new Date()
+
+ "sorderid": HSubLen, "HPOOrderInterID": obj[i].hmainid, "HPOOrderEntryID": obj[i].hsubid, "HPOOrderBillNo": obj[i].璁㈠崟鍗曞彿, "HWWOrderInterID": 0,
+ "HWWOrderEntryID": 0, "HWWOrderDetaiLID": 0., "HWWOrderBillNo": '', "HBillType": "1102", "HBatchNo": obj[i].HBatchNo, "HMaterID": obj[i].hmaterid,
+ "HMaterNumber": obj[i].鐗╂枡浠ｇ爜, "HOldMaterNumber": obj[i].鏃х墿鏂欑紪鐮�, "HMaterShortNumber": obj[i].鐗╂枡缂栫爜, "HMaterName": obj[i].鐗╂枡鍚嶇О,
+ "HMaterModel": obj[i].瑙勬牸鍨嬪彿, "HUnitID": obj[i].hunitid, "HUnitName": obj[i].璁￠噺鍗曚綅, "HUnitNumber": obj[i].璁￠噺鍗曚綅浠ｇ爜, "HUnitName": obj[i].閲囪喘鍗曚綅, "HQty": obj[i].鍙彂璐ф暟閲�,
+ "HRQty": obj[i].鍙彂璐ф暟閲�, "HSQty": obj[i].閲囪喘鏁伴噺, "HPrice": obj[i].鍗曚环, "HMoney": obj[i].閲戦, "HDate": Format(new Date(), "yyyy-MM-dd"), "HKFDate": new Date().toISOString().slice(0, 10),
+ "HKFPeriod": 0, "HSourceInterID": obj[i].hmainid, "HSourceEntryID": obj[i].hsubid, "HSourceBillType": "1102", "HSourceBillNo": obj[i].璁㈠崟鍗曞彿,
+ "HMTONO": obj[i].HBatchNo, "F_xbkf_Combo": '', "FSHDD": '', "FPrintCount": obj[i].鎵撳嵃鏉＄爜鏁伴噺, "HPlanArrivalDate": new Date(),
+ "HTAXPRICE_T": obj[i].鍚◣閲嶉噺鍗曚环鍚�
+ };
+ HSubData.push(row_options);
+ HData_Sub.push(row_options);
+ HSubLen++;
+
+ //var NewRow = {
+ // "HMTONO": "", "HMaterID": 0, "HMaterNumber": "", "HOldMaterNumber": "", "HMaterShortNumber": "", "HMaterName": 0, "HMaterModel": "", "HUnitName": "0", "HUnitNumber": "",
+ // "HUnitID": "0", "FPrintCount": "0", "HRQty": "0", "HSQty": "", "HBatchNo": "", "HKFDate": "", "HKFPeriod": "", "HDate": "", "HPrice": "", "HMoney": "", "HRemark": "", "HPOOrderInterID": "", "HPOOrderEntryID": "", "HPOOrderBillNo": "", "HWWOrderInterID": "", "HWWOrderEntryID": "", "HWWOrderBillNo": "", "HBillType": "", "HSourceBillType": "", "HSourceBillNo": "", "HSupMaterNumber": "", "HSupBatchNo": "", "HExpressNumberSub": "", "HExpressSupplierSub": "", "HPlanArrivalDate": "", "HBoxNumber": "", "HSourceInterID": "", "HSourceEntryID": ""
+ //};
+ };
+ if (HError != "") {
+ return layer.msg('閲囪喘璁㈠崟璁㈠崟绫诲瀷涓嶅悓锛屼笉鍏佽鍚堝苟涓嬫帹鐢熸垚閫佽揣鍗曪紒')
+ }
+ table.reload('mainTable', {
+ data: HData_Sub
+ , height: 'full-10'
+ , loading: false
+ , done: function (index, res) {
+ layer.closeAll("loading");
+ }
+ });
+ }
+
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1