Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

yxj

2024-03-13 6cc377411a24d8670df93fec5d0ade664e7c5e2f

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Add_Edit_Gy_Material.html

@@ -802,7 +802,7 @@
                                , "HWidth": data.HWidth
                                , "HWeight": data.HWeight
                                , "HColorRemark": data.染色要求
                                , "HPieceMaxQty": data.单件最大上限
                                , "HPieceMaxQty": data.单件最大上限 == null ? "0" : data.单件最大上限
                                , "HQCSchemeID_Fst": data.HQCSchemeID_Fst
                                , "HQCSchemeName_Fst": data.首件检验方案
                                , "HQCSchemeID_Proc": data.HQCSchemeID_Proc
@@ -853,6 +853,10 @@
                    layer.msg("请输入物料名称！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HWhID").val() == 0) {
                    layer.msg("请选择默认仓库！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                //if ($("#HModel").val() == 0) {
                //    layer.msg("请输入规格型号！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                //    return;