From d5e7fc8d38fa867526c80d29c4e89792634ef690 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期四, 01 二月 2024 14:22:55 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
Pda/View/AsnSetting/productEnter1.html | 922 +++++++++++++++++++++++++++++++++++
HTML/img/LiNuo.jpg | 0
HTML/views/BaseSetting/Customer.html | 3
Wms/WMS.BLL/SysServer/MaterialCategoryServer.cs | 15
HTML/views/ASNSetting/LabelBox.html | 36
HTML/views/ASNSetting/LabelPrintSelect.html | 142 +++++
HTML/views/BaseSetting/CustomerFrom.html | 1
HTML/views/BaseSetting/Materials.html | 6
HTML/views/ASNSetting/ArrivalNotice.html | 50 +
HTML/views/BaseSetting/MaterialsForm.html | 8
HTML/views/SystemSettings/CategoryForm.html | 4
HTML/views/ASNSetting/LabelPrint.html | 349 +++++++++++++
HTML/views/SystemSettings/Category.html | 2
13 files changed, 1,503 insertions(+), 35 deletions(-)
diff --git a/HTML/img/LiNuo.jpg b/HTML/img/LiNuo.jpg
new file mode 100644
index 0000000..246aea1
--- /dev/null
+++ b/HTML/img/LiNuo.jpg
Binary files differ
diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index 12c48f8..825e782 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -300,6 +300,10 @@
html = `<a class="layui-btn layui-btn-danger layui-btn-xs delClass" lay-event="del">
<i class="layui-icon layui-icon-delete"></i>鍒犻櫎</a>`;
}
+ if(d.Status == "0" || d.Status == "1"){
+ html += `<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="Addlabel">
+ <i class="layui-icon layui-icon-edit"></i>鐢熸垚鏍囩</a>`;
+ }
return html;
}
}}
@@ -638,7 +642,7 @@
{field: 'CreateTime',title: '鍒涘缓鏃堕棿',align: 'center',width: 160,templet: '#templetCreateTime2'},
{field: 'UpdateUserName',title: '淇敼浜�',align: 'center',width: 150,},
{field: 'UpdateTime',title: '淇敼鏃堕棿',align: 'center',width: 150,templet: '#templetUpdateTime3'},
- {field: 'caozuo',title: '鎿嶄綔',fixed: 'right',width: 100,align: 'left',toolbar: '#toolbarDemoList', "disabled": true}
+ {field: 'caozuo',title: '鎿嶄綔',fixed: 'right',width: 150,align: 'left',toolbar: '#toolbarDemoList', "disabled": true}
]];
var DetailColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
//#endregion
@@ -1161,6 +1165,50 @@
});
break;
+ case "Addlabel" :
+ layer.open({
+ type: 2,
+ title: '鐢熸垚鏍囩',
+ content: 'LabelPrintSelect.html',
+ maxmin: true,
+ area: ['460px', '460px'],
+ btn: ['纭畾','鍙栨秷'],
+ yes: function(index, layero){
+ var iframeWindow = window['layui-layer-iframe'+ index]
+ ,submitID = 'layuiadmin-app-form-edit'
+ ,submit = layero.find('iframe').contents().find('#'+ submitID);
+ //鐩戝惉鎻愪氦
+ iframeWindow.layui.form.on('submit('+ submitID +')', function(data){
+ var field = data.field; //鑾峰彇鎻愪氦鐨勫瓧娈�
+ console.log(field);
+ //鎻愪氦 Ajax 鎴愬姛鍚庯紝闈欐�佹洿鏂拌〃鏍间腑鐨勬暟鎹�
+ var param = {
+ Id: data.Id,
+ Reset: field.reset, //閲嶇疆鎵瑰彿
+ Level: field.level, //鏍囩绾у埆 1/2绾�
+ Type:field.type, //鍏崇郴灞傜骇 鏈�/鏃犲眰绾�
+ ArriveQty:field.arriveQty, //鍒拌揣鏁伴噺
+ BoxType:field.boxType ,// 绠辨敮绫诲瀷 绠�/鏀�
+ Qty:field.qty //绠�/鏀暟閲�
+ };
+ console.log(param);
+ layer.open({
+ type: 2,
+ title: '鐢熸垚鏍囩',
+ content: 'LabelPrint.html',
+ maxmin: true,
+ area: ['660px', '660px'],
+ btn: ['鍙栨秷'],
+
+
+ });
+ });
+ submit.trigger('click');
+ }
+
+ });
+
+ break;
default:break;
}
});
diff --git a/HTML/views/ASNSetting/LabelBox.html b/HTML/views/ASNSetting/LabelBox.html
index 97dc71e..7986772 100644
--- a/HTML/views/ASNSetting/LabelBox.html
+++ b/HTML/views/ASNSetting/LabelBox.html
@@ -238,26 +238,22 @@
table.on('toolbar(Box-list)', function (obj) {
switch (obj.event) {
case 'add': // 娣诲姞绠辨敮鍏崇郴
- // 浠ｇ爜鍖哄煙
- var param = getBoxInforVlues();
- if (param != "") {
- console.log(param);
- sendData(IP + "/BllAsn/AddBllBoxInfo", param, 'post', function (res) {
- if (res.code == 0) { //鎴愬姛
- layer.msg(res.msg, {
- icon: 1,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () {
- bindTable();
- });
- } else { //涓嶆垚鍔�
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { doing = true });
- }
- });
- }
+ // layer.open({
+ // type: 2,
+ // title: '鑷畾涔夊垪',
+ // content: '../SystemSettings/HeaderSetting.html',
+ // maxmin: false,
+ // resize: false,
+ // area: ['970px', '650px']
+ // });
+ layer.open({
+ type: 2,
+ title: '鎵撳嵃',
+ content: 'LabelPrint.html?',
+ maxmin: true,
+ area: ['600px', '670px'],
+ btn: ['鍙栨秷']
+ });
break;
default: break;
diff --git a/HTML/views/ASNSetting/LabelPrint.html b/HTML/views/ASNSetting/LabelPrint.html
new file mode 100644
index 0000000..c1d7a6b
--- /dev/null
+++ b/HTML/views/ASNSetting/LabelPrint.html
@@ -0,0 +1,349 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+ <meta 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.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+ <style media="print">
+ @page {
+ size: auto;
+ margin: 0 0 0 20px;
+ }
+
+ .layui-input {
+ padding-left: 0px;
+ }
+
+ .layui-form-item {
+ margin-bottom: 2px;
+ }
+ </style>
+</head>
+
+<body>
+ <div style="width:100%;text-align: center;">
+ <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%;">
+ <div>
+
+ <table border="1" id="table" style="width: 90%; height:480px; margin: 0 auto; text-align: center;border-collapse: collapse;table-layout: fixed;">
+
+ <tr>
+ <td colspan="2" id="Logo">
+ <img src="../../img/LiNuo.jpg" style="width: 90%; height: 30px;" />
+ </td>
+ <td colspan="2" style="padding: 1px 0px;">SMP-ST002-R08-01</td>
+ </tr>
+ <tr>
+ <td colspan="4" id="department">鐗╂枡鏍囩</td>
+ </tr>
+ <tr>
+ <td>鍝佸悕</td>
+ <td colspan="3" id="goodName"></td>
+ </tr>
+ <tr>
+ <td>瑙勬牸/鍨嬪彿</td>
+ <td id="Standard"></td>
+ <td>鍖呰瑙勬牸</td>
+ <td id="PackageStandard"></td>
+ </tr>
+ <tr>
+ <td>杩涘巶缂栧彿</td>
+ <td style="padding: 1px 0px;"></td>
+ <td>鐗╂枡浠ｇ爜</td>
+ <td style="padding: 1px 0px;"> </td>
+ </tr>
+ <tr>
+ <td>鍘熷巶鎵瑰彿</td>
+ <td id="SupplierLot"></td>
+ <td>鏁� 閲�</td>
+ <td id="qty"></td>
+ </tr>
+ <tr>
+ <td>鏈夋晥鏈熻嚦</td>
+ <td id="ExpirationTime"></td>
+ <td>鍌ㄥ瓨鏈熻嚦</td>
+ <td id="StoreTime"></td>
+ </tr>
+ <tr>
+ <td id="qty3" colspan="4">
+ <img id="imgBar" style="width: auto; height: auto;" />
+ </td>
+ </tr>
+
+ </table>
+
+ </div>
+ <div style="page-break-after: always;"></div>
+ </div>
+ <hr>
+ <div style="padding-top: 10px;text-align: left;" id="button">
+ <div class="layui-inline" style="margin-right: 10px;">
+ <span style="padding-right: 5px;">鏄惁閲嶇疆鎵规:</span>
+ <span style="padding-right: 5px;">鏄�</span><input type="radio" checked="true" name="isprint" value="1">
+ <span style="padding-right: 5px;">鍚�</span><input type="radio" name="isprint" value="0">
+ </div>
+ <div class="layui-inline">
+ 鍒拌揣鏁伴噺锛�<div class="layui-input-inline">
+ <input type="text"
+ oninput="value=value.replace(/[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.').replace(/^(\-)*(\d+)\.(\d\d\d).*$/,'$1$2.$3')"
+ onafterpaste="this.value=this.value.replace(/[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.').replace(/^(\-)*(\d+)\.(\d\d\d).*$/,'$1$2.$3')"
+ name="skuNum" id="skuNum" lay-verify="skuNum" placeholder="" style="width: 100px;"
+ autocomplete="off" class="layui-input InputCss">
+ </div>
+ </div>
+ <div class="layui-inline">
+ 绠辨爣绛炬暟閲忥細<div class="layui-input-inline">
+ <input type="text" onkeyup="this.value=this.value.replace(/^0{1,}/g,'')"
+ onafterpaste="this.value=this.value.replace(/^0{1,}/g,'')" name="bQNum" id="bQNum"
+ lay-verify="bQNum" placeholder="" style="width: 100px;" autocomplete="off"
+ class="layui-input InputCss">
+ </div>
+ </div>
+
+ <div>
+ <div class="layui-inline" style="padding-top: 5px">
+ 涓�绾ф爣绛惧繀褰曞弬鏁帮細绠卞唴鏁伴噺锛�<div class="layui-input-inline">
+ <input type="text"
+ oninput="value=value.replace(/[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.').replace(/^(\-)*(\d+)\.(\d\d\d).*$/,'$1$2.$3')"
+ onafterpaste="this.value=this.value.replace(/[^\d^\.]+/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.').replace(/^(\-)*(\d+)\.(\d\d\d).*$/,'$1$2.$3')"
+ name="number" id="number" lay-verify="number" placeholder="" style="width: 70px;"
+ autocomplete="off" class="layui-input InputCss">
+ </div>
+ </div>
+ <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>
+ <script src="../../layuiadmin/layui/layui.js"></script>
+ <script src="../../js/public.js"></script>
+ <script src="../../js/jquery-3.5.1.min.js"></script>
+ <script src="../../js/jquery.cookie.js"></script>
+ <script src="../../js/jquery.print.js"></script>
+ <script>
+ var boxcode = "";
+ layui.config({
+ base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'layer', 'laydate'], function () {
+
+ var $ = layui.$,
+ form = layui.form,
+ layer = layui.layer;
+ var laydate = layui.laydate;
+ laydate.render({
+ elem: '#ProductionDate'
+ , format: 'yyyy-MM-dd' //鍙换鎰忕粍鍚�
+ });
+ laydate.render({
+ elem: '#InspectTime'
+ , format: 'yyyy-MM-dd' //鍙换鎰忕粍鍚�
+ });
+ laydate.render({
+ elem: '#ExpirationTime'
+ , format: 'yyyy-MM-dd' //鍙换鎰忕粍鍚�
+ });
+ var id = getQueryString('id');
+ var xun = 0;
+
+ $('#btnPrint').on('click', function () {
+ var param = {
+ ImportId: id,
+ };
+ if ($("#ProductionDate").val() == "" || $("#ProductionDate").val() == undefined || $("#ProductionDate").val() == null) {
+ layer.msg("鐢熶骇鏃ユ湡涓嶈兘涓虹┖", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { return; });
+ }
+ if ($("#SupplierName").val() == "" || $("#SupplierName").val() == undefined || $("#SupplierName").val() == null) {
+ layer.msg("鐢熶骇鍘傚涓嶈兘涓虹┖", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { return; });
+ }
+ if ($("#SupplierLot").val() == "" || $("#SupplierLot").val() == undefined || $("#SupplierLot").val() == null) {
+ console.log($("#SupplierLot").val())
+ layer.msg("鍘傚鎵瑰彿涓嶈兘涓虹┖", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { return; });
+ }
+
+ if ($('#number').val() > 0) {
+
+ if ($('#bQNum').val() > 0) {
+ div($('#number').val(), $('input[name="isprint"]:checked').val(), $('#bQNum').val());
+ } else {
+ div($('#number').val(), $('input[name="isprint"]:checked').val(), 0);
+ }
+
+ }
+ else {
+
+ if ($('#bQNum').val() >= 0) {
+ div(0, $('input[name="isprint"]:checked').val(), $('#bQNum').val());
+ } else {
+ div(0, $('input[name="isprint"]:checked').val(), 0);
+ }
+
+ }
+ });
+
+ if (!id) {
+ id = 0;
+ }
+ else {
+ div(-1, 1, 0);
+ }
+
+
+ // 寰幆鍔犺浇鏍囩
+ function div(number, isprint, bqNum) {
+ GetImportId(number, isprint, bqNum);
+ }
+
+ // 鏍囩鍙橀噺璧嬪��
+ function GetImportId(i, isprint, bqNum) {
+
+ var param1 = {
+ isprint: isprint,
+ ImportId: id,
+ CreateUser: $.cookie('userId'),
+ number2: i,
+ boxcode: "",
+ ProductionDate: $("input[name='ProductionDate']").val(),
+ SupplierName: $("input[name='SupplierName']").val(),
+ SupplierLot: $("input[name='SupplierLot']").val(),
+ InspectTime: $("input[name='InspectTime']").val(),
+ ExpirationTime: $("input[name='ExpirationTime']").val(),
+ bQNum: bqNum,
+ skuNum: $('#skuNum').val().toString()
+ };
+
+ synData(IP + "/LabelPrint/GetImport5Id", param1, 'post', function (res) {
+ if (res.code == 1) { //鎴愬姛
+
+ if (i == -1) {
+ $("input[name='SkuNo']").val(res.data[0].SkuNo);
+ $("input[name='SkuName']").val(res.data[0].SkuName);
+ $("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='Standard']").val(res.data[0].Standard);
+ $("input[name='SupplierLot']").val(res.data[0].SupplierLot);
+ $("input[name='LotNo']").val(res.data[0].LotNo);
+ $("input[name='InspectTime']").val(res.data[0].InspectTime);
+ $("input[name='ExpirationTime']").val(res.data[0].ExpirationTime);
+ $("input[name='QtyCount']").val(res.data[0].QtyCount);
+ $("input[name='QtyOrd']").val(res.data[0].QtyOrd);
+ $("input[name='ExpirationType']").val(res.data[0].ExpirationType);
+ $("input[name='BoxCode']").val(res.data[0].BoxCode);
+ $("#imgBar").attr("src", res.data[0].imageStr);
+ } else {
+ var labels = "";
+ for (var z = 0; z < res.data.length; z++) {
+ var idd = "";
+ if (z - 1 >= 0) {
+ idd = (z - 1).toString();
+ }
+
+ $("#SkuNo" + idd).attr("id", "SkuNo" + z.toString());
+ $("#SkuNo" + z.toString()).attr("value", res.data[z].SkuNo);
+
+ $("#SkuName" + idd).attr("id", "SkuName" + z.toString());
+ $("#SkuName" + z.toString()).attr("value", res.data[z].SkuName);
+
+ var supplier = $("#SupplierName" + idd).val();
+ $("#SupplierName" + idd).attr("id", "SupplierName" + z.toString());
+ $("#SupplierName" + z.toString()).attr("value", supplier);
+
+ var time = $("#ProductionDate" + idd).val();
+ $("#ProductionDate" + idd).attr("id", "ProductionDate" + z.toString());
+ $("#ProductionDate" + z.toString()).attr("value", time);
+
+ $("#SapSkuNo" + idd).attr("id", "SapSkuNo" + z.toString());
+ $("#SapSkuNo" + z.toString()).attr("value", res.data[z].SapSkuNo);
+
+ $("#Qty" + idd).attr("id", "Qty" + z.toString());
+ $("#Qty" + z.toString()).attr("value", res.data[z].Qty);
+
+ $("#Standard" + idd).attr("id", "Standard" + z.toString());
+ $("#Standard" + z.toString()).attr("value", res.data[z].Standard);
+
+ $("#LotNo" + idd).attr("id", "LotNo" + z.toString());
+ $("#LotNo" + z.toString()).attr("value", res.data[z].LotNo);
+
+ var supplierLot = $("#SupplierLot" + idd).val();
+ $("#SupplierLot" + idd).attr("id", "SupplierLot" + z.toString());
+ $("#SupplierLot" + z.toString()).attr("value", supplierLot);
+
+ var insTime = $("#InspectTime" + idd).val();
+ $("#InspectTime" + idd).attr("id", "InspectTime" + z.toString());
+ $("#InspectTime" + z.toString()).attr("value", insTime);
+
+ var expTime = $("#ExpirationTime" + idd).val();
+ $("#ExpirationTime" + idd).attr("id", "ExpirationTime" + z.toString());
+ $("#ExpirationTime" + z.toString()).attr("value", expTime);
+
+ $("#QtyCount" + idd).attr("id", "QtyCount" + z.toString());
+ $("#QtyCount" + z.toString()).attr("value", res.data[z].QtyCount);
+
+ $("#QtyOrd" + idd).attr("id", "QtyOrd" + z.toString());
+ $("#QtyOrd" + z.toString()).attr("value", res.data[z].QtyOrd);
+
+ $("#ExpirationType" + idd).attr("id", "ExpirationType" + z.toString());
+ $("#ExpirationType" + z.toString()).attr("value", res.data[z].ExpirationType);
+
+ $("#BoxCode" + idd).attr("id", "BoxCode" + z.toString());
+ $("#BoxCode" + z.toString()).attr("value", res.data[z].BoxCode);
+
+ $("#imgBar" + idd).attr("id", "imgBar" + z.toString());
+ $("#imgBar" + z.toString()).attr("src", res.data[z].imageStr);
+
+ labels += $("#print").html();
+
+ }
+
+ // console.log(labels);
+ document.getElementById('print').innerHTML = "";
+ document.getElementById('print').innerHTML = labels;
+ // console.log($("#print").html());
+ $("#button").hide();
+ $("#print").print();
+ $("#button").show();
+ }
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ }
+ });
+ };
+
+ // 鑾峰彇浼犻�掑弬鏁�
+ function getQueryString(name) {
+ var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+ var r = window.location.search.substr(1).match(reg);
+ if (r != null) return unescape(r[2]);
+ return null;
+ }
+ })
+
+ </script>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/HTML/views/ASNSetting/LabelPrintSelect.html b/HTML/views/ASNSetting/LabelPrintSelect.html
new file mode 100644
index 0000000..31beeec
--- /dev/null
+++ b/HTML/views/ASNSetting/LabelPrintSelect.html
@@ -0,0 +1,142 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <meta 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.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
+ </head>
+ <body>
+ <div class="layui-form" lay-filter="layuiadmin-app-form-list" id="layuiadmin-app-form-list" style="padding: 20px 30px 0 0;">
+ <div class="layui-form-item">
+ <label class="layui-form-label">閲嶇疆鎵瑰彿</label>
+ <div class="layui-input-block">
+ <select name="reset" id="reset" lay-verify="required">
+ <option value="1">鏄�</option>
+ <option value="0">鍚�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鏍囩绾у埆</label>
+ <div class="layui-input-block">
+ <select name="level" id="level" lay-filter="levelFil" lay-verify="required">
+ <option value="1">1</option>
+ <option value="2">2</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍏崇郴灞傜骇</label>
+ <div class="layui-input-block">
+ <select name="type" id="type" lay-verify="required" lay-filter="typeFil" lay-search>
+ <option value="1">鏈夊眰绾�</option>
+ <option value="0">鏃犲眰绾�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍒拌揣鏁伴噺</label>
+ <div class="layui-input-block">
+ <input type="text" name=arriveQty" id="arriveQty" lay-verify="required" placeholder="璇疯緭鍏ュ贩閬撳悕绉�" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-form-item" id="boxTypeDiv" style="display: none;">
+ <label class="layui-form-label">绠辨敮绫诲瀷</label>
+ <div class="layui-input-block">
+ <select name="boxType" id="boxType" lay-filter="boxTypeFil" lay-search>
+ <option value=""></option>
+ <option value="1">绠�</option>
+ <option value="2">鏀�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item" id="qtyDiv" style="display: none;">
+ <label class="layui-form-label">鏁伴噺</label>
+ <div class="layui-input-block">
+ <input type="text" name="qty" id="qty" placeholder="璇疯緭鍏ュ贩閬撳悕绉�" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-form-item layui-hide">
+ <input type="button" lay-submit lay-filter="layuiadmin-app-form-submit" id="layuiadmin-app-form-submit" value="纭娣诲姞">
+ <input type="button" lay-submit lay-filter="layuiadmin-app-form-edit" id="layuiadmin-app-form-edit" value="纭缂栬緫">
+ </div>
+
+ </div>
+
+ <script src="../../layuiadmin/layui/layui.js"></script>
+ <script src="../../js/public.js"></script>
+ <script src="../../js/jquery-3.5.1.min.js"></script>
+ <script src="../../js/jquery.cookie.js"></script>
+ <script>
+ layui.config({
+ base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'layer'], function() {
+ var $ = layui.$;
+ var form = layui.form;
+ var layer = layui.layer;
+ form.on('select(levelFil)', function(data){
+ console.log($("#type").val());
+ var type = $("#type").val();
+ if (data.value == "1" ) {
+ $("#boxTypeDiv").css("display","none");
+ form.val("layuiadmin-app-form-list", {
+ "boxType": ""
+ });
+ $("#boxType").removeAttr("lay-verify");
+
+ $("#qtyDiv").css("display","none");
+ $("#qty").removeAttr("lay-verify");
+ $("#qty").val("");
+
+ form.render('select');
+ }
+ if (data.value == "2" && type == "0") {
+ $("#boxTypeDiv").css("display","block");
+ $("#boxType").attr("lay-verify","required");
+
+ }
+ });
+ form.on('select(typeFil)', function(data){
+ var level = $("#level").val();
+ if (data.value == "1") {
+ $("#boxTypeDiv").css("display","none");
+
+ form.val("layuiadmin-app-form-list", {
+ "boxType": ""
+ });
+ $("#boxType").removeAttr("lay-verify");
+
+ $("#qtyDiv").css("display","none");
+ $("#qty").removeAttr("lay-verify");
+ $("#qty").val("");
+ form.render('select');
+ }
+ if (data.value == "0" && level == "2") {
+ $("#boxTypeDiv").css("display","block");
+ $("#boxType").attr("lay-verify","required");
+
+ }
+ });
+ form.on('select(boxTypeFil)', function(data){
+ if (data.value == "1") { //绠�
+ $("#qtyDiv").css("display","none");
+ $("#qty").removeAttr("lay-verify");
+ $("#qty").val("");
+ }
+ if (data.value == "2" ) {
+ $("#qtyDiv").css("display","block");
+ $("#qty").attr("lay-verify","required");
+ }
+ });
+
+
+ })
+ </script>
+
+ </body>
+</html>
diff --git a/HTML/views/BaseSetting/Customer.html b/HTML/views/BaseSetting/Customer.html
index 0da9d9a..b6ec76e 100644
--- a/HTML/views/BaseSetting/Customer.html
+++ b/HTML/views/BaseSetting/Customer.html
@@ -54,6 +54,7 @@
<option value=""></option>
<option value="0">瀹㈡埛</option>
<option value="1">渚涘簲鍟�</option>
+ <option value="2">璐т富</option>
</select>
</div>
</div>
@@ -187,6 +188,8 @@
return "瀹㈡埛";
} else if(d.Type ==1){
return "渚涜揣鍟�";
+ } else if(d.Type ==2){
+ return "璐т富";
}else{
return "";
}
diff --git a/HTML/views/BaseSetting/CustomerFrom.html b/HTML/views/BaseSetting/CustomerFrom.html
index a936d1b..3cd5df4 100644
--- a/HTML/views/BaseSetting/CustomerFrom.html
+++ b/HTML/views/BaseSetting/CustomerFrom.html
@@ -34,6 +34,7 @@
<option value=""></option>
<option value="0">瀹㈡埛</option>
<option value="1">渚涘簲鍟�</option>
+ <option value="2">璐т富</option>
</select>
</div>
</div>
diff --git a/HTML/views/BaseSetting/Materials.html b/HTML/views/BaseSetting/Materials.html
index 83582b5..7732a42 100644
--- a/HTML/views/BaseSetting/Materials.html
+++ b/HTML/views/BaseSetting/Materials.html
@@ -59,7 +59,7 @@
<option value="1">鍖呮潗</option>
<option value="2">鎴愬搧</option>
<option value="3">鑰楁潗</option>
- <option value="4">鍗婃垚鍝�</option>
+ <option value="4">涓棿鍝�</option>
</select>
</div>
</div>
@@ -93,7 +93,7 @@
<option value=""></option>
<option value="0">甯告俯</option>
<option value="1">浣庢俯</option>
- <option value="3">骞茬嚗閫氶</option>
+ <!-- <option value="3">骞茬嚗閫氶</option> -->
</select>
</div>
</div>
@@ -144,7 +144,7 @@
{{# } else if(d.Type=='3') { }}
<p>鑰楁潗</p>
{{# } else if(d.Type=='4') { }}
- <p>鍗婃垚鍝�</p>
+ <p>涓棿鍝�</p>
{{# } }}
</script>
diff --git a/HTML/views/BaseSetting/MaterialsForm.html b/HTML/views/BaseSetting/MaterialsForm.html
index 98c9ebe..4a9e799 100644
--- a/HTML/views/BaseSetting/MaterialsForm.html
+++ b/HTML/views/BaseSetting/MaterialsForm.html
@@ -64,7 +64,7 @@
<option value="1">鍖呮潗</option>
<option value="2">鎴愬搧</option>
<option value="3">鑰楁潗</option>
- <option value="4">鍗婃垚鍝�</option>
+ <option value="4">涓棿鍝�</option>
</select>
</div>
</div>
@@ -89,9 +89,9 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">瑙勬牸</label>
+ <label class="layui-form-label">瑙勬牸/鍨嬪彿</label>
<div class="layui-input-block" style="width: 182px;">
- <input type="text" name="Standard" placeholder="璇疯緭鍏ヨ鏍�" lay-verify="" autocomplete="off" class="layui-input">
+ <input type="text" name="Standard" placeholder="璇疯緭鍏ヨ鏍�/鍨嬪彿" lay-verify="" autocomplete="off" class="layui-input">
</div>
</div>
</div>
@@ -123,7 +123,7 @@
<option value=""></option>
<option value="0">甯告俯</option>
<option value="1">浣庢俯</option>
- <option value="3">骞茬嚗閫氶</option>
+ <!-- <option value="3">骞茬嚗閫氶</option> -->
</select>
</div>
</div>
diff --git a/HTML/views/SystemSettings/Category.html b/HTML/views/SystemSettings/Category.html
index 661dc76..25f834e 100644
--- a/HTML/views/SystemSettings/Category.html
+++ b/HTML/views/SystemSettings/Category.html
@@ -177,7 +177,7 @@
title: '搴忓彿', type: 'numbers', fixed: 'left', width:65
},
{
- field: 'CategoryNo', title: '绫诲埆缂栧彿', align: 'center', fixed: 'left',width:100
+ field: 'CategoryNo', title: '绫诲埆缂栫爜', align: 'center', fixed: 'left',width:100
},
{
field: 'CategoryName', title: '绫诲埆鍚嶇О', align: 'center',width:100
diff --git a/HTML/views/SystemSettings/CategoryForm.html b/HTML/views/SystemSettings/CategoryForm.html
index 5276263..199e6e7 100644
--- a/HTML/views/SystemSettings/CategoryForm.html
+++ b/HTML/views/SystemSettings/CategoryForm.html
@@ -11,9 +11,9 @@
<body>
<div class="layui-form" lay-filter="layuiadmin-app-form-list" id="layuiadmin-app-form-list" style="padding: 20px 30px 0 0;">
<div class="layui-form-item">
- <label class="layui-form-label">绫诲埆缂栧彿</label>
+ <label class="layui-form-label">绫诲埆缂栫爜</label>
<div class="layui-input-block">
- <input type="text" name="CategoryNo" placeholder="璇疯緭鍏ョ被鍒紪鍙�" lay-verify="required" autocomplete="off" class="layui-input">
+ <input type="text" name="CategoryNo" placeholder="璇疯緭鍏ョ被鍒紪鐮�" lay-verify="required" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-form-item">
diff --git a/Pda/View/AsnSetting/productEnter1.html b/Pda/View/AsnSetting/productEnter1.html
new file mode 100644
index 0000000..1157f96
--- /dev/null
+++ b/Pda/View/AsnSetting/productEnter1.html
@@ -0,0 +1,922 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+ <meta name="viewport" content="user-scalable=0,width=device-width,initial-scale=1.0" />
+ <meta charset="UTF-8" />
+ <!-- <meta name="viewport" content="width=device-width, initial-scale=0.665, minimum-scale=0.5, maximum-scale=1, user-scalable=no" /> -->
+ <!-- <meta name="viewport" content="width=device-width, initial-scale=0.665" /> -->
+ <meta http-equiv="X-UA-Compatible" content="ie=edge" />
+ <title>Boxline PDA</title>
+
+ <link rel="stylesheet" href="/layui/css/layui.css" />
+ <link rel="stylesheet" href="/css/style.css" />
+ <script src="/js/adaptive.js"></script>
+ <link rel="stylesheet" href="/css/my.css" />
+ <style type="text/css">
+ td {
+ word-break: break-all;
+ word-wrap: break-word;
+ }
+
+ .layui-form-switch {
+ margin-top: 0;
+ }
+
+ /* 鏍囩鏍峰紡 */
+ .tableyang-this a {
+ margin: 10px 10px 0px 0px;
+ line-height: 30px;
+ width: 100px;
+ color: #999;
+ text-align: center;
+ float: left;
+ background: #f7f7f7;
+ user-select: none;
+ position: relative;
+ z-index: 1;
+ cursor: pointer;
+ border-radius: 5px;
+ border: 1px solid #ccc;
+ transition: all 0.3s ease;
+ }
+
+ .tableyang-this a.hover {
+ color: #5298ff;
+ background-color: #eff2ff;
+ border: 1px solid #5298ff;
+ }
+ /* 鍐呭灞呬腑 */
+ .tableyang-tab {
+ display: flex;
+ /* justify-content: center; */
+ /* align-items: center; */
+ flex-direction: column;
+ height: 90vh;
+ }
+ /* 蹇呯敤鏍峰紡 */
+ .tableyang-2,.tableyang-3 {
+ display: none;
+ }
+
+ ul {
+ list-style-type: none;
+ padding: 0;
+ }
+
+ li {
+ cursor: pointer;
+ background-color: lightgray;
+ padding: 10px;
+ margin-bottom: 5px;
+ }
+
+
+
+ </style>
+ <link rel="stylesheet" href="/css/adapter.css" />
+ <script src="../../js/jquery.js"></script>
+ <script src="../../js/jquery-3.5.1.min.js"></script>
+</head>
+
+<body>
+ <div id="" class="main-content">
+
+ <div id="" class="layout-title">
+ <table border="" cellspacing="" cellpadding="">
+ <tr>
+ <td class="img-back"><a href="../index.html"><img src="/assets/back.jpg"></a></td>
+ <td class="title-text" lang>鎵樼洏缁戝畾</td>
+ <td class="title-menu-icon"><img id="menuImg" src="/assets/menu.jpg"></td>
+ </tr>
+ </table>
+ </div>
+
+ <div id="" class="layout-sub-content">
+ <div id="menuList" class="menu">
+ <ul class="" style="text-align: center;">
+ <li><a href="../index.html" lang>涓婚〉</a></li>
+ <!-- <li><a href="productEnterConfirm.html">鍏ュ簱淇℃伅纭</a></li> -->
+ <li><a href="../login.html" lang>閲嶆柊鐧诲綍</a></li>
+ </ul>
+ </div>
+
+ <ul>
+ <li id="option1">鏍囩</li>
+ <li id="option2">鏁伴噺</li>
+
+ </ul>
+
+ <br />
+ <!-- 鏈夌爜 -->
+ <div id="content1">
+ <div id="zongDiv" class="layout-bill-info" style="height: 255px;">
+ <form class="layui-form" action="">
+ <div id="" class="layui-form-item layout-dropdownlist">
+ <label class="layui-form-label" lang>鍏ュ簱鍗曪細</label>
+ <div class="layui-input-block" id="selectDiv">
+ <select id="bar" lay-filter="getbar" lay-search>
+ <option value=""></option>
+ </select>
+ <img src="/assets/down_arraw.png">
+ </div>
+ </div>
+ <div class="layui-form-item layout-dropdownlist" style="margin-top: 10px;">
+ <label class="layui-form-label">鐗╂枡-鎵规锛�</label>
+ <div class="layui-input-block" id="goodDiv">
+ <select id="goodSelect" lay-filter="goodSelect" lay-search>
+ <option value=""></option>
+ </select>
+ <img src="/assets/down_arraw.png">
+ </div>
+ </div>
+
+ <div id="" class="layui-form-item layout-input">
+ <label class="layui-form-label" lang>鎵樼洏鏉＄爜锛�</label>
+ <div class="layui-input-block">
+ <input id="STOCKCODE" type="text" lay-verify="stock" lang langholder placeholder="璇锋壂鎻忔墭鐩樻潯鐮�"
+ autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div id="BOX" class="layui-form-item layout-input">
+ <label class="layui-form-label" lang>澶栫鏉＄爜锛�</label>
+ <div class="layui-input-block">
+ <input id="BOXCODE" type="text" lay-verify="required" lang langholder placeholder="璇锋壂鎻忓绠辨潯鐮�"
+ autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ <div id="" class="layui-form-item layout-input">
+ <label class="layui-form-label" lang>鏄惁杩炵粍锛�</label>
+ <div class="layui-input-block">
+ <input type="checkbox" name="IsLianXu" id="IsLianXu" lay-skin="switch" lay-text="鏄瘄鍚�"
+ lay-filter="IsLianXu">
+ </div>
+ </div>
+ <div id="BOX2" class="layui-form-item layout-input" style="display: none;">
+ <label class="layui-form-label" lang>灏剧鏉＄爜锛�</label>
+ <div class="layui-input-block">
+ <input id="BOXCODE2" type="text" lang langholder placeholder="璇锋壂鎻忓绠辨潯鐮�" autocomplete="off"
+ class="layui-input">
+ </div>
+ </div>
+
+ <table class="layout-tbl-input" border="" cellspacing="" cellpadding="">
+ <tr>
+ <td>
+ <div id="" class="layui-form-item layout-boxinfo">
+ <label class="layui-form-label" lang>瑙勬牸/鍨嬪彿锛�</label>
+ <div class="layui-input-block">
+ <input id="Standard" type="text" disabled placeholder="" autocomplete="off"
+ class="layui-input">
+ </div>
+ </div>
+ </td>
+ <td>
+ <div id="" class="layui-form-item layout-boxinfo">
+ <label class="layui-form-label" lang>璁″垝鏁伴噺锛�</label>
+ <div class="layui-input-block">
+ <input id="ImportQuantity" type="text" disabled placeholder=""
+ autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </td>
+
+ </tr>
+ <tr>
+ <td>
+ <div id="" class="layui-form-item layout-boxinfo">
+ <label class="layui-form-label" lang>宸茬粍鏁伴噺锛�</label>
+ <div class="layui-input-block">
+ <input id="ImportFactQuantity" type="text" disabled placeholder=""
+ autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </td>
+ <td>
+ <div id="" class="layui-form-item layout-boxinfo">
+ <label class="layui-form-label" lang>绠卞唴鏁伴噺锛�</label>
+ <div class="layui-input-block">
+ <input id="BoxQty" type="text" disabled placeholder="" autocomplete="off"
+ class="layui-input">
+ </div>
+ </div>
+ </td>
+ </tr>
+
+ </table>
+
+ </form>
+ </div>
+
+ </div>
+ <!-- 鏃犵爜 -->
+ <div id="content2">
+ <div id="zongDiv" class="layout-bill-info" style="height: 255px;">
+ <form class="layui-form" action="">
+ <div id="" class="layui-form-item layout-dropdownlist">
+ <label class="layui-form-label" lang>鍏ュ簱鍗曪細</label>
+ <div class="layui-input-block" id="selectDivw">
+ <select id="barw" lay-filter="getbar" lay-search>
+ <option value=""></option>
+ </select>
+ <img src="/assets/down_arraw.png">
+ </div>
+ </div>
+ <div class="layui-form-item layout-dropdownlist" style="margin-top: 10px;">
+ <label class="layui-form-label">鐗╂枡-鎵规锛�</label>
+ <div class="layui-input-block" id="goodDivw">
+ <select id="goodSelectw" lay-filter="goodSelectw" lay-search>
+ <option value=""></option>
+ </select>
+ <img src="/assets/down_arraw.png">
+ </div>
+ </div>
+
+ <div id="" class="layui-form-item layout-input">
+ <label class="layui-form-label" lang>鎵樼洏鏉＄爜锛�</label>
+ <div class="layui-input-block">
+ <input id="STOCKCODEw" type="text" lay-verify="stock" lang langholder placeholder="璇锋壂鎻忔墭鐩樻潯鐮�"
+ autocomplete="off" class="layui-input">
+ </div>
+ </div>
+
+ <div id="" class="layui-form-item layout-input">
+ <label class="layui-form-label" lang>鐗╂枡鏁伴噺锛�</label>
+ <div class="layui-input-block">
+ <input id="SkuQtyw" type="text" lay-verify="stock" lang langholder placeholder="璇疯緭鍏ョ墿鏂欐暟閲�"
+ autocomplete="off" class="layui-input">
+ </div>
+ </div>
+
+ <table class="layout-tbl-input" border="" cellspacing="" cellpadding="">
+ <tr>
+ <td>
+ <div id="" class="layui-form-item layout-boxinfo">
+ <label class="layui-form-label" lang>瑙勬牸/鍨嬪彿锛�</label>
+ <div class="layui-input-block">
+ <input id="Standardw" type="text" disabled placeholder="" autocomplete="off"
+ class="layui-input">
+ </div>
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <div id="" class="layui-form-item layout-boxinfo">
+ <label class="layui-form-label" lang>璁″垝鏁伴噺锛�</label>
+ <div class="layui-input-block">
+ <input id="ImportQuantityw" type="text" disabled placeholder=""
+ autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </td>
+
+ </tr>
+ <tr>
+ <td>
+ <div id="" class="layui-form-item layout-boxinfo">
+ <label class="layui-form-label" lang>宸茬粍鏁伴噺锛�</label>
+ <div class="layui-input-block">
+ <input id="ImportFactQuantityw" type="text" disabled placeholder=""
+ autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </td>
+ </tr>
+
+ </table>
+
+ </form>
+ </div>
+
+ </div>
+
+ <table class="layout-tbl-submit" border="" cellspacing="" cellpadding="">
+ <tr>
+ <td style="width: 23%;"></td>
+ <td>
+ <button class="layout-btn layout-btn-red" lang type="button" lay-submit
+ lay-filter="formBind">缁戝畾鍒版墭鐩�</button>
+ </td>
+ <td style="width: 33%;"></td>
+
+ </tr>
+ </table>
+
+ <br>
+
+ <div id="" class="cut-line">
+ <img src="/assets/fengexian.png">
+ </div>
+
+ <div class="layout-tbl-paging" id="">
+ <table id="tableBoxList" class="tbl-box-list" border="" cellspacing="" cellpadding="">
+ <tr>
+ <th lang style="width: 15%;">缂栫爜</th>
+ <th lang style="width: 35%;">鍚嶇О</th>
+ <th lang style="width: 25%;">鎵规</th>
+ <th lang style="width: 15%;">鏁伴噺</th>
+ <th lang style="width: 10%;">鎿嶄綔</th>
+ </tr>
+ <tr id="boxCell" style="display: none;">
+ <td name="code">AG000001</td>
+ <td name="name">鐤嫍鍚嶇О鍚嶇О鍚嶇О</td>
+ <td name="lotNo">鎵规鍙�</td>
+ <td name="num">30</td>
+ <td name="del">
+ <div id="" class="tbl-btn-del" lang>
+ 鍒犻櫎
+ </div>
+ </td>
+ </tr>
+ </table>
+ </div>
+
+
+ </div>
+ </div>
+ <script src="/js/jquery-3.5.1.min.js"></script>
+ <script src="/layui/layui.js"></script>
+ <script src="/js/public.js"></script>
+ <script src="/js/language.js"></script>
+ <script src="/js/jquery.cookie.js"></script>
+ <script>
+ layui.use(['form', 'jquery'], function () {
+ var form = layui.form
+
+ /* 鏍囩鍒囨崲浠ｇ爜 */
+
+ var xianshiyemian = 0;
+
+ $('#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();
+ $(document).ready(function() {
+ $('#option1').click(function() {
+ xianshiyemian = 0;
+ $('#content1').show();
+ $('#option1').attr("style", "background-color: aqua;width: 45.77%;float: left;text-align: center;"); //閫変腑鍚庨鑹�
+
+ $('#content2').hide();
+ $('#option2').attr("style", "background-color: #999;width: 45.77%;float: right;text-align: center;"); //榛樿棰滆壊
+ });
+
+ $('#option2').click(function() {
+ xianshiyemian = 1;
+ $('#content1').hide();
+ $('#option1').attr("style", "background-color: #999;width: 45.77%;float: left;text-align: center;"); //榛樿棰滆壊
+
+ $('#content2').show();
+ $('#option2').attr("style", "background-color: aqua;width: 45.77%;float: right;text-align: center;"); //閫変腑鍚庨鑹�
+
+ });
+ });
+
+
+ initLanguage()
+ setLanguage()
+
+ //褰撳墠鍒嗛〉
+ var curPageIndex = 1;
+ //鏄惁杩炵画缁勬墭
+ isContinue = "0";
+ //娓呮鏂囨湰妗嗕腑鏁版嵁
+ function clear() {
+ $("#ImportQuantity").val("");
+ $("#GoodsCode").val("");
+ $("#Standard").val("");
+ $("#ImportFactQuantity").val("");
+ $("#ImportQty").val("");
+ $("#BoxQty").val("");
+ }
+
+ // 鎵樼洏鐮佹枃鏈敼鍙樻椂瑙﹀彂
+ $("#STOCKCODE").on('input', function () {
+
+ if ($("#STOCKCODE").val() == "" || $("#STOCKCODE").val().length < 8) {
+ return
+ }
+ if ($("#STOCKCODE").val().length >= 8) {
+ $("#STOCKCODE").val($("#STOCKCODE").val().substr(-8))
+ }
+ checkPalletStat()
+ })
+
+ // 鎵樼洏鐮佹枃鏈敼鍙樻椂瑙﹀彂-鏁伴噺
+ $("#STOCKCODEw").on('input', function () {
+
+ if ($("#STOCKCODEw").val() == "" || $("#STOCKCODEw").val().length < 8) {
+ return
+ }
+ if ($("#STOCKCODEw").val().length >= 8) {
+ $("#STOCKCODEw").val($("#STOCKCODEw").val().substr(-8))
+ }
+ checkPalletStat()
+ })
+
+ //绠辩爜鍥炶溅浜嬩欢
+ $("#BOXCODE").keydown(function (e) {
+ if (e.keyCode === 13) {
+ if ($("#BOXCODE").val() == "") {
+ return
+ }
+
+ if ($("#STOCKCODE").val() == "") {
+ layer.msg('璇峰厛鎵弿鎵樼洏鐮�', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ $("#BOXCODE").val("");
+ $("#STOCKCODE").focus();
+ return;
+ }
+ checkBoxInfo()
+ }
+ });
+
+ //鐐瑰嚮鍏ュ簱鍗曟嵁涓嬫媺妗嗕簨浠�
+ $("#selectDiv").click(function () {
+ var input = $('select[id="bar"]').next().find('.layui-select-title input')
+ var val = input.val()
+ //鍏堟洿鏂颁竴涓嬪叆搴撳崟
+ updateBillList(function (data) {
+ $('select[id="bar"]').next().addClass('layui-form-selected')
+ $('select[id="bar"]').next().find('.layui-select-title input').val(val)
+ })
+ })
+ //鐐瑰嚮鍏ュ簱鍗曟嵁涓嬫媺妗嗕簨浠�-鏁伴噺
+ $("#selectDivw").click(function () {
+ var input = $('select[id="barw"]').next().find('.layui-select-title input')
+ var val = input.val()
+ //鍏堟洿鏂颁竴涓嬪叆搴撳崟
+ updateBillList(function (data) {
+ $('select[id="barw"]').next().addClass('layui-form-selected')
+ $('select[id="barw"]').next().find('.layui-select-title input').val(val)
+ })
+ })
+
+ //鐐瑰嚮鐗╂枡涓嬫媺妗嗕簨浠�
+ $("#goodDiv").click(function () {
+ if ($("#bar").val() == null || $("#bar").val() == "" || $("#bar").val() == undefined) {
+ layer.msg("璇峰厛閫夋嫨鍏ュ簱鍗�", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ }
+ })
+ //鐐瑰嚮鐗╂枡涓嬫媺妗嗕簨浠�-鏁伴噺
+ $("#goodDivw").click(function () {
+ if ($("#barw").val() == null || $("#barw").val() == "" || $("#barw").val() == undefined) {
+ layer.msg("璇峰厛閫夋嫨鍏ュ簱鍗�", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ }
+ })
+
+ //閫変腑鍏ュ簱鍗曚簨浠�
+ form.on('select(getbar)', function (data) {
+ updateGoodList()
+ setOrderGoods();
+ });
+ //閫変腑鍏ュ簱鍗曚簨浠�-鏁伴噺
+ form.on('select(getbarw)', function (data) {
+ updateGoodListw()
+ setOrderGoodsw();
+ });
+
+ //閫変腑鐗╂枡浜嬩欢
+ form.on('select(goodSelect)', function (data) {
+ setOrderGoods();
+ });
+ //閫変腑鐗╂枡浜嬩欢-鏁伴噺
+ form.on('select(goodSelectw)', function (data) {
+ setOrderGoods();
+ });
+
+
+ //缁戝畾鍒版墭鐩樹簨浠�
+ form.on('submit(formBind)', function (data) {
+ console.log(isContinue);
+ console.log($("#goodSelect").val());
+ if ($("#bar").val() == "") {
+ layer.msg('璇烽�夋嫨鍏ュ簱鍗�', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return;
+ }
+ if ($("#goodSelect").val() == "") {
+ layer.msg('璇烽�夋嫨鐗╂枡鍙婃槑缁�', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return;
+ }
+ if ($("#STOCKCODE").val() == "") {
+ layer.msg('璇锋壂鎻忔墭鐩樻潯鐮�', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return;
+ }
+ if ($("#BOXCODE").val() == "") {
+ layer.msg('璇锋壂鎻忓绠辨潯鐮�', {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return;
+ }
+ var param = {
+ AsnNo: $("#bar").val(),
+ PalletNo: $("#STOCKCODE").val(),
+ AsnDetailId: parseInt($("#goodSelect").val()),
+ BoxNo: $("#BOXCODE").val(),
+ IsContinue: isContinue,
+ TailBoxNo: $("#BOXCODE2").val(),
+ Origin:"PDA"
+ }
+ //缁勭洏
+ sendData(IP + "/PdaAsn/BindPallet", param, 'post', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ layer.msg(res.msg, {
+ icon: 1,
+ time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ setOrderGoods();
+ refreshTable();
+ $("#BOXCODE").val("");
+ $("#BOXCODE2").val("");
+ $("#QTY").val("");
+ });
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+ //鍥炶皟
+ });
+ }
+ });
+ return false; //闃绘琛ㄥ崟璺宠浆銆傚鏋滈渶瑕佽〃鍗曡烦杞紝鍘绘帀杩欐鍗冲彲銆�
+ });
+
+
+ // 鏍规嵁鍏ュ簱鏄庣粏ID 鑾峰彇璇︾粏淇℃伅
+ function setOrderGoods() {
+ $("#ImportQuantity").val("");
+ $("#Standard").val("");
+ $("#ImportFactQuantity").val("");
+
+ var param = {
+ Id: parseInt($("#goodSelect").val())
+ };
+
+ synData(IP + "/PdaAsn/GetArrivalNoticeDetail", param, 'post', function (res) {
+ console.log(JSON.stringify(res))
+ if (res.code == 0 && res.data != null) { //鎴愬姛
+ $("#ImportQuantity").val(res.data.Qty);
+ $("#Standard").val(res.data.Standard);
+ $("#ImportFactQuantity").val(res.data.FactQty + "");
+ }
+ });
+ }
+ // 鏍规嵁鍏ュ簱鏄庣粏ID 鑾峰彇璇︾粏淇℃伅-鏁伴噺
+ function setOrderGoodsw() {
+ $("#ImportQuantity").val("");
+ $("#Standard").val("");
+ $("#ImportFactQuantity").val("");
+
+ var param = {
+ Id: parseInt($("#goodSelectw").val())
+ };
+
+ synData(IP + "/PdaAsn/GetArrivalNoticeDetail", param, 'post', function (res) {
+ console.log(JSON.stringify(res))
+ if (res.code == 0 && res.data != null) { //鎴愬姛
+ $("#ImportQuantity").val(res.data.Qty);
+ $("#Standard").val(res.data.Standard);
+ $("#ImportFactQuantity").val(res.data.FactQty + "");
+ }
+ });
+ }
+
+ // 缁戝畾鍏ュ簱鍗曚俊鎭�
+ function updateBillList(callback) {
+ var input = $('select[id="bar"]').next().find('.layui-select-title input')
+ var val = input.val()
+ $("#bar").empty()
+ $("#bar").append('<option value =>' + '</option>');
+ form.render('select');
+
+ var param = {
+ Type: "0,1"
+ };
+ sendData(IP + "/PdaAsn/GetArrivalNotices", param, 'post', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ for (var i = 0; i < res.data.length; i++) {
+ $("#bar").append('<option value =' + res.data[i].ASNNo + '>' + res.data[i]
+ .ASNNo +
+ '</option>');
+ }
+ form.render('select');
+
+ if (!val) {
+ $('#bar').siblings("div.layui-form-select").find('dl').find('.layui-select-tips').addClass('layui-this')
+ } else {
+ var sel = 'dd[lay-value=' + val + ']';
+ $('#bar').siblings("div.layui-form-select").find('dl').find(sel).addClass('layui-this')
+ }
+
+ callback(res.data)
+ } else { //涓嶆垚鍔�
+ // layer.msg(res.msg, {
+ // icon: 2,
+ // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ // }, function() {});
+ }
+ });
+ }
+
+ var asnDetails = "";
+
+ // 缁戝畾鍏ュ簱鍗曠墿鏂欏強鎵规
+ function updateGoodList() {
+ console.log("aaaa");
+ var input = $('select[id="goodSelect"]').next().find('.layui-select-title input')
+ var val = input.val()
+
+ $("#goodSelect").empty()
+ $("#goodSelect").append('<option value =>' + '</option>');
+
+ var param = {
+ AsnNo: $("#bar").val(),
+ };
+ synData(IP + "/PdaAsn/GetArrivalNoticeDetails", param, 'post', function (res) {
+ console.log("鍑哄簱鍙ｏ細" + JSON.stringify(res))
+ if (res.code == 0) { //鎴愬姛
+ asnDetails = res.data;
+ for (var i = 0; i < res.data.length; i++) {
+ if (i == 0) {
+ $("#goodSelect").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
+ .SkuName + "-" + res.data[i].LotNo +
+ '</option>');
+ } else {
+ $("#goodSelect").append('<option value =' + res.data[i].Id + '>' + res.data[i]
+ .SkuName + "-" + res.data[i].LotNo +
+ '</option>');
+ }
+
+ }
+ form.render('select');
+
+ if (!val) {
+ $('#goodSelect').siblings("div.layui-form-select").find('dl').find('.layui-select-tips').addClass('layui-this')
+ } else {
+ var sel = 'dd[lay-value=' + val + ']';
+ $('#goodSelect').siblings("div.layui-form-select").find('dl').find(sel).addClass('layui-this')
+ }
+ } else {
+ }
+ });
+ }
+ // 缁戝畾鍏ュ簱鍗曠墿鏂欏強鎵规-鏁伴噺
+ function updateGoodList() {
+ console.log("aaaa");
+ var input = $('select[id="goodSelectw"]').next().find('.layui-select-title input')
+ var val = input.val()
+
+ $("#goodSelectw").empty()
+ $("#goodSelectw").append('<option value =>' + '</option>');
+
+ var param = {
+ AsnNo: $("#bar").val(),
+ };
+ synData(IP + "/PdaAsn/GetArrivalNoticeDetails", param, 'post', function (res) {
+ console.log("鍑哄簱鍙ｏ細" + JSON.stringify(res))
+ if (res.code == 0) { //鎴愬姛
+ asnDetails = res.data;
+ for (var i = 0; i < res.data.length; i++) {
+ if (i == 0) {
+ $("#goodSelectw").append('<option value =' + res.data[i].Id + ' selected>' + res.data[i]
+ .SkuName + "-" + res.data[i].LotNo +
+ '</option>');
+ } else {
+ $("#goodSelectw").append('<option value =' + res.data[i].Id + '>' + res.data[i]
+ .SkuName + "-" + res.data[i].LotNo +
+ '</option>');
+ }
+
+ }
+ form.render('select');
+
+ if (!val) {
+ $('#goodSelectw').siblings("div.layui-form-select").find('dl').find('.layui-select-tips').addClass('layui-this')
+ } else {
+ var sel = 'dd[lay-value=' + val + ']';
+ $('#goodSelectw').siblings("div.layui-form-select").find('dl').find(sel).addClass('layui-this')
+ }
+ } else {
+ }
+ });
+ }
+
+ // 娓叉煋绠辩爜淇℃伅
+ function refreshTable() {
+ //鍏堟竻绌轰竴涓嬬瀛愬垪琛�
+ let trs = $("#tableBoxList tr")
+ let len = trs.length
+
+ for (i = len - 1; i >= 2; i--) {
+ trs[i].remove();
+ }
+
+ //璁剧疆鎵樼洏鍙�
+ $("#palletCode").val($.cookie('stockCode'))
+
+ var param = {
+ PalletNo: $.cookie('stockCode')
+ };
+ // 鏍规嵁鎵樼洏鍙疯幏鍙栫鐮佷俊鎭�
+ sendData(IP + "/PdaAsn/GetBoxInfos", param, 'post', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ var list = res
+ var arrTrs = new Array()
+ let idx = 0
+ for (var i in res.data) {
+ var tr = $("#boxCell").eq(0).clone();
+ tr.appendTo("#tableBoxList");
+ tr.attr('id', res.data[i].Id)
+ tr.attr('boxno', res.data[i].BoxNo)
+ tr.attr('BindNo', res.data[i].BindNo)
+ idx++;
+ tr.attr('index', idx)
+ tr.find("td[name='code']").html(res.data[i].BoxNo);
+ tr.find("td[name='name']").html(res.data[i].SkuName);
+ tr.find("td[name='lotNo']").html(res.data[i].LotNo);
+ tr.find("td[name='num']").html(res.data[i].Qty);
+ tr.find("td[name='del']").click(function () {
+ var elem = $(this).parent()
+ var boxno = elem.attr('boxno')
+ var BindNo = elem.attr('BindNo')
+ var Id = elem.attr('id')
+ layer.alert("纭畾瑕佷粠鎵樼洏涓婂垹闄よ繖涓鐗╂枡鍚楋紵<br>" + boxno, {
+ icon: 2,
+ time: 0, //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ btn: ['鍒犻櫎', '鍙栨秷'],
+ yes: function () {
+
+ var param = {
+ Id: Id,
+ };
+ sendData(IP + "/PdaAsn/DelBoxInfo", param, 'post', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ layer.msg(res.msg, {
+ icon: 1,
+ time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ elem.remove()
+ setOrderGoods();
+ refreshTable();
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ }
+ });
+ }
+ })
+ })
+ tr.show();
+ arrTrs[i] = tr
+ }
+
+
+ } else { //涓嶆垚鍔�
+ layer.msg("鏃犳暟鎹�", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ $("#boxNum").val(0)
+ }
+ });
+ }
+
+ // 鍒ゆ柇鎵樼洏鐮佹槸鍚﹀彲鐢�
+ function checkPalletStat() {
+ var param = {
+ "PalletNo": $("#STOCKCODE").val()
+ }
+ sendData(IP + "/PdaAsn/IsEnablePalletNo", param, 'post', function (res) {
+ if (res.code == 0) {
+
+ $.cookie('stockCode', $("#STOCKCODE").val());
+ refreshTable()
+ $("#BOXCODE").focus();
+
+ } else {
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ }
+ });
+ }
+ // 鍒ゆ柇鎵樼洏鐮佹槸鍚﹀彲鐢�
+ function checkPalletStatw() {
+ var param = {
+ "PalletNo": $("#STOCKCODEw").val()
+ }
+ sendData(IP + "/PdaAsn/IsEnablePalletNo", param, 'post', function (res) {
+ if (res.code == 0) {
+
+ $.cookie('STOCKCODEw', $("#STOCKCODEw").val());
+ refreshTable()
+ // $("#BOXCODE").focus();
+
+ } else {
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () { });
+ }
+ });
+ }
+
+ function checkBoxInfo() {
+ var param = {
+ "BoxNo": $("#BOXCODE").val(),
+ }
+ sendData(IP + "/PdaAsn/GetBoxInfos", param, 'post', function (res) {
+ if (res.code == 0) { //鎴愬姛
+ var bl = false; console.log(res.data);
+ if (res.data.length == 0) {
+ layer.msg("鏈煡璇㈠埌姝ょ鐗╂枡淇℃伅锛岃鏍稿疄!", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ return;
+ }
+ asnDetails.forEach(element => {
+ console.log(element);
+
+ if (element.SkuNo == res.data[0].SkuNo && element.LotNo == res.data[0].LotNo) {
+ var sel = 'dd[lay-value=' + element.id + ']';
+ $('#goodSelect').siblings("div.layui-form-select").find('dl').find(sel).addClass('layui-this');
+ bl = true;
+ }
+ });
+ if (!bl) {
+ layer.msg("姝ょ鐗╂枡涓嶇鍚堣鍏ュ簱鍗曪紝璇锋牳瀹�!", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ } else {
+ $("#BoxQty").val(res.data[0].Qty);
+ }
+
+ } else { //涓嶆垚鍔�
+ layer.msg(res.msg, {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ });
+ }
+ });
+
+ }
+
+
+
+ form.on('switch(IsLianXu)', function (obj) {
+ if (obj.elem.checked) {
+ $('#BOX2').attr("style", "display:block")
+ $('#zongDiv').attr("style", "height: 285px;")
+ isContinue = "1";
+ } else {
+ $('#BOX2').attr("style", "display:none")
+ $('#zongDiv').attr("style", "height: 255px;")
+ isContinue = "0";
+ }
+ $('#BOXCODE2').val("");
+ });
+
+ $("#menuImg").click(function (e) {
+ //console.log("menuImg")
+ e.stopPropagation()
+
+ if ($("#menuList").is(":hidden")) {
+ $("#menuList").show()
+ } else {
+ $("#menuList").hide()
+ }
+ })
+ $('body').click(function () {
+ // //console.log("body")
+ $("#menuList").hide()
+ })
+ })
+ </script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/Wms/WMS.BLL/SysServer/MaterialCategoryServer.cs b/Wms/WMS.BLL/SysServer/MaterialCategoryServer.cs
index 9789bf9..09f7b18 100644
--- a/Wms/WMS.BLL/SysServer/MaterialCategoryServer.cs
+++ b/Wms/WMS.BLL/SysServer/MaterialCategoryServer.cs
@@ -60,7 +60,7 @@
{
Id = a.Id,
- CategoryNo = a.CategoryNo, //绫诲埆鍙�
+ CategoryNo = a.CategoryNo, //绫诲埆缂栫爜
CategoryName = a.CategoryName, //绫诲埆鍚嶇О
AreaNo = a.AreaNo, //鍖哄煙鍙�
@@ -215,7 +215,7 @@
Db.BeginTran();
SysMaterialCategory list = new SysMaterialCategory()
{
- CategoryNo = category.CategoryNo, //绫诲埆鍙�
+ CategoryNo = category.CategoryNo, //绫诲埆缂栫爜
CategoryName = category.CategoryName, //绫诲埆鍚嶇О
AreaNo = category.AreaNo, //鍖哄煙缂栫爜
@@ -256,6 +256,8 @@
string msg = "";
//鑾峰彇绫诲埆淇℃伅
var categoryInfo = Db.Queryable<SysMaterialCategory>().First(a => a.IsDel == "0" && a.Id == category.Id);
+ //鑾峰彇绫诲埆瀵瑰簲鐗╂枡淇℃伅
+ var matelist = Db.Queryable<SysMaterials>().Where(a=>a.IsDel == "0" && a.CategoryNo == categoryInfo.CategoryNo).ToList();
//鑾峰彇鍖哄煙淇℃伅
var area = Db.Queryable<SysStorageArea>().First(a => category.AreaNo.Contains(a.AreaNo) && a.IsDel == "0");
@@ -265,16 +267,21 @@
}
Db.BeginTran();
- categoryInfo.CategoryNo = category.CategoryNo; //绫诲埆鍙�
+ categoryInfo.CategoryNo = category.CategoryNo; //绫诲埆缂栫爜
categoryInfo.CategoryName = category.CategoryName; //绫诲埆鍚嶇О
categoryInfo.AreaNo = category.AreaNo; //鍖哄煙缂栫爜
categoryInfo.Demo = category.Demo; //澶囨敞
categoryInfo.UpdateUser = category.CreateUser; //鏇存敼浜�
categoryInfo.UpdateTime = Db.GetDate(); //鏇存敼鏃堕棿
-
Db.Updateable(categoryInfo).ExecuteCommand();
+ foreach (var item in matelist)
+ {
+ item.CategoryNo = categoryInfo.CategoryNo;
+ }
+ Db.Updateable(matelist).ExecuteCommand();
+
Db.CommitTran();
msg = "缂栬緫绫诲埆淇℃伅鎴愬姛锛�";
--
Gitblit v1.8.0