From 073c695d21829fa8aaa0792c84b7ab48f31f8ed4 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期三, 19 一月 2022 00:46:31 +0800
Subject: [PATCH] 雅琪诺报工台产量汇报修改
---
WebTM/WebTM.csproj.user | 2
WebTM/views/生产管理/报工台工序/开工/Sc_Add_MESBeginStepWorkBillList.html | 10 +++--
WebTM/views/IpadStepIndex.html | 1
WebTM/views/生产管理/产量汇报单/Sc_Add_ProductReportBillList.html | 2
WebTM/views/生产管理/报工台工序/产量汇报/Sc_Add_ProductReportStepBillList.html | 41 ++++++++++----------
WebTM/views/生产管理/报工台工序/产量汇报/Sc_ProductReportStepBillList.html | 4 +
WebTM/views/生产管理/报工台工序/开工/Sc_MESBeginStepWorkBillList.html | 10 ++++
WebTM/WebTM.csproj | 2
8 files changed, 43 insertions(+), 29 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index ea54503..b617e96 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -790,6 +790,7 @@
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇寮�宸ュ崟\Sc_Add_MESBeginWorkBillList - 澶嶅埗.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇寮�宸ュ崟\Sc_Add_MESBeginWorkBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇寮�宸ュ崟\Sc_MESBeginWorkBillList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇鎷嗙鍗昞Sc_PackSplitBill_Fast.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇姹囨姤鍗昞Sc_ICMOReportBill_FastNew.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇姹囨姤鍗昞Sc_Add_ICMOReportBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇缁勮杩芥函鍗昞Sc_AssemblyBillList.html" />
@@ -1176,7 +1177,6 @@
<ItemGroup>
<Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曟牳瀵筡" />
<Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曠ń鏍竆" />
- <Folder Include="views\鐢熶骇绠＄悊\鐢熶骇鎷嗙鍗昞" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index c147982..87674ea 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <NameOfLastUsedPublishProfile>JFTM</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\鏅轰簯MES\Lay-Ui\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ShowAllFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
diff --git a/WebTM/views/IpadStepIndex.html b/WebTM/views/IpadStepIndex.html
index 74f9879..8488760 100644
--- a/WebTM/views/IpadStepIndex.html
+++ b/WebTM/views/IpadStepIndex.html
@@ -725,6 +725,7 @@
"HMaker": sessionStorage["HUserName"], //sessionStorage["HUserName"]
"Czybm": sessionStorage["Czybm"],
//"HEmpID": "0", //sessionStorage["HEmpID"]
+ "HSourceInterID": HSourceInterID,
"HSourceBillType": HSourceBillType,
"HProcID": HProcID
});
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProductReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProductReportBillList.html"
index d8f5c28..9685919 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProductReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_Add_ProductReportBillList.html"
@@ -836,7 +836,7 @@
dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
async: false,
success: function (datas) {
- var LoadData = datas.data.Sc_ICMOBillWorkQtyStatus_Tmp;
+ var LoadData = datas.data.Sc_ProcessReportSub;
var HQty = LoadData[0].HQty;
var HBadQty = LoadData[0].HBadQty;
var HWasterQty = LoadData[0].HWasterQty;
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 430b58f..a03bbf6 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"
@@ -86,8 +86,7 @@
<form id="form0" class="layui-form" lay-filter="component-form-group" action="">
<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="Saver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
<button type="button" id="VerIfySaver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="VerIfySaver">瀹℃牳</button>
<button type="button" id="ReVerIfySaver" class="layui-btn layui-btn-normal layui-btn-circle" lay-submit="" lay-filter="ReVerIfySaver">鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
@@ -347,7 +346,7 @@
<script>
//鑾峰彇鍙傛暟
var HBillType = ""; //鍗曟嵁绫诲瀷
- var HSourceInterID = ""; //婧愬崟涓诲唴鐮�
+ var HSourceInterID = ""; //婧愬崟涓诲唴鐮侊紙鐢熶骇鐘舵�佷复鏃惰〃涓诲唴鐮侊級
var HSourceEntryID = ""; //婧愬崟瀛愬唴鐮�
var HSourceBillNo = ""; //婧愬崟鍗曞彿
var HSourceBillType = ""; //婧愬崟绫诲瀷
@@ -505,6 +504,7 @@
$("#HSourceName").val(LoadData[0].HSourceName); //鐢熶骇璧勬簮
$("#HSourceBillNo").val(LoadData[0].HICMOBillNo); //婧愬崟鍗曞彿锛堟殏鏃跺彇鍊艰鍗曠紪鍙凤級
$("#HSourceInterID").val(LoadData[0].HSourceInterID); //婧愬崟涓诲唴鐮�(鍙栧�糎InterID)
+ //$("#HSourceInterID").val(LoadData[0].HICMOInterID); //婧愬崟涓诲唴鐮�
$("#HSourceEntryID").val(LoadData[0].HSourceEntryID); //婧愬崟瀛愬唴鐮�(婧愬崟琛屽彿)
$("#HSourceBillType").val(HSourceBillType); //婧愬崟绫诲瀷
$("#HGroupID").val(LoadData[0].HDeptID); //鐝粍ID
@@ -659,12 +659,12 @@
//淇濆瓨鎻愪氦
- form.on('submit(Saver)', function (data) {
+ form.on('submit(Saver)', function (objdata) {
if (!AllowLoadData())//鏁版嵁楠岃瘉
{
return false;
}
- OverStepQty(data);
+ OverStepQty(objdata);
});
@@ -846,7 +846,7 @@
//楠岃瘉姹囨姤鏁伴噺鏄惁瓒呰繃璁″垝鏁伴噺
- function OverStepQty(data) {
+ function OverStepQty(objdata) {
var sWhere = "";
if (OperationType == 3) //缂栬緫
{
@@ -855,7 +855,7 @@
HSourceBillNo = $("#HSourceBillNo").val();
HSourceBillType = $("#HSourceBillType").val();
}
- sWhere = " where HSourceID='" + $("#HSourceID").val() + "' and HSourceInterID='" + HSourceInterID + "' and HSourceEntryID='" + HSourceEntryID + "' and HSourceBillNo='" + HSourceBillNo + "' and HSourceBillType='" + HSourceBillType + "' ";
+ sWhere = " where HSourceID='" + $("#HSourceID").val() + "' and HProcID='" + $("#HProcID").val() + "' and HSourceInterID='" + $("#HSourceInterID").val() + "' and HSourceEntryID='" + HSourceEntryID + "' and HSourceBillNo='" + HSourceBillNo + "' and HSourceBillType='" + HSourceBillType + "' ";
$.ajax({
url: GetWEBURL() + "/Sc_MESBeginStepWorkBill/GetMESOverStepQty",
type: "GET",
@@ -863,9 +863,9 @@
dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
async: false,
success: function (datas) {
- var LoadData = datas.data.Sc_ICMOBillWorkQtyStatus_Tmp;
+ var LoadData = datas.data.Sc_ProcessReportSub;
var HQty = LoadData[0].HQty;
- var HBadCount = LoadData[0].HBadCount;
+ var HBadCount = LoadData[0].HBadQty;
var HWasterQty = LoadData[0].HWasterQty;
var HWasterQty2 = LoadData[0].HWasterQty2;
var yessqty = HQty + HBadCount + HWasterQty + HWasterQty2;
@@ -882,7 +882,7 @@
});
}
else {
- Submit(data);
+ Submit(objdata);
}
},
error: function (err) {
@@ -892,18 +892,19 @@
}
//鎻愪氦璇锋眰ajax
- function Submit(data) {
- if (data.field.HBadCount == "" || data.field.HBadCount == null) {
- data.field.HBadCount = 0;
+ function Submit(objdata) {
+ if (objdata.field.HBadCount == "" || objdata.field.HBadCount == null) {
+ objdata.field.HBadCount = 0;
}
- if (data.field.HWasterQty == "" || data.field.HWasterQty == null) {
- data.field.HWasterQty = 0;
+ if (objdata.field.HWasterQty == "" || objdata.field.HWasterQty == null) {
+ objdata.field.HWasterQty = 0;
}
- if (data.field.HWasterQty2 == "" || data.field.HWasterQty2 == null) {
- data.field.HWasterQty2 = 0;
+ if (objdata.field.HWasterQty2 == "" || objdata.field.HWasterQty2 == null) {
+ objdata.field.HWasterQty2 = 0;
}
- var sMainStr = JSON.stringify(data.field);
- var sMainSub = sMainStr + ';' + refSav;
+ var sMainStr = JSON.stringify(objdata.field);
+ var sMainSub = sMainStr + ';'+ refSav;
+
$.ajax({
type: "POST",
@@ -1093,7 +1094,7 @@
layer.msg("浜у搧缂栫爜涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- if ($("#HRelBeginDate").val() == '' || $("#HWorkBeginDate").val() == null) {
+ if ($("#HRelBeginDate").val() == '' || $("#HRelBeginDate").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 71c0604..1a5d13f 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,7 @@
var HSourceID = ""; //璧勬簮ID
var HICMOInterID = ""; //鐢熶骇璁㈠崟涓籌D
var HICMOEntryID = ""; //鐢熶骇璁㈠崟瀛怚D
+ var HSourceInterID = ""; //鐢熶骇鐘舵�佷复鏃惰〃涓籌D
var HSourceBillType = ""; //婧愬崟绫诲瀷
var HProcID = ""; //宸ュ簭ID
var SchWhere = ""; //鎸夐挳鏌ヨ鍙傛暟
@@ -136,6 +137,7 @@
HICMOEntryID = data[0].HICMOEntryID;
HMaker = data[0].HMaker;
Czybm = data[0].Czybm;
+ HSourceInterID = data[0].HSourceInterID;
HSourceBillType = data[0].HSourceBillType;
HProcID = data[0].HProcID;
}
@@ -237,7 +239,7 @@
//鎶ュ伐骞冲彴杩涘叆(鏈夋簮鍗�)
function set_AddNew()
{
- sWhere = " where b.HSourceID='" + HSourceID + "' and b.HSourceBillNo='" + workcode + "' and b.HSourceInterID='" + (HICMOInterID == "null" ? 0 : HICMOInterID) + "' 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 + "' ";
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/\345\274\200\345\267\245/Sc_Add_MESBeginStepWorkBillList.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/\345\274\200\345\267\245/Sc_Add_MESBeginStepWorkBillList.html"
index d6b32ca..0428426 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/\345\274\200\345\267\245/Sc_Add_MESBeginStepWorkBillList.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/\345\274\200\345\267\245/Sc_Add_MESBeginStepWorkBillList.html"
@@ -89,8 +89,9 @@
<button type="button" id="Saver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
<button type="button" id="VerIfySaver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="VerIfySaver">瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="a_href" id="a_href">瀵煎嚭</button>
</div>
-
+
</div>
<div class="layui-card-body">
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
@@ -584,6 +585,10 @@
success: function (d) {
$("#HBillNo").val(d.data[0].HBillNo);
$("#HInterID").val(0);
+ //$("#HGroupID").val(sessionStorage["HGroupID"]); //榛樿鐝粍ID
+ //$("#HGroupName").val(sessionStorage["HGroup"]); //榛樿鐝粍
+ //$("#HEmpID").val(sessionStorage["HKeeperID"]); //榛樿鎿嶄綔鍛業D
+ //$("#HEmpName").val(sessionStorage["HKeeper"]); //榛樿鎿嶄綔鍛�
}
});
}
@@ -611,9 +616,6 @@
OperationType = 2;
}
});
-
-
-
//淇濆瓨鎻愪氦
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/\345\274\200\345\267\245/Sc_MESBeginStepWorkBillList.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/\345\274\200\345\267\245/Sc_MESBeginStepWorkBillList.html"
index ccfd4b6..1de5b21 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/\345\274\200\345\267\245/Sc_MESBeginStepWorkBillList.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/\345\274\200\345\267\245/Sc_MESBeginStepWorkBillList.html"
@@ -194,7 +194,7 @@
sWhere += " and 璧勬簮浠ｇ爜 like '%" + HSource + "%' or 璧勬簮鍚嶇О like '%" + HSource + "%'";
}
$.ajax({
- url: GetWEBURL() + '/Sc_MESBeginStepWorkBill/GetMESBeginStepWorkBillStaus',
+ url: GetWEBURL() + '/Sc_MESBeginStepWorkBill/GetMESBeginStepWorkBill',
type: "GET",
data: { "sWhere": sWhere },
success: function (data1) {
@@ -293,6 +293,14 @@
function get_Display()
{
var ajaxLoad = layer.load();
+ var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
+ var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
+ if (HDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+ }
+ if (HDate1) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+ }
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
url: GetWEBURL() + '/Sc_MESBeginStepWorkBill/GetMESBeginStepWorkBill',
--
Gitblit v1.9.1