From 9d7dda331f3498a95e2e922e9ddae0fa43e83605 Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期四, 02 一月 2025 13:38:06 +0800
Subject: [PATCH] 修改问题
---
HTML/views/ASNSetting/LabelBoxBuDa.html | 2
HTML/views/WareHouseSetting/AreaFrom.html | 1
HTML/views/WareHouseSetting/LocateEditArea.html | 26 +++++++++++-
HTML/views/ASNSetting/LabelBox.html | 3 +
HTML/views/WareHouseSetting/Locate.html | 3 +
HTML/views/ASNSetting/ArrivalNoticeDetail.html | 1
HTML/views/WareHouseSetting/Roadway.html | 1
HTML/views/WareHouseSetting/RoadwayFrom.html | 1
HTML/views/BaseSetting/Materials.html | 11 +++++
HTML/views/WareHouseSetting/AreaAddFrom.html | 1
HTML/views/ASNSetting/ArrivalNotice.html | 4 +
HTML/views/ASNSetting/LabelPrint.html | 11 +++--
HTML/views/SOSetting/ExportNotice.html | 3 +
HTML/views/WareHouseSetting/Area.html | 1
14 files changed, 57 insertions(+), 12 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index 8fba9f5..31f6d04 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -911,6 +911,7 @@
var data = obj.data;
var lotno = data.LotNo;
+
var id = data.Id;
switch(obj.event)
{
@@ -962,7 +963,8 @@
//"&Level="+field.level+"&Type="+field.type+"&BoxType="+field.boxType+"&Qty="+field.qty+
var str = "Id="+id+"&IsReset="+field.reset+"&ArriveQty="+field.arriveQty
+"&ProductionTime="+field.productionTime+"&ExpirationTime="+field.expirationTime
- +"&StoreTime="+field.storeTime+"&SupplierLot="+field.SupplierLot;
+ +"&StoreTime="+field.storeTime+"&SupplierLot="+field.SupplierLot +"&Lotno="+lotno;
+ console.log("field.lotno:"+lotno);
layer.open({
type: 2,
diff --git a/HTML/views/ASNSetting/ArrivalNoticeDetail.html b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
index 532051b..c9f20f8 100644
--- a/HTML/views/ASNSetting/ArrivalNoticeDetail.html
+++ b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
@@ -177,6 +177,7 @@
{ field: 'PackagNo', title: '鍖呰鍚嶇О', width: 160, templet: "#table-content-Packlist" },
{ field: 'Lot1', title: '鐢熶骇鏃ユ湡', align: 'center', edit: 'text', width: 140 },
{ field: 'Lot2', title: '杩囨湡鏃ユ湡', align: 'center', edit: 'text', width: 140 },
+ { field: 'IsBale', title: '鏄惁瑁瑰寘', align: 'center', edit: 'text', width: 140 },
// { field: 'Price', title: '鍗曚环', align: 'center', width: 80 },
// { field: 'Money', title: '閲戦', align: 'center', width: 100 },
diff --git a/HTML/views/ASNSetting/LabelBox.html b/HTML/views/ASNSetting/LabelBox.html
index c7f560b..1ec9351 100644
--- a/HTML/views/ASNSetting/LabelBox.html
+++ b/HTML/views/ASNSetting/LabelBox.html
@@ -460,6 +460,7 @@
{ field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center', fixed: 'left', width: 140, "disabled": true },
{ field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center', width: 240, },
{ field: 'Qty', title: '鏁伴噺', align: 'center', width: 100, },
+ { field: 'UnitName', title: '鍗曚綅', align: 'center', width: 100, },
{ field: 'FullQty', title: '鏁寸鏁伴噺', align: 'center', width: 100, },
{ field: 'LotNo', title: '杩涘巶缂栧彿', align: 'center', width: 155, },
{ field: 'LotText', title: '鎵规鎻忚堪', align: 'center', width: 165 },
@@ -528,6 +529,8 @@
limits: pageLimits,
cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
done: function (res) {
+
+ console.log(res);
setRight();
//鑷畾涔夊垪瀹�
SetTableColW('Box-list', 'BllAsn/GetLabelBoxList', TotalColsSysArr);
diff --git a/HTML/views/ASNSetting/LabelBoxBuDa.html b/HTML/views/ASNSetting/LabelBoxBuDa.html
index 681705f..1a17122 100644
--- a/HTML/views/ASNSetting/LabelBoxBuDa.html
+++ b/HTML/views/ASNSetting/LabelBoxBuDa.html
@@ -248,7 +248,7 @@
//$("#Standard" + z.toString()).html(res.data[z].Standard);
$("#Qty").attr("id", "Qty" + z.toString());
- $("#Qty" + z.toString()).html( res.data[z].Qty);
+ $("#Qty" + z.toString()).html( res.data[z].Qty+res.data[z].unit);
$("#SupplierLot").attr("id", "SupplierLot" + z.toString());
$("#SupplierLot" + z.toString()).html( res.data[z].SupplierLot);
diff --git a/HTML/views/ASNSetting/LabelPrint.html b/HTML/views/ASNSetting/LabelPrint.html
index e6fe72b..aaa3fa2 100644
--- a/HTML/views/ASNSetting/LabelPrint.html
+++ b/HTML/views/ASNSetting/LabelPrint.html
@@ -32,10 +32,10 @@
<button id="btnAdd" class="layui-btn layui-btn-sm" lay-event="Add2"><i
class="layui-icon"></i>鐢熸垚鏍囩</button>
</div>
- <div class="layui-inline">
+ <!-- <div class="layui-inline">
<button id="btnPrint" class="layui-btn layui-btn-sm" lay-event="Add"><i
class="layui-icon"></i>鎵撳嵃</button>
- </div>
+ </div> -->
</div>
<div class="layui-form" lay-filter="layuiadmin-app-form-list" id="print"
style="width: 100%;height:100%; text-align: right;padding-top: 5px;margin-left: 0%;">
@@ -64,7 +64,7 @@
</tr>
<tr>
<td>杩涘巶缂栧彿</td>
- <td style="padding: 1px 0px;"></td>
+ <td id="Lotno"> </td>
<td>鐗╂枡浠ｇ爜</td>
<td id="SkuNo"> </td>
</tr>
@@ -122,6 +122,9 @@
var supplierLot=getQueryString('SupplierLot'); //鍘熷巶鎵瑰彿
$("#SupplierLot").html(supplierLot);
console.log(supplierLot);
+
+ var Lotno=getQueryString('Lotno'); //鍘熷巶鎵瑰彿
+ $("#Lotno").html(Lotno);
var doing = true;
// console.log(productionTime);
// console.log(expirationTime);
@@ -229,7 +232,7 @@
$("input[name='SupplierName']").val(res.data[0].SupplierName);
$("input[name='ProductionDate']").val(res.data[0].ProductionDate);
$("input[name='SapSkuNo']").val(res.data[0].SapSkuNo);
- $("input[name='Qty']").val(res.data[0].Qty);
+ $("input[name='Qty']").val(res.data[0].Qty+res.data[0]);
$("input[name='Standard']").val(res.data[0].Standard);
$("input[name='SupplierLot']").val(res.data[0].SupplierLot);
$("input[name='LotNo']").val(res.data[0].LotNo);
diff --git a/HTML/views/BaseSetting/Materials.html b/HTML/views/BaseSetting/Materials.html
index 2e777d1..53cc29e 100644
--- a/HTML/views/BaseSetting/Materials.html
+++ b/HTML/views/BaseSetting/Materials.html
@@ -61,7 +61,7 @@
<div class="layui-input-inline">
<select name="Type" id="Type" lay-verify="" lay-verify="" lay-search>
<option value=""></option>
- <option value="0">鍘熸枡</option>
+ <option value="0">鍘熻緟鏂�</option>
<option value="1">鍖呮潗</option>
<option value="2">鎴愬搧</option>
<option value="3">鑰楁潗</option>
@@ -177,6 +177,15 @@
{{# } }}
</script>
+ <!-- 鏄惁鍏嶆 -->
+ <script type="text/html" id="buttonIsWrap">
+ {{# if(d.IsInspect=='0'){ }}
+ <p>鍚�</p>
+ {{# } else if(d.IsInspect=='1') { }}
+ <p>鏄�</p>
+ {{# } }}
+ </script>
+
<!-- 瀛樺偍鐜 -->
<script type="text/html" id="buttonEnvironment">
{{# if(d.Environment=='0'){ }}
diff --git a/HTML/views/SOSetting/ExportNotice.html b/HTML/views/SOSetting/ExportNotice.html
index 3be73b7..23b2a95 100644
--- a/HTML/views/SOSetting/ExportNotice.html
+++ b/HTML/views/SOSetting/ExportNotice.html
@@ -155,7 +155,6 @@
<option value="1">1</option>
<option value="2">2</option>
<option value="3">3</option>
- <option value="4">4</option>
</select>
</div>
</div>
@@ -169,6 +168,8 @@
<option value="044">044</option>
<option value="051">051</option>
<option value="059">059</option>
+ <option value="440">440</option>
+ <option value="443">443</option>
</select>
</div>
</div>
diff --git a/HTML/views/WareHouseSetting/Area.html b/HTML/views/WareHouseSetting/Area.html
index cca26c6..6208c23 100644
--- a/HTML/views/WareHouseSetting/Area.html
+++ b/HTML/views/WareHouseSetting/Area.html
@@ -48,6 +48,7 @@
<option value="3">鍖呮潗鍖�</option>
<option value="4">绌烘墭鍖�</option>
<option value="5">鑰楁潗鍖�</option>
+ <option value="6">涓棿鍝佸尯</option>
</select>
</div>
</div>
diff --git a/HTML/views/WareHouseSetting/AreaAddFrom.html b/HTML/views/WareHouseSetting/AreaAddFrom.html
index 5d52f99..5901745 100644
--- a/HTML/views/WareHouseSetting/AreaAddFrom.html
+++ b/HTML/views/WareHouseSetting/AreaAddFrom.html
@@ -62,6 +62,7 @@
<option value="3">鍖呮潗鍖�</option>
<option value="4">绌烘墭鍖�</option>
<option value="5">鑰楁潗鍖�</option>
+ <option value="6">涓棿鍝佸尯</option>
</select>
</div>
</div>
diff --git a/HTML/views/WareHouseSetting/AreaFrom.html b/HTML/views/WareHouseSetting/AreaFrom.html
index afaad72..0ec12c6 100644
--- a/HTML/views/WareHouseSetting/AreaFrom.html
+++ b/HTML/views/WareHouseSetting/AreaFrom.html
@@ -38,6 +38,7 @@
<option value="3">鍖呮潗鍖�</option>
<option value="4">绌烘墭鍖�</option>
<option value="5">鑰楁潗鍖�</option>
+ <option value="6">涓棿鍝佸尯</option>
</select>
</div>
</div>
diff --git a/HTML/views/WareHouseSetting/Locate.html b/HTML/views/WareHouseSetting/Locate.html
index 315d822..e6a1d3f 100644
--- a/HTML/views/WareHouseSetting/Locate.html
+++ b/HTML/views/WareHouseSetting/Locate.html
@@ -518,7 +518,8 @@
Id: id,
Status:field.Status,
Flag:field.Flag,
- Temperature:field.Temp
+ Temperature:field.Temp,
+ Area:field.AreaNo
};
sendData(IP + "/Sys/EditStorageLocat", param, 'post', function(res) {
console.log(res);
diff --git a/HTML/views/WareHouseSetting/LocateEditArea.html b/HTML/views/WareHouseSetting/LocateEditArea.html
index 1d84444..a343fae 100644
--- a/HTML/views/WareHouseSetting/LocateEditArea.html
+++ b/HTML/views/WareHouseSetting/LocateEditArea.html
@@ -32,19 +32,19 @@
<div class="layui-form-item">
<label class="layui-form-label">  鍌ㄦ帓</label>
<div class="layui-input-inline">
- <input type="number" id="Row" name="Row" placeholder="鎺捖仿仿�" autocomplete="off"
+ <input type="number" lay-verify="required|PRules" id="Row" name="Row" placeholder="鎺捖仿仿�" autocomplete="off"
class="layui-input" >
</div>
<label class="layui-form-label">  鍌ㄥ垪</label>
<div class="layui-input-inline">
- <input type="number" id="Column" name="Column" placeholder="鍒椔仿仿�" autocomplete="off"
+ <input type="number" lay-verify="required|LRules" id="Column" name="Column" placeholder="鍒椔仿仿�" autocomplete="off"
class="layui-input" >
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">  鍌ㄥ眰</label>
<div class="layui-input-inline">
- <input type="number" id="Layer" name="Layer" placeholder="灞偮仿仿�" autocomplete="off"
+ <input type="number" lay-verify="required|CRules" id="Layer" name="Layer" placeholder="灞偮仿仿�" autocomplete="off"
class="layui-input" >
</div>
<label class="layui-form-label">鍌ㄤ綅娣卞害</label>
@@ -110,6 +110,26 @@
GetRoadway("");
GetArea('');
+
+ //鑷畾涔夐獙璇佽鍒�
+ form.verify({
+ PRules: function(value, item){
+ var pattern = /^[a-zA-Z0-9_]+$/; // 杩欓噷鍐欎綘鐨勬鍒欒〃杈惧紡
+ if(!pattern.test(value)){
+ return '鐢ㄦ埛鍚嶅彧鑳藉寘鍚瓧姣嶃�佹暟瀛楀拰涓嬪垝绾�';
+ }
+ },LRules: function(value, item){
+ var pattern = /^[a-zA-Z0-9_]+$/; // 杩欓噷鍐欎綘鐨勬鍒欒〃杈惧紡
+ if(!pattern.test(value)){
+ return '鐢ㄦ埛鍚嶅彧鑳藉寘鍚瓧姣嶃�佹暟瀛楀拰涓嬪垝绾�';
+ }
+ },CRules: function(value, item){
+ var pattern = /^[a-zA-Z0-9_]+$/; // 杩欓噷鍐欎綘鐨勬鍒欒〃杈惧紡
+ if(!pattern.test(value)){
+ return '鐢ㄦ埛鍚嶅彧鑳藉寘鍚瓧姣嶃�佹暟瀛楀拰涓嬪垝绾�';
+ }
+ }
+ });
//鑾峰彇鍖哄煙
function GetArea(val){
diff --git a/HTML/views/WareHouseSetting/Roadway.html b/HTML/views/WareHouseSetting/Roadway.html
index 636978b..3a5c98a 100644
--- a/HTML/views/WareHouseSetting/Roadway.html
+++ b/HTML/views/WareHouseSetting/Roadway.html
@@ -48,6 +48,7 @@
<option value="3">鍖呮潗鍖�</option>
<option value="4">绌烘墭鍖�</option>
<option value="5">鑰楁潗鍖�</option>
+ <option value="6">涓棿鍝佸尯</option>
</select>
</div>
</div>
diff --git a/HTML/views/WareHouseSetting/RoadwayFrom.html b/HTML/views/WareHouseSetting/RoadwayFrom.html
index f3ffc34..e9b82b2 100644
--- a/HTML/views/WareHouseSetting/RoadwayFrom.html
+++ b/HTML/views/WareHouseSetting/RoadwayFrom.html
@@ -38,6 +38,7 @@
<option value="3">鍖呮潗鍖�</option>
<option value="4">绌烘墭鍖�</option>
<option value="5">鑰楁潗鍖�</option>
+ <option value="6">涓棿鍝佸尯</option>
</select>
</div>
--
Gitblit v1.8.0