From 80d89438efd0d6516ca46abf93ed5511579372f3 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 18 三月 2022 11:23:01 +0800
Subject: [PATCH] 1
---
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdInBillList.html | 38 +++++-
WebTM/views/生产管理/报工台工序/开工/Sc_Add_MESBeginStepWorkBillList.html | 19 +++
WebTM/views/index.html | 7 +
WebTM/views/生产管理/生产装箱单/QK_PackingBill.html | 234 ++++++++++++++++++++++++++++++++++++++++++++++
WebTM/WebTM.csproj | 1
5 files changed, 290 insertions(+), 9 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index f948c29..d41cc62 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -817,6 +817,7 @@
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇姹囨姤鍗昞Sc_Add_ICMOReportBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鐗╂枡娓呭崟\sc_Gy_ICBomBillMainList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇缁勮杩芥函鍗昞Sc_AssemblyBillList.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鐢熶骇瑁呯鍗昞QK_PackingBill.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇瑁呯鍗昞Sc_PackUnionBill_Fast.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇閫�搴撳崟\Sc_ProductionReturnList.html" />
<Content Include="views\鐢熶骇绠＄悊\缁勮鍗昞Sc_GroupOrderBillList.html" />
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 24c4b94..55dea21 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -410,6 +410,13 @@
</dl>
</dd>
<dd>
+ <a>澧欏挃瑁呯</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇瑁呯鍗�/QK_PackingBill.html">澧欏挃瑁呯鍗�</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇瑁呯鍗�/QK_PackedBillList.html">宸茶绠卞崟鎹垪琛�</a></dd>
+ </dl>
+ </dd>
+ <dd>
<a>鎶ヨ〃鍒嗘瀽</a>
<dl class="layui-nav-child append" id="append">
<dd><a lay-href="">杞﹂棿鍦ㄥ埗鍝佸垎鏋恘</a></dd>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillList.html"
index c9fdef9..5d61401 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdInBillList.html"
@@ -30,6 +30,12 @@
</div>
</div>
<div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
<label class="layui-form-label">鐘舵��</label>
<div class="layui-input-block">
<select name="HStatus" lay-filter="HStatus" style="width:190px;">
@@ -52,7 +58,7 @@
<input type="date" class="layui-input" id="HEndDate" style="width:190px;">
</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>
@@ -61,12 +67,6 @@
<div class="layui-inline">
<div class="layui-inline">
<span>鍏朵粬鏉′欢></span>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁鍙�</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:190px;">
</div>
</div>
<div class="layui-inline">
@@ -85,6 +85,18 @@
<label class="layui-form-label">鍣ㄥ叿浠ｇ爜</label>
<div class="layui-input-block">
<input type="text" class="layui-input" name="HModelNumber" id="HModelNumber" 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" name="HWhName" id="HWhName" 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" name="HSupName" id="HSupName" style="width:190px;">
</div>
</div>
</div>
@@ -643,8 +655,10 @@
var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
var HDept = $("#HDept").val(); //閮ㄩ棬淇℃伅
- var HMaterNumber = $("#HMaterNumber").val(); //閮ㄩ棬淇℃伅
- var HModelNumber = $("#HModelNumber").val(); //閮ㄩ棬淇℃伅
+ var HMaterNumber = $("#HMaterNumber").val(); //鐗╂枡浠ｇ爜
+ var HModelNumber = $("#HModelNumber").val(); //鍣ㄥ叿浠ｇ爜
+ var HWhName = $("#HWhName").val(); //浠撳簱鍚嶇О
+ var HSupName = $("#HSupName").val(); //寰�鏉ュ崟浣�
if (HStatus) {
switch (HStatus) {
case '-1': //鍏ㄩ儴
@@ -680,6 +694,12 @@
if (HModelNumber) {
sWhere += " and 妯″叿浠ｇ爜 like '%" + HModelNumber + "%'";
}
+ if (HWhName) {
+ sWhere += " and 鏀舵枡浠撳簱 like '%" + HWhName + "%'";
+ }
+ if (HSupName) {
+ sWhere += " and 寰�鏉ュ崟浣� like '%" + HSupName + "%'";
+ }
var index = layer.load(0);
get_Display(sWhere);
//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
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 0f0a3a6..882296a 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"
@@ -86,6 +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="NewAdd" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="NewAdd">鏂板</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" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
@@ -695,6 +696,24 @@
}
});
+ form.on('submit(NewAdd)', function (data) {
+ $("#HInterID").val("0");
+ $("#HBillNo").val("");
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '3787' },
+ 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"]); //榛樿鎿嶄綔鍛�
+ }
+ });
+ set_AddFNew();
+ });
//淇濆瓨鎻愪氦
form.on('submit(Saver)', function (data) {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/QK_PackingBill.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/QK_PackingBill.html"
new file mode 100644
index 0000000..065cf08
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\243\205\347\256\261\345\215\225/QK_PackingBill.html"
@@ -0,0 +1,234 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>澧欏挃瑁呯鍗�</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <!--<script src="../../../layuiadmin/layui/layui.js"></script>-->
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 100px">鐢熶骇浠诲姟鍗曞彿锛�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HBillNo" id="HBillNo" placeholder="璇疯緭鍏ュ悗鍥炶溅" class="layui-input" value="" style="float:left;width:260px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnPack" id="btnPack" style="padding: 0 30px; margin-left: 150px">鏁磋鐢熸垚</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnAssembly" id="btnAssembly" style="padding:0 30px">鎷艰鐢熸垚</button>
+ </div>
+ </div>
+ </form>
+ </div>
+
+ <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鏄庣粏淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script type="text/javascript">
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ //鏌ヨ鏉′欢
+ var option = [];
+ //#endregion
+
+ //#region 鍒濆鍖�
+ //鍒濆鍖栬〃鏍�
+ $("#HBillNo").focus();
+ set_InitGrid();
+ //#endregion
+
+ //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+ //鎵簮鍗�
+ $('#HBillNo').on('keydown', function (event) {
+ if (event.keyCode == 13) {
+ var HBillNo = $('#HBillNo').val();
+ $.ajax({
+ url: GetWEBURL() + 'Sc_ICMOBill/QK_PackingBillByXSBill',
+ type: "GET",
+ data: { "HBillNo": HBillNo },
+ success: function (result) {
+ if (result.count == 1) {
+ option.data = result.data;
+ table.render(option);
+ }
+ else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index0);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ });
+ //鏁寸鐢熸垚
+ form.on('submit(btnPack)', function (data) {
+ var flag = "ZZ";
+ SavePack(flag);
+ });
+ //鎷肩鐢熸垚
+ form.on('submit(btnAssembly)', function (data) {
+ var flag = "PZ";
+ SavePack(flag);
+ });
+ //#endregion
+
+
+ //#region 姝ら〉闈㈡墍鏈夋柟娉�
+ //鍒濆鍖栨槑缁嗚〃鏍�
+ function set_InitGrid() {
+ columns = [
+ { type: 'checkbox', fixed: 'left' }
+ , { field: 'HInterID', title: 'HInterID', edit: 'text', width: 100, hide: true }
+ , { field: 'HBillNo', title: 'HBillNo', edit: 'text', width: 100, hide: true }
+ , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
+ , { field: 'HMaterCode', title: '鐗╂枡浠ｇ爜', edit: 'text', width: 100 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 }
+ , { field: 'HUnitID', title: 'HUnitID', edit: 'text', width: 100, hide: true }
+ , { field: 'HUnitName', title: '璁￠噺鍗曚綅', edit: 'text', width: 100 }
+
+ , { field: 'HWeight', title: '鍑�閲�', edit: 'text', width: 100 }
+ , { field: 'HMWeight', title: '姣涢噸', edit: 'text', width: 100 }
+ , { field: 'HPWeight', title: '鐨噸', edit: 'text', width: 100 }
+
+ , { field: 'HQty', title: '鏁伴噺', edit: 'text', width: 100 }
+ , { field: 'HMinQty', title: '鏈�灏忓寘瑁呮暟', edit: 'text', event: 'HMinQty', width: 100 }
+ , { field: 'HTotalQty', title: '鐢熸垚鏉℃暟', edit: 'text', width: 100 }
+ , { field: 'HSpsQty', title: '鍓╀綑鏁伴噺', edit: 'text', width: 100 }
+ , { field: 'HAddress', title: '浜よ揣鍦扮偣', edit: 'text', width: 100 }
+ , { field: 'HDate', title: '浜よ揣鏃ユ湡', width: 100, templet: "<div>{{d.HDate ==null ?'':layui.util.toDateString(d.HDate, 'yyyy-MM-dd')}}</div>"}
+ , { field: 'HOutStockQty', title: '鍑哄簱鏁伴噺', edit: 'text', width: 100 }
+ , { field: 'HInvoiceQty', title: '寮�绁ㄦ暟閲�', edit: 'text', width: 100 }
+ , { field: 'HTaxPrice', title: '鍚◣鍗曚环', edit: 'text', width: 100 }
+ , { field: 'HPrice', title: '涓嶅惈绋庡崟浠�', edit: 'text', width: 100 }
+ , { field: 'HMoney', title: '閲戦', edit: 'text', width: 100 }
+ , { field: 'HCusID', title: 'HCusID', edit: 'text', width: 100, hide: true }
+ , { field: 'HCusName', title: '瀹㈡埛', edit: 'text', width: 100 }
+ , { field: 'HEmpID', title: 'HEmpID', edit: 'text', width: 100, hide: true}
+ , { field: 'HEmpName', title: '涓氬姟鍛�', edit: 'text', width: 100 }
+ ];
+ option = {
+ id: 'mainTable'
+ , elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , page: false
+ , cellMinWidth: 120
+ , height: 500
+ , cols: [columns]
+ , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ , done: function (res, curr, count) {
+ }
+ };
+ option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HUnitID": 0, "HUnitName": "", "HWeight": 0, "HMWeight": 0,"HPWeight":0,"HQty": 0, "HMinQty": 0, "HTotalQty": 0, "HSpsQty": 0, "HAddress": "", "HDate": "", "HOutStockQty": 0, "HInvoiceQty": 0, "HTaxPrice": 0, "HPrice": 0, "HMoney": 0, "HCusID": 0, "HCusName": "", "HEmpID": 0, "HEmpName": "" }];
+ table.render(option);
+ }
+ //鏁寸鐢熸垚
+ function SavePack(flag) {
+ var sSubStr = JSON.stringify(table.cache['mainTable']) + ";" + sessionStorage["HUserName"] + ";" + flag;
+ if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
+ {
+ return false;
+ }
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/Sc_ICMOBill/QK_PackingBillSavePack", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "msg": sSubStr},
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂�
+ });
+ }
+ else {
+ f_alert(data.Message);
+ console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+
+ f_alert("閿欒:" + err);
+ console.log("Reason" + sMainStr);
+ }
+ });
+ }
+
+ //闈炵┖楠岃瘉
+ function AllowLoadData(sSubStr) {
+ var Result = true;
+ if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+ sSubStr = JSON.parse(sSubStr);
+ for (var i = 0; i < sSubStr.length; i++) {
+ if (sSubStr[i].HMinQty == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鏈�灏忓寘瑁呮暟涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ }
+ }
+ else {
+ return Result = true;
+ }
+ return Result;
+ }
+ //?
+ function f_alert(sMsg) {
+ layer.alert(sMsg, { icon: 5 });
+
+ }
+ //#endregion
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
--
Gitblit v1.9.1