生产入库扫码模块新增扫源单工序汇报单功能

yxj

2022-11-16 d45da632fdb3114180abe6b3e1f835797657332b

生产入库扫码模块新增扫源单工序汇报单功能

 WebTM/Properties/PublishProfiles/JFTM.pubxml.user

Diff too large

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -4,11 +4,11 @@
      //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地*/
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    //var WEBURL = "http://localhost:8085/API/";   //zgq本地
    //var WEBURL = "http://localhost:8080/API/";   //颜晓军本地配置
    var WEBURL = "http://localhost:8080/API/";   //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/lubao";   //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨露本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //章紫柔本地配置
    var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //余思杰本地配置
    //var WEBURL = "http://10.1.4.155/API/";   //江丰客户NEW
    //var WEBURL = "http://47.96.97.237/API/";   //智云服务器

 WebTM/views/ÑéÊÕÈë¿â/²úÆ·Èë¿â/Kf_ProductInBill_Fast.html

@@ -81,6 +81,7 @@
                                            <select name="HBillType" id="HBillType">
                                                <option value="3711">生产汇报单</option>
                                                <option value="3710">生产订单</option>
                                                <option value="3714">工序汇报单</option>
                                            </select>
                                        </div>
                                    </div>
@@ -1178,9 +1179,11 @@
                    //if (AllowLoadData(sSubStr, 'HBarCode') != false) {//非空验证
                    $.ajax({
                        //url: "http://61.130.49.162:9090/WMSAPI///ProductIn/get_CheckTypeByBarCode_Json",
                        url: GetWEBURL() + "/ProductIn/get_CheckTypeByBarCode_Json",
                        url: GetWEBURL() + "/WEBSController/Get_BarCode_Json",
                        //url: GetWEBURL() + "/ProductIn/get_CheckTypeByBarCode_Json",  //旧
                        type: "GET",
                        data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
                        data: { "sBarCode": sBarCode, "HInterID": sInterID, "HBillType": sBillType, "HBillNo": sBillNo, "HMaker": sessionStorage["HUserName"], "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sQty, "HRedBlueFlag": false, "SourceFlag": HSourceFlag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType, "HStockOrgID": sessionStorage["OrganizationID"], "HScanStyle": '', "HCustom1": '', "HCustom2": '' },
                        //data: { "sCode": sBarCode, "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },  //旧
                        success: function (result) {
                            //debugger;
                            playSound1();
@@ -1207,10 +1210,14 @@
                                    element.tabChange('tab-ProductlnBill', '2');//跳转页签
                                }
                                else if (result.data.HBarType == '源单条码') {
                                    $("#HSupName").val(result.data.HSupName);
                                    $("#HSupID").val(result.data.HSupID);
                                    $("#HDeptName").val(result.data.HDeptName);
                                    $("#HDeptID").val(result.data.HDeptID);
                                    //$("#HSupName").val(result.data.HSupName);
                                    //$("#HSupID").val(result.data.HSupID);
                                    //$("#HDeptName").val(result.data.HDeptName);
                                    //$("#HDeptID").val(result.data.HDeptID);
                                    if (result.data.hDeptIDField != 0) {
                                        $("#HDeptID").val(result.data.hDeptIDField);
                                        $("#HDeptName").val(result.data.hDeptNameField);
                                    }
                                    $("#HSourceBillNo").val(result.data.hSourceBillNoField);
                                    HSourceFlag = true;
                                    //获取源单类型、源单单号
@@ -1229,10 +1236,14 @@
                                        $("#HSourceBillNo").attr("readonly", "readonly");
                                    }
                                    else {
                                        $("#HSupName").val(result.data.HSupName);
                                        $("#HSupID").val(result.data.HSupID);
                                        //$("#HSupName").val(result.data.HSupName);
                                        //$("#HSupID").val(result.data.HSupID);
                                        //$("#HDeptName").val(result.data.HDept);
                                        //$("#HDeptID").val(result.data.HDeptID);
                                        if (result.data.hDeptIDField != 0) {
                                            $("#HDeptID").val(result.data.hDeptIDField);
                                            $("#HDeptName").val(result.data.hDeptNameField);
                                        }
                                        $("#HSourceBillNo").val(result.data.hSourceBillNoField);
                                        $("#HBillType").val(result.data.hSourceBillTypeField)
                                        HSourceFlag = true;
@@ -1246,11 +1257,20 @@
                                            layui.form.render('select');
                                            $("#HBillType").attr("readonly", "readonly");
                                        }
                                        if (result.data.hSourceBillTypeField == "3710") {
                                        else if (result.data.hSourceBillTypeField == "3710") {
                                            $("#HBillType").empty();
                                            $("#HBillType").val("3710");
                                            var optionHtml = '';
                                            optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '生产订单' + "</option>";
                                            $("#HBillType").append(optionHtml);
                                            layui.form.render('select');
                                            $("#HBillType").attr("readonly", "readonly");
                                        }
                                        else if (result.data.hSourceBillTypeField == "3714") {
                                            $("#HBillType").empty();
                                            $("#HBillType").val("3714");
                                            var optionHtml = '';
                                            optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '工序汇报单' + "</option>";
                                            $("#HBillType").append(optionHtml);
                                            layui.form.render('select');
                                            $("#HBillType").attr("readonly", "readonly");
@@ -1404,6 +1424,7 @@
                var HSourceBillNo = $('#HSourceBillNo').val()
                var sInterID = $("#HInterID").val()
                var sBillNo = $("#HBillNo").val()
                var sBillType = '1202'
                var HSourceBillType = $("#HBillType").val()
                if (HSourceBillNo == "" || sInterID <= 0) {
                    layer.msg("源单号为空，或者内码不存在！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
@@ -1411,15 +1432,21 @@
                }
                //
                $.ajax({ 
                    url: GetWEBURL() + "/ProductIn/set_SavePonderationBillMain_Temp_Source_Fast_Json",
                    url: GetWEBURL() + "/WEBSController/Get_SourceBarCode_ProductIn_Json",
                    //url: GetWEBURL() + "/ProductIn/set_SavePonderationBillMain_Temp_Source_Fast_Json",    //旧
                    type: "GET",
                    data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
                    data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": sBillType, "HSourceBillNo": HSourceBillNo, "HSourceBillType": HSourceBillType, "HMaker": sessionStorage["HUserName"], "HStockOrgID": sessionStorage["OrganizationID"] },
                    //data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },    //旧
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            if (result.data[0].HDeptID != 0) {
                                $("#HDeptID").val(result.data[0].HDeptID);
                                $("#HDeptName").val(result.data[0].HDeptName);
                            if (result.data.hDeptIDField != 0) {
                                $("#HDeptID").val(result.data.hDeptIDField);
                                $("#HDeptName").val(result.data.hDeptNameField);
                            }
                            //if (result.data[0].HDeptID != 0) {
                            //    $("#HDeptID").val(result.data[0].HDeptID);
                            //    $("#HDeptName").val(result.data[0].HDeptName);
                            //}
                            playSound1();
                            HSourceFlag = true;
                            layer.load(3)