From 1b30a42460599a211120af2eeb6c0f074b58d871 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期日, 23 一月 2022 20:32:24 +0800
Subject: [PATCH] 新增了拆箱单 扫描条码单页签功能
---
WebTM/WebTM.csproj.user | 2
WebTM/views/生产管理/生产拆箱单/Sc_PackSplitBill_Fast.html | 23 ++---
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html | 26 +++---
WebTM/views/home/console_Mobile.html | 6 +
WebTM/views/领料发货/领料出库/Kf_MateOutBill_Fast.html | 180 +++++++++++++++++++++++++++++++++++++-------
5 files changed, 178 insertions(+), 59 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 87674ea..c147982 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>D:\鏅轰簯MES\Lay-Ui\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>JFTM</NameOfLastUsedPublishProfile>
<ProjectView>ShowAllFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
diff --git a/WebTM/views/home/console_Mobile.html b/WebTM/views/home/console_Mobile.html
index 5278b38..f658647 100644
--- a/WebTM/views/home/console_Mobile.html
+++ b/WebTM/views/home/console_Mobile.html
@@ -82,6 +82,12 @@
<cite>璋冩嫧鍗�</cite>
</a>
</li>
+ <li class="layui-col-xs3">
+ <a href="../鐢熶骇绠＄悊/鐢熶骇鎷嗙鍗�/Sc_PackSplitBill_Fast.html" target="main_self_frame">
+ <i class="layui-icon layui-icon-find-fill"></i>
+ <cite>鐢熶骇鎷嗙鍗�</cite>
+ </a>
+ </li>
</ul>
</div>
</div>
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
index 3db65a7..6b91273 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html"
@@ -50,21 +50,11 @@
<option value="3720">鐢熶骇浠诲姟鍗�-鎶曟枡</option>
<option value="1243">璋冩嫧鐢宠鍗�</option>
<!--<option value="1201">濮斿璁㈠崟-鎶曟枡</option>
- <option value="1402">鍙戣揣閫氱煡鍗�</option>
- <option value="1234">涓嬫灦閫氱煡鍗�</option>
- <option value="1243">璋冩嫧鐢宠鍗�</option>-->
+ <option value="1402">鍙戣揣閫氱煡鍗�</option>
+ <option value="1234">涓嬫灦閫氱煡鍗�</option>
+ <option value="1243">璋冩嫧鐢宠鍗�</option>-->
</select>
<!--<input type="text" name="cmbSourceType" id="cmbSourceType" lay-verify="cmbSourceType" autocomplete="off" class="layui-input">-->
- </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="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -122,6 +112,16 @@
</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="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
</div>
<!--琛ㄥご淇℃伅-->
<div class="layui-tab-item">
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\213\206\347\256\261\345\215\225/Sc_PackSplitBill_Fast.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\213\206\347\256\261\345\215\225/Sc_PackSplitBill_Fast.html"
index 9f6edfe..38af96d 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\213\206\347\256\261\345\215\225/Sc_PackSplitBill_Fast.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\213\206\347\256\261\345\215\225/Sc_PackSplitBill_Fast.html"
@@ -539,12 +539,10 @@
var HTBarCode = $('#HTBarCode').val()
var HOrgID = sessionStorage["OrganizationID"]
var sMaker = sessionStorage["HUserName"]
- if (AllowLoadData(sSubStr) != false)//闈炵┖楠岃瘉
- {
layer.load(3);
$.ajax(
{
- type: "POST",
+ type: "GET",
url: GetWEBURL() + "/PackSplit/set_SavePackSplitBill_Json",
async: true,
data: { "sInterID": sInterID, "HBillType": '3784', "sBillNo": sBillNo, "HTBarCode": HTBarCode, "sMaker": sMaker, "HOWNERID": HOrgID },
@@ -569,8 +567,6 @@
layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
}
});
- return false;
- }
});
//鐩戝惉鎻愪氦
@@ -593,16 +589,13 @@
if (event.keyCode == 13) {
var sBarCode = $('#HBarCode').val()
//var Flag = sessionStorage["SourceFlag"];
- if (sQty == "") {
- sQty = 0;
- }
//鍒ゆ柇鏉＄爜鏄惁涓虹┖ new
- if (sBarCode == '') {
+ if (HBarCode == '') {
playSound();
layer.msg("鏉＄爜涓虹┖锛屼笉鑳芥壂鎻忥紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
- if (sBarCode != "") {
+ if (HBarCode != "") {
$('#HBarCode').val("");
}
$.ajax({
@@ -696,17 +689,17 @@
layer.msg("鎷栨潯鐮佷负绌猴紝涓嶈兘鎵弿锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return false;
}
- if (HTBarCode != "") {
- $('#HTBarCode').val("");
- }
+ //if (HTBarCode != "") {
+ // $('#HTBarCode').val("");
+ //}
//
$.ajax({
url: GetWEBURL() + "/PackSplitBill/SetPackBarCode_Webs",
type: "GET",
- data: { "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": '3784', "HTBarCode": HTBarCode, "sMaker": sMaker, "HOrgID": HOrgID },
+ data: { "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": '3784', "HTBarCode": HTBarCode, "sMaker": sMaker, "HOWNERID": HOrgID },
success: function (result) {
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- $('#HTBarCode').val(result.data.HSourceBillNo);
+ //$('#HTBarCode').val(result.data.HSourceBillNo);
$("#HTBarCode").attr("disabled", "true");
layer.load(3)
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
index 2003514..f75a7ca 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\242\206\346\226\231\345\207\272\345\272\223/Kf_MateOutBill_Fast.html"
@@ -222,12 +222,112 @@
<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>
+ <!-- <table class="layui-hide" id="mx-table" lay-filter="mx-table"></table>-->
+ <div class="layui-form-item" style="padding:15px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鏉＄爜</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HBarCode_B" id="HBarCode_B" lay-verify="HBarCode_B" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:15px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鐗╂枡</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HMaterName_B" id="HMaterName_B" lay-verify="HMaterName_B" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:15px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">瑙勬牸</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HMaterModel_B" id="HMaterModel_B" lay-verify="HMaterModel_B" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:15px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">瑙勬牸</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HMaterModel_B" id="HMaterModel_B" lay-verify="HMaterModel_B" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:15px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鎵规</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HBatchNo_B" id="HBatchNo_B" lay-verify="HBatchNo_B" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:15px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鍗曚綅</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HUnitName_B" id="HUnitName_B" lay-verify="HUnitName_B" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:15px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">鏁伴噺</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HQty_B" id="HQty_B" lay-verify="HQty_B" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:15px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">瀹归噺</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HTMQty_B" id="HTMQty_B" lay-verify="HTMQty_B" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:15px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">浠撳簱</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HWHName_B" id="HWHName_B" lay-verify="HWHName_B" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="padding:15px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:40px;padding-left:0px;">浠撲綅</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HSPName_B" id="HSPName_B" lay-verify="HSPName_B" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
</div>
- <div class="layui-tab-item">
- <table class="layui-hide" id="fj-table-qd" lay-filter="fj-table-qd"></table>
+ <div class="layui-tab-item">
+ <table class="layui-hide" id="fj-table-qd" lay-filter="fj-table-qd"></table>
+ </div>
</div>
- </div>
<!--<div class="layui-form-item" style="margin-bottom: 20px;">
<div class="layui-row">
<div class="layui-col-xs3">
@@ -850,31 +950,30 @@
//$("#HDeptID").val(result.data.HDeptID);
//$("#HDeptName").val(result.data.HDeptName);
layer.load(3)
- table.render({
- elem: '#wl-table'
- , url: GetWEBURL() + '/MateOutBill/DisBillEntryList_Webs_New_Json'
- , toolbar: '#toolbarDemo'
- , where: { HBillID: sInterID, HBillType: '1204', sWhere: '' }
- , cellMinWidth: 90
- , cols: [[
- { type: 'radio' }
- , { field: 'HSNO', title: '搴忓彿', width: 60 }
- , { field: 'HQty', title: '鏁伴噺', width: 80 }
- , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 80 }
- , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
- , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
- , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
- , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
- , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
- , { field: 'HBatchNo', title: '鎵规', width: 150 }
- ]]
- // , data: [linterid]
- // , page: true
- , height: 500
- , done: function () {
- layer.closeAll("loading");
- }
+
+ $.ajax({
+ url: GetWEBURL() + '/MateOutBill/DisBillEntryList_Webs_New_Json1',
+ type: "GET",
+ data: { HBillID: sInterID, HBillType: '1204', sWhere: '' },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ listOption.data = result.data.list;
+ table.render(listOption);
+ $("#HBarCode_B").val(result.data.list1[0].HBarCode);
+ $("#HMaterName_B").val(result.data.list1[0].HMaterName);
+ $("#HMaterModel_B").val(result.data.list1[0].HMaterModel);
+ $("#HBatchNo_B").val(result.data.list1[0].HBatchNo);
+ $("#HUnitName_B").val(result.data.list1[0].HUnitName);
+ $("#HQty_B").val(result.data.list1[0].HQty);
+ $("#HTMQty_B").val(result.data.list1[0].HTMQty);
+ $("#HWHName_B").val(result.data.list1[0].HWHName);
+ $("#HSPName_B").val(result.data.list1[0].HSPName);
+ }
+ else {
+ layer.msg(result.Message);
+ }
+ layer.closeAll("loading");
+ }
});
}
else {
@@ -887,7 +986,28 @@
}
});
-
+ var listOption = {
+ elem: '#wl-table'
+ , toolbar: '#toolbarDemo'
+ , cellMinWidth: 90
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HSNO', title: '搴忓彿', width: 60 }
+ , { field: 'HQty', title: '鏁伴噺', width: 80 }
+ , { field: 'HQtyMust', title: '搴斿彂鏁伴噺', width: 80 }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', width: 150 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 }
+ , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 }
+ , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 }
+ , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ , { field: 'HBatchNo', title: '鎵规', width: 150 }
+ ]]
+ , height: 500
+ , done: function () {
+ layer.closeAll("loading");
+ }
+ }
function playSound() {
--
Gitblit v1.9.1