From f76f7425e575b8e4ebc63a71635c1221fe265c12 Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期三, 26 一月 2022 16:26:27 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/验收入库/外购入库/Kf_POStockInBill_Fast.html | 74 ++++++------
WebTM/views/销售管理/发货通知单/Xs_SeOutStockBillList.html | 7
WebTM/views/生产管理/生产包装单/Sc_PackUnionBill.html | 58 ++++-----
WebTM/views/IpadStepIndex.html | 2
WebTM/views/生产管理/报工台工序/产量汇报/Sc_ProductReportStepBillList_Web.html | 4
WebTM/views/生产管理/报工台工序/产量汇报/Sc_Add_ProductReportStepBillList.html | 80 +++++++-----
WebTM/views/生产管理/报工台工序/产量汇报/Sc_ProductReportStepBillList.html | 9 +
WebTM/views/生产管理/报工台工序/返工/Sc_Add_MESReturnStepWorkBillList.html | 82 +++++++++++--
8 files changed, 193 insertions(+), 123 deletions(-)
diff --git a/WebTM/views/IpadStepIndex.html b/WebTM/views/IpadStepIndex.html
index 0bb5af1..e950550 100644
--- a/WebTM/views/IpadStepIndex.html
+++ b/WebTM/views/IpadStepIndex.html
@@ -376,7 +376,7 @@
HICMOInterID = $("#df" + i + "").html(); //鐢熶骇璁㈠崟涓诲唴鐮�
HICMOEntryID = $("#ds" + i + "").html(); //鐢熶骇璁㈠崟瀛愬唴鐮�
HProcID = $("#ps" + i + "").html(); //宸ュ簭ID
- console.log(HProcID);
+
if (workcode != "" && workcode != null) {
$('.cns').removeClass('check1'); //鍒犻櫎涓嶅悓鐖剁骇clss鏍峰紡鐩稿悓鐨勬墍鏈夊厓绱�
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_Add_ProductReportStepBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_Add_ProductReportStepBillList.html"
index a03bbf6..fbde40a 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_Add_ProductReportStepBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_Add_ProductReportStepBillList.html"
@@ -241,15 +241,28 @@
<input class="layui-input" name="HWasterQty" lay-verify="HWasterQty" id="HWasterQty" autocomplete="off">
</div>
</div>
- <div class="layui-inline">
+ <!--<div class="layui-inline">
<label class="layui-form-label">鍥犳枡鎶ュ簾鏁�:</label>
<div class="layui-input-inline">
<input class="layui-input" name="HWasterQty2" lay-verify="HWasterQty2" id="HWasterQty2" autocomplete="off">
</div>
- </div>
+ </div>-->
</div>
<div class="layui-form-item">
<div class="layui-inline">
+ <label class="layui-form-label">寮�宸ユ椂闂�:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HWorkBeginDate" id="HWorkBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鎶ュ伐鏃堕棿:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HWorkReportDate" id="HWorkReportDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ </div>
+ </div>
+
+ <!--<div class="layui-inline">
<label class="layui-form-label">寮�宸ユ椂闂�:</label>
<div class="layui-input-inline">
<input class="layui-input" name="HRelBeginDate" id="HRelBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
@@ -260,7 +273,7 @@
<div class="layui-input-inline">
<input class="layui-input" name="HRelEndDate" id="HRelEndDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
- </div>
+ </div>-->
</div>
</div>
<div class="layui-tab-item">
@@ -410,11 +423,11 @@
function set_InitFrom() {
//鏃ユ湡鏃堕棿閫夋嫨鍣�
laydate.render({
- elem: '#HRelBeginDate'
+ elem: '#HWorkBeginDate'
, type: 'datetime'
});
laydate.render({
- elem: '#HRelEndDate'
+ elem: '#HWorkReportDate'
, type: 'datetime'
});
laydate.render({
@@ -448,7 +461,7 @@
{
//鍒濆鍩烘湰淇℃伅璧嬪��
$("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
- $("#HRelEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")) //鎶ュ伐鏃ユ湡
+ $("#HWorkReportDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")) //鎶ュ伐鏃ユ湡
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒跺崟鏃ユ湡
$("#HMaker").val(sessionStorage["HUserName"]); //鍒跺崟浜�
}
@@ -458,7 +471,7 @@
refSav = "Add";
//鍒濆鍩烘湰淇℃伅璧嬪��
$("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
- $("#HRelEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")) //鎶ュ伐鏃ユ湡
+ $("#HWorkReportDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")) //鎶ュ伐鏃ユ湡
$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍒跺崟鏃ユ湡
$("#HMaker").val(sessionStorage["HUserName"]); //鍒跺崟浜�
@@ -474,8 +487,8 @@
$('#HPlanQty').attr("disabled", true);
$('#HSourceName').attr("disabled", true);
$('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
- $('#HRelBeginDate').attr("disabled", true);
- $('#HRelEndDate').attr("disabled", true);
+ $('#HWorkBeginDate').attr("disabled", true);
+ $('#HWorkReportDate').attr("disabled", true);
$.ajax(
{
@@ -507,13 +520,13 @@
//$("#HSourceInterID").val(LoadData[0].HICMOInterID); //婧愬崟涓诲唴鐮�
$("#HSourceEntryID").val(LoadData[0].HSourceEntryID); //婧愬崟瀛愬唴鐮�(婧愬崟琛屽彿)
$("#HSourceBillType").val(HSourceBillType); //婧愬崟绫诲瀷
- $("#HGroupID").val(LoadData[0].HDeptID); //鐝粍ID
- $("#HGroupNumber").val(LoadData[0].HDeptNumber); //鐝粍缂栫爜
- $("#HGroupName").val(LoadData[0].HDeptName); //鐝粍
+ //$("#HGroupID").val(LoadData[0].HDeptID); //鐝粍ID
+ //$("#HGroupNumber").val(LoadData[0].HDeptNumber); //鐝粍缂栫爜
+ //$("#HGroupName").val(LoadData[0].HDeptName); //鐝粍
$("#HICMOInterID").val(LoadData[0].HICMOInterID); //鐢熶骇璁㈠崟ID
$("#HICMOEntryID").val(LoadData[0].HICMOEntryID); //鐢熶骇璁㈠崟瀛怚D
$("#HICMOBillNo").val(LoadData[0].HICMOBillNo); //鐢熶骇璁㈠崟
- $("#HRelBeginDate").val(LoadData[0].HBeginDate); //寮�宸ユ椂闂�
+ $("#HWorkBeginDate").val(LoadData[0].HBeginDate); //寮�宸ユ椂闂�
$("#HPlanQty").val(LoadData[0].HDatePlanQty); //璁″垝鏁伴噺
}
@@ -544,8 +557,8 @@
$('#HPlanQty').attr("disabled", true);
$('#HSourceName').attr("disabled", true);
$('#HSourceList').addClass("layui-btn-disabled").attr("disabled", true);
- $('#HRelBeginDate').attr("disabled", true);
- $('#HRelEndDate').attr("disabled", true);
+ $('#HWorkBeginDate').attr("disabled", true);
+ $('#HWorkReportDate').attr("disabled", true);
$.ajax(
{
@@ -587,13 +600,13 @@
$("#HICMOInterID").val(LoadData[0].HICMOInterID); //鐢熶骇璁㈠崟ID
$("#HICMOEntryID").val(LoadData[0].HICMOEntryID); //鐢熶骇璁㈠崟瀛怚D
$("#HICMOBillNo").val(LoadData[0].HICMOBillNo); //鐢熶骇璁㈠崟
- $("#HRelBeginDate").val(formatDate(LoadData[0].寮�宸ユ椂闂�)); //寮�宸ユ椂闂�
- $("#HRelEndDate").val(formatDate(LoadData[0].鎶ュ伐鏃堕棿)); //鎶ュ伐鏃堕棿
+ $("#HWorkBeginDate").val(formatDate(LoadData[0].寮�宸ユ椂闂�)); //寮�宸ユ椂闂�
+ $("#HWorkReportDate").val(formatDate(LoadData[0].鎶ュ伐鏃堕棿)); //鎶ュ伐鏃堕棿
$("#HPlanQty").val(LoadData[0].HDatePlanQty); //璁″垝鏁伴噺
$("#HQty").val(LoadData[0].姹囨姤鏁伴噺); //鎶ュ伐鏁伴噺
$("#HBadCount").val(LoadData[0].涓嶈壇鏁伴噺); //涓嶈壇鏁伴噺
$("#HWasterQty").val(LoadData[0].鍥犲伐鎶ュ簾鏁伴噺); //鍥犲伐鎶ュ簾鏁伴噺
- $("#HWasterQty2").val(LoadData[0].鍥犳枡鎶ュ簾鏁伴噺); //鍥犳枡鎶ュ簾鏁伴噺
+ /*$("#HWasterQty2").val(LoadData[0].鍥犳枡鎶ュ簾鏁伴噺); //鍥犳枡鎶ュ簾鏁伴噺*/
$("#HMaker").val(LoadData[0].鍒跺崟浜�); //鍒跺崟浜�
$("#HMakeDate").val(formatDate(LoadData[0].鍒跺崟鏃ユ湡)); //鍒跺崟鏃ユ湡
$("#HUpDater").val(sessionStorage["HUserName"]); //淇敼浜�
@@ -626,7 +639,7 @@
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
type: "GET",
- data: { "HBillType": '3714' },
+ data: { "HBillType": '3724' },
success: function (d) {
$("#HBillNo").val(d.data[0].HBillNo);
$("#HInterID").val(0);
@@ -683,6 +696,7 @@
//閫�鍑�
form.on('submit(Exit)', function (data) {
Pub_Close(1);
+ parent.location.reload();
});
@@ -863,12 +877,12 @@
dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
async: false,
success: function (datas) {
- var LoadData = datas.data.Sc_ProcessReportSub;
+ var LoadData = datas.data.Sc_ICMOBillWorkQtyStatus_Tmp;
var HQty = LoadData[0].HQty;
var HBadCount = LoadData[0].HBadQty;
var HWasterQty = LoadData[0].HWasterQty;
- var HWasterQty2 = LoadData[0].HWasterQty2;
- var yessqty = HQty + HBadCount + HWasterQty + HWasterQty2;
+ //var HWasterQty2 = LoadData[0].HWasterQty2;
+ var yessqty = HQty + HBadCount + HWasterQty; //+ HWasterQty2;
var sumqty = parseFloat($("#HQty").val()) + yessqty;
if (sumqty > parseFloat($("#HPlanQty").val())) {
layer.confirm("宸叉眹鎶ユ暟閲�:銆�" + yessqty + "銆�,褰撳墠姹囨姤鏁伴噺:銆�" + parseFloat($("#HQty").val()) + "銆戜笉鑳藉ぇ浜庤鍒掓暟閲�:銆�" + parseFloat($("#HPlanQty").val()) + "銆戯紒", {
@@ -899,9 +913,9 @@
if (objdata.field.HWasterQty == "" || objdata.field.HWasterQty == null) {
objdata.field.HWasterQty = 0;
}
- if (objdata.field.HWasterQty2 == "" || objdata.field.HWasterQty2 == null) {
- objdata.field.HWasterQty2 = 0;
- }
+ //if (objdata.field.HWasterQty2 == "" || objdata.field.HWasterQty2 == null) {
+ // objdata.field.HWasterQty2 = 0;
+ //}
var sMainStr = JSON.stringify(objdata.field);
var sMainSub = sMainStr + ';'+ refSav;
@@ -1017,14 +1031,14 @@
//鍥犲伐鎶ュ簾鏁�
var HWasterQty = $("#HWasterQty").val() == '' ? '0' : $("#HWasterQty").val();
//鍥犳枡鎶ュ簾鏁�
- var HWasterQty2 = $("#HWasterQty2").val() == '' ? '0' : $("#HWasterQty2").val();
+ //var HWasterQty2 = $("#HWasterQty2").val() == '' ? '0' : $("#HWasterQty2").val();
//鍚堟牸=閲囬泦-(涓嶈壇+鎶ュ簾)GatherQty
- Hqy = parseFloat(GatherQty) - (parseFloat(HBadCount) + parseFloat(HWasterQty) + parseFloat(HWasterQty2));
+ Hqy = parseFloat(GatherQty) - (parseFloat(HBadCount) + parseFloat(HWasterQty));
if (Hqy < 0)
{
layer.msg("鍚堟牸鏁伴噺涓嶈兘涓鸿礋鏁�!");
HBadCount = 0;
- Hqy = parseFloat(GatherQty) - (parseFloat(HBadCount) + parseFloat(HWasterQty) + parseFloat(HWasterQty2));
+ Hqy = parseFloat(GatherQty) - (parseFloat(HBadCount) + parseFloat(HWasterQty));
$("#HBadCount").val(HBadCount);
$("#HBadCount").focus();
}
@@ -1040,13 +1054,13 @@
//涓嶈壇鏁伴噺
var HBadCount = $("#HBadCount").val() == '' ? '0' : $("#HBadCount").val();
//鍥犳枡鎶ュ簾鏁�
- var HWasterQty2 = $("#HWasterQty2").val() == '' ? '0' : $("#HWasterQty2").val();
+ //var HWasterQty2 = $("#HWasterQty2").val() == '' ? '0' : $("#HWasterQty2").val();
//鍚堟牸=閲囬泦-(涓嶈壇+鎶ュ簾)GatherQty
- Hqy = parseFloat(GatherQty) - (parseFloat(HBadCount) + parseFloat(HWasterQty) + parseFloat(HWasterQty2));
+ Hqy = parseFloat(GatherQty) - (parseFloat(HBadCount) + parseFloat(HWasterQty));
if (Hqy < 0) {
layer.msg("鍚堟牸鏁伴噺涓嶈兘涓鸿礋鏁�!");
HWasterQty = 0;
- Hqy = parseFloat(GatherQty) - (parseFloat(HBadCount) + parseFloat(HWasterQty) + parseFloat(HWasterQty2));
+ Hqy = parseFloat(GatherQty) - (parseFloat(HBadCount) + parseFloat(HWasterQty));
$("#HWasterQty").val(HWasterQty);
$("#HWasterQty").focus();
}
@@ -1094,11 +1108,11 @@
layer.msg("浜у搧缂栫爜涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- if ($("#HRelBeginDate").val() == '' || $("#HRelBeginDate").val() == null) {
+ if ($("#HWorkBeginDate").val() == '' || $("#HWorkBeginDate").val() == null) {
layer.msg("寮�宸ユ椂闂翠笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- if ($("#HRelEndDate").val() == '' || $("#HRelEndDate").val() == null) {
+ if ($("#HWorkReportDate").val() == '' || $("#HWorkReportDate").val() == null) {
layer.msg("寮�宸ユ椂闂翠笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList.html"
index 58ad7b0..98059a8 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList.html"
@@ -125,6 +125,8 @@
var HSourceID = ""; //璧勬簮ID
var HICMOInterID = ""; //鐢熶骇璁㈠崟涓籌D
var HICMOEntryID = ""; //鐢熶骇璁㈠崟瀛怚D
+ var HMaker = ""; //褰撳墠鐧诲綍浜�
+ var Czybm = ""; //褰撳墠鐧诲綍浜虹紪鍙�
var HSourceInterID = ""; //鐢熶骇鐘舵�佷复鏃惰〃涓籌D
var HSourceBillType = ""; //婧愬崟绫诲瀷
var HProcID = ""; //宸ュ簭ID
@@ -206,8 +208,8 @@
, { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 200 }
, {
field: 'HBillType', title: '鍗曟嵁绫诲瀷', width: 200, templet: function (d) {
- if (d.鍗曟嵁绫诲瀷 == "3714") {
- return "宸ュ簭姹囨姤鍗�";
+ if (d.HBillType == "3724") {
+ return "浜ч噺姹囨姤涓存椂鍗�";
}
}
}
@@ -303,7 +305,8 @@
//鎶ュ伐骞冲彴杩涘叆(鏈夋簮鍗�)
function set_AddNew()
{
- sWhere = " where b.HSourceID='" + HSourceID + "' and b.HSourceBillNo='" + workcode + "' and b.HSourceInterID='" + (HSourceInterID == "null" ? 0 : HSourceInterID) + "' and b.HSourceEntryID='" + (HICMOEntryID == "null" ? 0 : HICMOEntryID) + "' and a.HMaker='" + HMaker + "' ";
+ //sWhere = " where b.HSourceID='" + HSourceID + "' and b.HSourceBillNo='" + workcode + "' and b.HSourceInterID='" + (HSourceInterID == "null" ? 0 : HSourceInterID) + "' and b.HSourceEntryID='" + (HICMOEntryID == "null" ? 0 : HICMOEntryID) + "' and a.HMaker='" + HMaker + "' ";
+ sWhere = " where a.HSourceID='" + HSourceID + "' and a.HSourceBillNo='" + workcode + "' and a.HSourceInterID='" + (HSourceInterID == "null" ? 0 : HSourceInterID) + "' and a.HSourceEntryID='" + (HICMOEntryID == "null" ? 0 : HICMOEntryID) + "' and a.HMaker='" + HMaker + "' ";
SchWhere = sWhere;
console.log(sWhere);
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html"
index fbc0f91..e833679 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\344\272\247\351\207\217\346\261\207\346\212\245/Sc_ProductReportStepBillList_Web.html"
@@ -237,9 +237,9 @@
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 200, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
, {
field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 200, templet: function (d) {
- if (d.鍗曟嵁绫诲瀷 == "3714")
+ if (d.鍗曟嵁绫诲瀷 == "3724")
{
- return "宸ュ簭姹囨姤鍗�";
+ return "浜ч噺姹囨姤涓存椂鍗�";
}
}
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\350\277\224\345\267\245/Sc_Add_MESReturnStepWorkBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\350\277\224\345\267\245/Sc_Add_MESReturnStepWorkBillList.html"
index 240ebbd..849f6ca 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\350\277\224\345\267\245/Sc_Add_MESReturnStepWorkBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\350\277\224\345\267\245/Sc_Add_MESReturnStepWorkBillList.html"
@@ -132,6 +132,22 @@
</div>
<div class="layui-form-item">
<div class="layui-inline">
+ <label class="layui-form-label">宸ュ簭搴忓彿</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HProcNo" id="HProcNo" lay-verify="number" autocomplete="off" class="layui-input" />
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">杩斿伐宸ュ簭</label>
+ <div class="layui-input-inline">
+ <div class="layui-input-inline">
+ <select name="HProcID" id="HProcID" lay-verify="required" lay-search="">
+ <option value="">閫夋嫨鎴栨悳绱㈤�夋嫨杩斿伐宸ュ簭</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <!--<div class="layui-inline">
<label class="layui-form-label">杩斿伐宸ュ簭</label>
<div class="layui-input-inline">
<input type="text" name="HProcName" id="HProcName" class="layui-input" value="" style="float:left;width:150px;">
@@ -140,17 +156,11 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
- </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">杩斿伐鏁伴噺:</label>
<div class="layui-input-inline">
<input class="layui-input" name="HQty" lay-verify="HQty" id="HQty" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">杩斿伐鏃ユ湡:</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HPlanBeginDate" id="HPlanBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
</div>
</div>
@@ -219,6 +229,12 @@
<button type="button" lay-submit="" class="layui-btn" lay-filter="HSourceList" id="HSourceList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">杩斿伐鏃ユ湡:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HPlanBeginDate" id="HPlanBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
</div>
</div>
@@ -359,6 +375,9 @@
//鍒濆鍖栬〃鍗曟彃浠�
set_InitFrom();
+ //鍒濆鍖栬繑宸ュ伐搴忓垪琛�(鎵�鏈夊伐搴�)
+ ReworkProcess();
+
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鍗�
set_AddFNew();
@@ -412,8 +431,40 @@
}
+ //鍒濆鍖栬繑宸ュ伐搴忓垪琛�(鎵�鏈夊伐搴�)
+ function ReworkProcess()
+ {
+ $.ajax(
+ {
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MESReturnStepWorkBill/GetMESReturnStepSelectBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1)// 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ {
+ var str = ''; //澹版槑瀛楃涓�
+ $("#HProcID option:gt(0)").remove();//閲嶆柊鍔犺浇鍓嶏紝绉婚櫎绗竴涓互澶栫殑option
+ $.each(data.data, function (i, obj) {
+ str += '<option value="' + obj.HItemID + '">' + obj.宸ュ簭鍚嶇О + '</option>';
+ });//閬嶅巻寰幆閬嶅巻
+ $(str).appendTo("#HProcID");//缁戝畾
+ form.render("select");//娉ㄦ剰锛氭渶鍚庡繀椤婚噸鏂版覆鏌撲笅鎷夋锛屽惁鍒欐病鏈変换浣曟晥鏋溿��
+ }
+ else
+ {
+ layer.alert(data.Message, { icon: 5 });
+ }
+ },
+ error: function (err) {
+ layer.alert(err, { icon: 5 });
+ }
+ });
+ }
+
//鏈夋簮鍗曟柊澧�
function set_AddNew() {
+
refSav = "Add";
//鍒濆鍩烘湰淇℃伅璧嬪��
$("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //鍗曟嵁鏃ユ湡
@@ -429,7 +480,7 @@
$('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
$('#HMaterName').attr("disabled", true);
$('#HMaterSpec').attr("disabled", true);
- $('#HProcID').attr("disabled", true);
+ //$('#HProcID').attr("disabled", true);
$('#HProcName').attr("disabled", true);
$('#HProcList').addClass("layui-btn-disabled").attr("disabled", true);
$('#HPlanBeginDate').attr("disabled", true);
@@ -470,13 +521,11 @@
$("#HSourceBillNo").val(HSourceBillNo); //婧愬崟鍐呯爜
$("#HSourceInterID").val(HSourceInterID); //婧愬崟涓荤爜
$("#HSourceEntryID").val(HSourceEntryID); //婧愬崟瀛愮爜
-
- $("#HProcID").val(LoadData[0].HProcID); //杩斿伐宸ュ簭ID
- $("#HProcName").val(LoadData[0].HProcName); //杩斿伐宸ュ簭
+ //$("#HProcID").val(LoadData[0].HProcID); //杩斿伐宸ュ簭ID
+ //$("#HProcName").val(LoadData[0].HProcName); //杩斿伐宸ュ簭
$("#HDeptID").val(LoadData[0].HDeptID); //杞﹂棿ID
$("#HDeptName").val(LoadData[0].HDeptName); //杞﹂棿
-
}
else {
@@ -603,6 +652,7 @@
{
return false;
}
+
$.ajax({
type: "POST",
url: GetWEBURL() + "/Sc_MESReturnStepWorkBill/SaveGetMESReturnStepWorkFrom", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
@@ -924,6 +974,14 @@
layer.msg("鍗曟嵁鏃ユ湡涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
+ if ($("#HProcNo").val() == '' || $("#HProcNo").val() == null) {
+ layer.msg("杩斿伐宸ュ簭鍙蜂笉鑳戒负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if ($("#HProcID").val() == '' || $("#HProcID").val() == null) {
+ layer.msg("杩斿伐宸ュ簭涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
if ($("#HMaterID").val() == '' || $("#HMaterID").val() == null) {
layer.msg("浜у搧缂栫爜涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\214\205\350\243\205\345\215\225/Sc_PackUnionBill.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\214\205\350\243\205\345\215\225/Sc_PackUnionBill.html"
index 37d99ac..86c54fd 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\214\205\350\243\205\345\215\225/Sc_PackUnionBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\214\205\350\243\205\345\215\225/Sc_PackUnionBill.html"
@@ -35,6 +35,18 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">绠卞彿鏉＄爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" id="BoxBarCode" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏉＄爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" id="BarCode" style="width:190px;">
+ </div>
+ </div>
+ <!--<div class="layui-inline">
<label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-block">
<input type="date" class="layui-input" id="HDate" style="width:190px;">
@@ -45,31 +57,13 @@
<div class="layui-input-block">
<input type="date" class="layui-input" id="HDate1" style="width:190px;">
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">閮ㄩ棬鍚嶇О</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" id="HDepartName" style="width:190px;">
- </div>
- </div>
-
+ </div>-->
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<div class="layui-colla-content">
- <div class="layui-inline">
- <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" id="HMaterNumber" style="width:190px;">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鐗╂枡鍚嶇О</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" id="HMaterName" style="width:190px;">
- </div>
- </div>
+
<div class="layui-inline">
<label class="layui-form-label">鍒跺崟浜�</label>
<div class="layui-input-block">
@@ -198,8 +192,8 @@
resultTableHead = []; //娓呯┖琛ㄥご鍒楋紝闃叉閲嶅娓叉煋
//鍒濆鏌ヨ
//get_Display(sWhere);
- $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
- $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));
+ $("#HDate1").val(Format(new Date(new Date()), "yyyy-MM-dd"));
get_FastQuery();
}
@@ -314,8 +308,8 @@
var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
- var HDepartName = $("#HDepartName").val();
- var HMaterNumber = $("#HMaterNumber").val();
+ var BoxBarCode = $("#BoxBarCode").val();
+ var BarCode = $("#BarCode").val();
var HMaterName = $("#HMaterName").val();
var HMakerMan = $("#HMakerMan").val();
@@ -328,11 +322,11 @@
if (HBillNo) {
sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
}
- if (HDepartName) {
- sWhere += " and 閮ㄩ棬 like '%" + HDepartName + "%'";
+ if (BoxBarCode) {
+ sWhere += " and 绠卞彿鏉″舰鐮� like '%" + BoxBarCode + "%'";
}
- if (HMaterNumber) {
- sWhere += " and 鐗╂枡浠ｇ爜 like '%" + HMaterNumber + "%'";
+ if (BarCode) {
+ sWhere += " and 鏉＄爜 like '%" + BarCode + "%'";
}
if (HMaterName) {
sWhere += " and 鐗╂枡鍚嶇О like '%" + HMaterName + "%'";
@@ -345,11 +339,11 @@
}
//閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
- $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
- $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));
+ $("#HDate1").val(Format(new Date(new Date()), "yyyy-MM-dd"));
$("#HBillNo").val("");
- $("#HDepartName").val("");
- $("#HMaterNumber").val("");
+ $("#BoxBarCode").val("");
+ $("#BarCode").val("");
$("#HMaterName").val("");
$("#HMakerMan").val("");
sWhere = " ";
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
index b8ed92d..971867a 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\345\217\221\350\264\247\351\200\232\347\237\245\345\215\225/Xs_SeOutStockBillList.html"
@@ -143,13 +143,14 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- get_Display(sWhere);
+ get_FastQuery(table, option);
+ //get_Display(sWhere);
}
//#endregion
//#region 鍒濆鍖栬〃鏍兼柟娉�
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
function set_InitGrid() {
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
index eaa21c2..11000ba 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html"
@@ -383,15 +383,15 @@
, where: { HBillID: linterid, HBillType: '1201', sWhere: '' }
, cols: [[
{ type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', sort: true }
- , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', sort: true }
- , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', sort: true }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', sort: true }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', sort: true }
- , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', sort: true }
- , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', sort: true }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', sort: true }
- , { field: 'HBatchNo', title: '鎵规', sort: true }
+ , { field: 'HQty', title: '鏁伴噺', sort: true, width:100 }
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', sort: true, width: 100}
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', sort: true, width: 200}
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', sort: true, width: 200}
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', sort: true,width: 200}
+ , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', sort: true, width: 200 }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', sort: true, width: 200}
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', sort: true, width: 200}
+ , { field: 'HBatchNo', title: '鎵规', sort: true, width: 200}
]]
, height: 500
, done: function () {
@@ -649,17 +649,17 @@
, where: { HBillID: sInterID, HBillType: '1201', sWhere: '' }
, cols: [[
{ type: 'radio' }
- , { field: 'HQty', 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: 'HQty', title: '鏁伴噺', width: 100 }
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 100 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 200 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 200 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 200 }
+ , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 200 }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 200 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 200 }
+ , { field: 'HBatchNo', title: '鎵规', width: 200 }
+ , { field: 'HAuxPropID', title: '杈呭姪灞炴��', width: 200 }
+ , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 200 }
]]
, height: 500
})
@@ -865,15 +865,15 @@
, cellMinWidth : 115
, cols: [[
{ type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', sort: true }
- , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', sort: true }
- , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', sort: true }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', sort: true }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', sort: true }
- , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', sort: true }
- , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', sort: true }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', sort: true }
- , { field: 'HBatchNo', title: '鎵规', sort: true }
+ , { field: 'HQty', title: '鏁伴噺', sort: true, width:100 }
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', sort: true, width: 100 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', sort: true, width: 200}
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', sort: true, width: 200}
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', sort: true, width: 200}
+ , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', sort: true, width: 200}
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', sort: true, width: 200}
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', sort: true, width: 200}
+ , { field: 'HBatchNo', title: '鎵规', sort: true, width: 200}
]]
, height: 500
, done: function () {
@@ -934,14 +934,14 @@
, where: { HBillID: sInterID, HBillType: '1201', sWhere: '' }
, cols: [[
{ type: 'radio' }
- , { field: 'HQty', title: '鏁伴噺', sort: true }
- , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', sort: true }
- , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', sort: true }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', sort: true }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', sort: true }
- , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', sort: true }
- , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', sort: true }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', sort: true }
+ , { field: 'HQty', title: '鏁伴噺', sort: true, width: 100}
+ , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', sort: true, width: 100}
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', sort: true, width: 200}
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', sort: true, width: 200}
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', sort: true, width: 200}
+ , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', sort: true, width: 200}
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', sort: true, width: 200}
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', sort: true, width: 200}
, { field: 'HBatchNo', title: '鎵规'}
]]
// , data: [linterid]
--
Gitblit v1.9.1