From b1f141d7e043d0ccc254a363aaa6da6dbb19c068 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期四, 16 三月 2023 14:05:33 +0800
Subject: [PATCH] 直接调拨单扫码模块,增加源单委外用料清单功能

---
 WebTM/WebTM.csproj.user                          |    2 
 WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html |  116 ++++++++++++++++++++++++++++++++++++++++------------------
 2 files changed, 81 insertions(+), 37 deletions(-)

diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index f0d2214..06468a2 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>E:\鏅轰簯mes\mes\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>JFTM</NameOfLastUsedPublishProfile>
     <ProjectView>ProjectFiles</ProjectView>
     <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
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 917373d..1a44151 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"
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>璋冩嫧鍗�</title>
+    <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">
@@ -21,7 +21,7 @@
             <div class="layui-card-body" style="padding: 5px; height:800px;">
                 <form class="layui-form" action="" lay-filter="component-form-group">
                     <div style="background-color:#0085E8;">
-                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>璋冩嫧鍗�</span>
+                        <span style="color: white;"><i class="layui-icon layui-icon-form"></i>鐩存帴璋冩嫧鍗�</span>
                     </div>
                     <div class="layui-form-item" style="padding:15px;margin:0px">
                         <div class="layui-row">
@@ -33,6 +33,16 @@
                             </div>
                             <div class="layui-col-xs2">
                                 <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin">纭畾</button>
+                            </div>
+                        </div>
+                        <div class="layui-form-item" style="padding:0px;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" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -54,14 +64,12 @@
                                             <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟绫诲瀷</label>
                                         </div>
                                         <div class="layui-col-xs8">
-                                            <select name=" HBillType" id="HBillType">
-                                                <option value="-1">鎵嬪伐褰曞叆</option>
-                                                <option value="3720">鐢熶骇浠诲姟鍗�-鎶曟枡</option>
-                                                <option value="1243">璋冩嫧鐢宠鍗�</option>
-                                                <option value="1201">濮斿璁㈠崟-鎶曟枡</option>
+                                            <select name="HBillType" id="HBillType">
                                                 <option value="1402">鍙戣揣閫氱煡鍗�</option>
-                    <!--<option value="1234">涓嬫灦閫氱煡鍗�</option>
-                    <option value="1243">璋冩嫧鐢宠鍗�</option>-->
+                                                <option value="1243">璋冩嫧鐢宠鍗�</option>
+                                                <option value="3720">鐢熶骇鐢ㄦ枡娓呭崟</option>
+                                                <option value="1604">濮斿鐢ㄦ枡娓呭崟</option>
+                                                <option value="-1">鎵嬪伐褰曞叆</option>
                                             </select>
                                             <!--<input type="text" name="cmbSourceType" id="cmbSourceType" lay-verify="cmbSourceType" autocomplete="off" class="layui-input">-->
                                         </div>
@@ -329,16 +337,6 @@
                             </div>
                             <!--鏄庣粏淇℃伅-->
                             <div class="layui-tab-item">
-                                <div class="layui-form-item" style="padding:0px;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" id="HQty" lay-verify="HQty" autocomplete="off" class="layui-input">
-                                        </div>
-                                    </div>
-                                </div>
                                 <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
                             </div>
                             <!--涓嬫灦淇℃伅-->
@@ -474,7 +472,53 @@
                         // console.log(d.data);
                         $("#HInterID").val(d.data[0].HInterID);
                         $("#HBillNo").val(d.data[0].HBillNo);
-                        $("#HBillType").val(d.data[0].HSourceBillType);
+                        $("#HBillType").val(d.data[0].HSourceBillType == null ? "1402" : d.data[0].HSourceBillType);
+                        //鑾峰彇婧愬崟绫诲瀷銆佹簮鍗曞崟鍙�
+                        if (d.data[0].HSourceBillType == "1402") {
+                            $("#HBillType").empty();
+                            $("#HBillType").val("1402");
+                            var optionHtml = '';
+                            optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '鍙戣揣閫氱煡鍗�' + "</option>";
+                            $("#HBillType").append(optionHtml);
+                            layui.form.render('select');
+                            $("#HBillType").attr("readonly", "readonly");
+                        }
+                        else if (d.data[0].HSourceBillType == "1243") {
+                            $("#HBillType").empty();
+                            $("#HBillType").val("1243");
+                            var optionHtml = '';
+                            optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '璋冩嫧鐢宠鍗�' + "</option>";
+                            $("#HBillType").append(optionHtml);
+                            layui.form.render('select');
+                            $("#HBillType").attr("readonly", "readonly");
+                        }
+                        else if (d.data[0].HSourceBillType == "3720") {
+                            $("#HBillType").empty();
+                            $("#HBillType").val("3720");
+                            var optionHtml = '';
+                            optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '鐢熶骇鐢ㄦ枡娓呭崟' + "</option>";
+                            $("#HBillType").append(optionHtml);
+                            layui.form.render('select');
+                            $("#HBillType").attr("readonly", "readonly");
+                        }
+                        else if (d.data[0].HSourceBillType == "1604") {
+                            $("#HBillType").empty();
+                            $("#HBillType").val("1604");
+                            var optionHtml = '';
+                            optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '濮斿鐢ㄦ枡娓呭崟' + "</option>";
+                            $("#HBillType").append(optionHtml);
+                            layui.form.render('select');
+                            $("#HBillType").attr("readonly", "readonly");
+                        }
+                        else {
+                            $("#HBillType").empty();
+                            $("#HBillType").val("-1");
+                            var optionHtml = '';
+                            optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '鎵嬪伐褰曞叆' + "</option>";
+                            $("#HBillType").append(optionHtml);
+                            layui.form.render('select');
+                            $("#HBillType").attr("readonly", "readonly");
+                        }
                         $("#HSourceBillNo").val(d.data[0].HSourceBillNo);
                         $("#HSourceBillNo").attr("disabled","true");
                         //$("#HSourceBillNo").append.readonly = true;
@@ -1633,26 +1677,26 @@
             //    layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
             //    return false;
             //}
-            if ($("#HDeptName").val() == '') {
-                layer.msg("閮ㄩ棬娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
-            }
-            if ($("#HSecManager").val() == '') {
-                layer.msg("楠屾敹浜烘病鏈夐�夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
-            }
-            if ($("#HKeeper").val() == '') {
-                layer.msg("淇濈浜烘病鏈夐�夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
-            }
+            //if ($("#HDeptName").val() == '') {
+            //    layer.msg("閮ㄩ棬娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //    return false;
+            //}
+            //if ($("#HSecManager").val() == '') {
+            //    layer.msg("楠屾敹浜烘病鏈夐�夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //    return false;
+            //}
+            //if ($("#HKeeper").val() == '') {
+            //    layer.msg("淇濈浜烘病鏈夐�夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //    return false;
+            //}
             //if ($("#HSupName").val() == '') {
             //    layer.msg("渚涘簲鍟嗘病鏈夐�夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
             //    return false;
             //}
-            if ($("#HWHNAME").val() == '') {
-                layer.msg("璋冨叆浠撳簱娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
-                return false;
-            }
+            //if ($("#HWHNAME").val() == '') {
+            //    layer.msg("璋冨叆浠撳簱娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+            //    return false;
+            //}
             //if ($("#HWHID").val() == $("#HSCWHID").val() && $("#HStockPlaceID").val() == $("#HOutStockPlaceID").val()) {
             //    layer.msg("璋冨叆浠撳簱銆佷粨浣嶄笉鑳藉拰璋冨嚭浠撳簱銆佷粨浣嶉兘鐩稿悓!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
             //    return false;

--
Gitblit v1.9.1