生产入库（源单：生产订单、生产汇报单），生产汇报单（源单：生产订单）自定义字段写入修改

yxj

2021-08-19 cc7b48fc5e4082bb5acc774b7e4975e9bdbd4412

生产入库（源单：生产订单、生产汇报单），生产汇报单（源单：生产订单）自定义字段写入修改

 CLOUDWEB/WebService1.asmx.cs

@@ -4260,20 +4260,20 @@
        [WebMethod]
        public bool set_SaveICMOReportBill_CLD_New(Model.ClsSc_ICMOReportBillMain oMain, string sHSourceType, Pub_Class.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
        {
            ////上传前判断是否存在相同条码
            //SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
            //DataSet ds = oCn.RunProcReturn("exec h_p_WMS_UpLoadControl " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "','" + oMain.HBillType + "'", "h_p_WMS_UpLoadControl");
            //if (ds == null || ds.Tables[0].Rows.Count == 0)
            //{
            //}
            //else
            //{
            //    if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0][0]) == 1)
            //    {
            //        sErrMsg = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
            //        return false;
            //    }
            //}
            //上传前判断是否存在相同条码
            SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
            DataSet ds = oCn.RunProcReturn("exec h_p_WMS_UpLoadControl " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "','" + oMain.HBillType + "'", "h_p_WMS_UpLoadControl");
            if (ds == null || ds.Tables[0].Rows.Count == 0)
            {
            }
            else
            {
                if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0][0]) == 1)
                {
                    sErrMsg = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
                    return false;
                }
            }

            //if (sHSourceType == "3710")   //源单：生产订单
            //{
@@ -17499,7 +17499,9 @@
                                    {
                                        sJson_StockPlace = Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FStockLocId"]) + "\"}},";
                                    }
                                    sJson_Custom = "  \"F_QOUL_TEXT\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["F_QOUL_TEXT"]) + "\",  ";  //销售订单号
                                    sJson_Custom = "\"F_QOUL_TEXT1\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["F_QOUL_TEXT"]) + "\"," +          //销售订单号
                                                    "\"F_QOUL_TEXT\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["F_QOUL_TEXT"]) + "\"," +           //销售订单号
                                                    "\"F_QOUL_ASSISTANT\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["F_QOUL_ASSISTANT"]) + "\"},";   //产品等级
                                }
                                else
                                {
@@ -18513,18 +18515,18 @@
        {
            //上传前判断是否存在相同条码
            SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
            //DataSet ds = oCn.RunProcReturn("exec h_p_WMS_UpLoadControl " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "','" + oMain.HBillType + "'", "h_p_WMS_UpLoadControl");
            //if (ds == null || ds.Tables[0].Rows.Count == 0)
            //{
            //}
            //else
            //{
            //    if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0][0]) == 1)
            //    {
            //        sErrMsg = "单据号：" + oMain.HBillNo + "，单据ID：" + oMain.HInterID + "；" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
            //        return false;
            //    }
            //}
            DataSet ds = oCn.RunProcReturn("exec h_p_WMS_UpLoadControl " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "','" + oMain.HBillType + "'", "h_p_WMS_UpLoadControl");
            if (ds == null || ds.Tables[0].Rows.Count == 0)
            {
            }
            else
            {
                if (DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0][0]) == 1)
                {
                    sErrMsg = "单据号：" + oMain.HBillNo + "，单据ID：" + oMain.HInterID + "；" + DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HRemark"]);
                    return false;
                }
            }

            if (sHSourceType == "3710")   //生产订单
            {
@@ -18666,6 +18668,7 @@
                        }
                        string sJson_BatchNo = "";
                        string sJson_StockPlace = "";
                        string sJson_EntryCustom = "";
                        if (Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["HISBATCHMANAGE"]) == "1") //是否启用批次管理
                        {
                            sJson_BatchNo = "  \"FLOT\": {\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FLOT"]) + "\"},    \"FLOT_TEXT\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FLOT"]) + "\"  , ";
@@ -18682,6 +18685,12 @@
                        else
                        {
                            sJson_StockPlace = Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FStockLocId"]) + "\"}},";
                        }
                        if (oSystemParameterMain.WMS_CampanyName == "韩电") //系统参数  客户定制化名称     空白为通用
                        {
                            sJson_EntryCustom = "\"F_QOUL_TEXT1\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["F_QOUL_TEXT1"]) + "\"," +          //销售订单号
                                                "\"F_QOUL_TEXT\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["F_QOUL_TEXT1"]) + "\"," +           //销售订单号
                                                "\"F_QOUL_ASSISTANT\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["F_QOUL_ASSISTANT"]) + "\"},";   //产品等级
                        }
                        //
                        sJson_Entry = sJson_Entry + " {" +
@@ -18741,6 +18750,7 @@
                        " \"FREQBILLID\":" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FREQBILLID"]) + "," +
                        " \"FREQENTRYSEQ\":" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FREQENTRYSEQ"]) + "," +
                        " \"FREQENTRYID\":" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["FREQENTRYID"]) + "," +
                        sJson_EntryCustom +

                        //\"FSerialSubEntity\":[{\"FDetailID\":\"0\",
                        //\"FSerialNo\":\"\",
@@ -18946,7 +18956,9 @@
                        }
                        if (oSystemParameterMain.WMS_CampanyName == "韩电") //系统参数  客户定制化名称     空白为通用
                        {
                            sJson_EntryCustom = "\"F_QOUL_TEXT1\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["F_QOUL_TEXT1"]) + "\",";   //销售订单号
                            sJson_EntryCustom = "\"F_QOUL_TEXT1\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["F_QOUL_TEXT1"]) + "\"," +          //销售订单号
                                                "\"F_QOUL_TEXT\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["F_QOUL_TEXT1"]) + "\"," +           //销售订单号
                                                "\"F_QOUL_ASSISTANT\":{\"FNumber\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[1].Rows[i]["F_QOUL_ASSISTANT"]) + "\"},";   //产品等级
                        }
                        //
                        sJson_Entry = sJson_Entry + " {" +
@@ -19065,7 +19077,7 @@
                        new object[] { "PRD_INSTOCK", sJson }); //调用保存方式

                        ////生成单据后更新自定义字段
                        oCn.RunProc("exec h_p_Sc_UpDateSelfFildProductIn '" + oMain.HBillNo + "'");
                        //oCn.RunProc("exec h_p_Sc_UpDateSelfFildProductIn '" + oMain.HBillNo + "'");

                        if (oSystemParameterMain.Kf_ProductInBill_AutoCheck == "Y") //系统参数  自动审核 
                        {