From 1e7283cacb5eb6de492c6c6874aeaa316063989c Mon Sep 17 00:00:00 2001
From: Demo <Demo@DESKTOP-CPA90BF>
Date: 星期三, 13 三月 2024 16:46:35 +0800
Subject: [PATCH] Merge branch 'csc'
---
Pda/View/SoSetting/SampleOut.html | 227 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 148 insertions(+), 79 deletions(-)
diff --git a/Pda/View/SoSetting/SampleOut.html b/Pda/View/SoSetting/SampleOut.html
index 4fc9be3..e54a94e 100644
--- a/Pda/View/SoSetting/SampleOut.html
+++ b/Pda/View/SoSetting/SampleOut.html
@@ -243,7 +243,7 @@
<div id="layout-bill" class="layui-form-item layout-dropdownlist">
<label class="layui-form-label lableWidth">鍏ュ簱鍗曪細</label>
<div class="layui-input-block" id="selectDiv">
- <select id="bar" lay-filter="getbar" lay-search>
+ <select id="AsnBar" lay-filter="getAsnBar" lay-search>
<option value=""></option>
</select>
<img src="/assets/down_arraw.png">
@@ -296,7 +296,7 @@
</table>
</div>
<div id="" class="layout-tab-page">
- <table class="layout-tab-content" border="" cellspacing="" cellpadding="">
+ <table id="kuneiQty" class="layout-tab-content" border="" cellspacing="" cellpadding="">
<tr>
<td>
<table class="tbl-box-sim-info" border="" cellspacing="" cellpadding="">
@@ -380,63 +380,74 @@
<div id="" class="layout-bill-info">
<form class="layui-form" action="" style="height: auto;">
+ <div id="kuneilabel2" >
+ <div id="layout-bill2" class="layui-form-item layout-dropdownlist">
+ <label class="layui-form-label lableWidth">鍑哄簱鍗曪細</label>
+ <div class="layui-input-block" id="selectDiv2">
+ <select id="bar2" lay-filter="getbar2" lay-search>
+ <option value=""></option>
+ </select>
+ <img src="/assets/down_arraw.png">
+ </div>
+ </div>
+ <div id="layout-skuLotNo2" class="layui-form-item layout-dropdownlist">
+ <label class="layui-form-label lableWidth">鐗╂枡 - 鎵规锛�</label>
+ <div class="layui-input-block">
+ <select id="skuLotNo2" lay-filter="getSkuLotNo2" lay-search>
+ <option value=""></option>
+ </select>
+ <img src="/assets/down_arraw.png">
+ </div>
+ </div>
+ <div id="" class="layout-tab-page">
+ <table class="tbl-box-sim-info" border="" cellspacing="" cellpadding="">
+ <tr>
+ <td>
+ <div class="layui-form-item">
+ <label class="layui-form-label" style="width: 50%;">璁″垝鏁伴噺锛�</label>
+ <div class="layui-input-block" style="width: 50%;margin-left:50%;">
+ <input id="planQty2" type="text" lay-verify="" disabled placeholder=""
+ class="layui-input">
+ </div>
+ </div>
+ </td>
+ <td>
+ <div class="layui-form-item">
+ <label class="layui-form-label" style="width: 50%">瀹屾垚鏁伴噺锛�</label>
+ <div class="layui-input-block" style="width: 50%;margin-left:50%;">
+ <input id="finishQty2" type="text" lay-verify="" disabled placeholder=""
+ class="layui-input">
+ </div>
+ </div>
- <div id="layout-bill2" class="layui-form-item layout-dropdownlist">
- <label class="layui-form-label lableWidth">鍑哄簱鍗曪細</label>
- <div class="layui-input-block" id="selectDiv2">
- <select id="bar2" lay-filter="getbar2" lay-search>
- <option value=""></option>
- </select>
- <img src="/assets/down_arraw.png">
- </div>
- </div>
- <div id="layout-skuLotNo2" class="layui-form-item layout-dropdownlist">
- <label class="layui-form-label lableWidth">鐗╂枡 - 鎵规锛�</label>
- <div class="layui-input-block">
- <select id="skuLotNo2" lay-filter="getSkuLotNo2" lay-search>
- <option value=""></option>
- </select>
- <img src="/assets/down_arraw.png">
- </div>
- </div>
- <div id="" class="layout-tab-page">
- <table class="tbl-box-sim-info" border="" cellspacing="" cellpadding="">
- <tr>
- <td>
- <div class="layui-form-item">
- <label class="layui-form-label" style="width: 50%;">璁″垝鏁伴噺锛�</label>
- <div class="layui-input-block" style="width: 50%;margin-left:50%;">
- <input id="planQty2" type="text" lay-verify="" disabled placeholder=""
- class="layui-input">
- </div>
- </div>
- </td>
- <td>
- <div class="layui-form-item">
- <label class="layui-form-label" style="width: 50%">瀹屾垚鏁伴噺锛�</label>
- <div class="layui-input-block" style="width: 50%;margin-left:50%;">
- <input id="finishQty2" type="text" lay-verify="" disabled placeholder=""
- class="layui-input">
- </div>
- </div>
-
- </td>
- </tr>
- <tr>
- <td colspan="3">
- <div class="layui-form-item">
- <label class="layui-form-label" style="width: 17%;">瑙勬牸锛�</label>
- <div class="layui-input-block" style="width: 83%;margin-left:17%;">
- <input id="standard2" type="text" lay-verify="" disabled placeholder=""
- class="layui-input">
- </div>
- </div>
- </td>
-
- </tr>
- </table>
- </div>
-
+ </td>
+ </tr>
+ <tr>
+ <td colspan="3">
+ <div class="layui-form-item">
+ <label class="layui-form-label" style="width: 17%;">瑙勬牸锛�</label>
+ <div class="layui-input-block" style="width: 83%;margin-left:17%;">
+ <input id="standard2" type="text" lay-verify="" disabled placeholder=""
+ class="layui-input">
+ </div>
+ </div>
+ </td>
+
+ </tr>
+ </table>
+ </div>
+ </div>
+ <div id="kuqianlabel2" >
+ <div id="layout-bill" class="layui-form-item layout-dropdownlist">
+ <label class="layui-form-label lableWidth">鍏ュ簱鍗曪細</label>
+ <div class="layui-input-block" id="selectDiv">
+ <select id="AsnBar2" lay-filter="getAsnBar2" lay-search>
+ <option value=""></option>
+ </select>
+ <img src="/assets/down_arraw.png">
+ </div>
+ </div>
+ </div>
<div id="layout-pallet" class="layui-form-item layout-input">
<label class="layui-form-label lableWidth">鎵樼洏鏉＄爜锛�</label>
<div class="layui-input-block">
@@ -543,6 +554,11 @@
$('#kuneilabel').hide();
$('#kuqianlabel').hide();
+ $('#kuneilabel2').hide();
+ $('#kuqianlabel2').hide();
+
+ $('#kuneiQty').hide();
+
$('#option1').attr("style", "background-color: aqua;width: 45.77%;float: left;text-align: center;"); //閫変腑鍚庨鑹�
$('#option2').attr("style", "background-color: #999;width: 45.77%;float: right;text-align: center;"); //榛樿棰滆壊
$('#content2').hide();
@@ -637,11 +653,15 @@
if (res.code == 0){
if (res.data == "0") {//搴撳唴鍙栨牱
$('#kuneilabel').show();
+ $('#kuneiQty').show();
$('#kuqianlabel').hide();
}
if (res.data == "1") {//搴撳墠鍙栨牱
$('#kuqianlabel').show();
$('#kuneilabel').hide();
+ $('#kuneiQty').hide();
+
+ updateAsnBillList();
}
// updateBillList();
// if ($('#bar').val() == "") {
@@ -672,21 +692,21 @@
//鍒濆鍖栨覆鏌� 鍏ュ簱鍗�
function updateAsnBillList() {
- $("#bar").empty()
- $("#bar").append('<option value =>' + '</option>');
+ $("#AsnBar").empty()
+ $("#AsnBar").append('<option value =>' + '</option>');
form.render('select');
var param = {
- PalletNo: $("#palletNo").val(),
+ palletNo: $("#palletNo").val(),
};
- synData(IP + "/PdaSo/GetRunSoNoticeList", param, 'post', function (res) {
+ synData(IP + "/PdaSo/GetAsnNoByPallet", param, 'get', function (res) {
if (res.code == 0) { //鎴愬姛
console.log(res.data);
for (var i = 0; i < res.data.length; i++) {
if (i == 0) {
- $("#bar").append('<option value =' + res.data[i] + ' selected>' + res.data[i] + '</option>');
+ $("#AsnBar").append('<option value =' + res.data[i] + ' selected>' + res.data[i] + '</option>');
} else {
- $("#bar").append('<option value =' + res.data[i] + '>' + res.data[i] + '</option>');
+ $("#AsnBar").append('<option value =' + res.data[i] + '>' + res.data[i] + '</option>');
}
}
form.render('select');
@@ -1209,27 +1229,76 @@
}
checkPalletState2()
})
+ //鍒濆鍖栨覆鏌� 鍏ュ簱鍗�
+ function updateAsnBillList2() {
+
+ $("#AsnBar2").empty()
+ $("#AsnBar2").append('<option value =>' + '</option>');
+ form.render('select');
+ console.log("afdsaf")
+ var param = {
+ palletNo: $("#palletNo2").val(),
+ };
+ synData(IP + "/PdaSo/GetAsnNoByPallet", param, 'get', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ console.log(res.data);
+ for (var i = 0; i < res.data.length; i++) {
+ if (i == 0) {
+ $("#AsnBar2").append('<option value =' + res.data[i] + ' selected>' + res.data[i] + '</option>');
+ } else {
+ $("#AsnBar2").append('<option value =' + res.data[i] + '>' + res.data[i] + '</option>');
+ }
+ }
+ form.render('select');
+
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ }
+ });
+ }
+
//妫�鏌ユ墭鐩樼姸鎬�
function checkPalletState2() {
var param = {
"PalletNo": $("#palletNo2").val()
- }
+ }
synData(IP + "/PdaSo/IsEnableOkPalletNo", param, 'post', function (res) {
+
if (res.code == 0) { //鎴愬姛
- updateBillList2();
- console.log($('#bar2').val())
- if ($('#bar2').val() == "") {
- console.log(1)
- clear21();
- return;
- } else {
- console.log(2)
- updateSkuLotNoList2();
- updateQtyList2();
- getBar2();
- GetDataInfo();
- }
-
+ synData(IP + "/PdaSo/GetSampleType", param, 'get', function (res) {
+ if (res.code == 0){
+ if (res.data == "0") {//搴撳唴鍙栨牱
+ $('#kuneilabel2').show();
+ $('#kuqianlabel2').hide();
+ }
+ if (res.data == "1") {//搴撳墠鍙栨牱
+ $('#kuqianlabel2').show();
+ $('#kuneilabel2').hide();
+ updateAsnBillList2();
+ }
+ // updateBillList2();
+ // console.log($('#bar2').val())
+ // if ($('#bar2').val() == "") {
+ // console.log(1)
+ // clear21();
+ // return;
+ // } else {
+ // console.log(2)
+ // updateSkuLotNoList2();
+ // updateQtyList2();
+ // getBar2();
+ // GetDataInfo();
+ // }
+ }else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ }
+ });
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
icon: 2,
--
Gitblit v1.8.0