1

yangle

2023-03-22 cac7dffbf8189bd6f316339c032cbb9519eb7c6f

1

 WebAPI/Controllers/LMESController.cs

@@ -472,6 +472,48 @@
        }

        /// <summary>
        /// 工序流转卡的末道工序
        /// </summary>
        /// <param name="sBillBarCode"></param>
        /// <returns></returns>
        [Route("LEMS/TxtHBarCode_KeyDown_Last")]
        [HttpGet]
        public object TxtHBarCode_KeyDown_Last(string sBillBarCode)
        {
            DataSet ds;
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                if (sBillBarCode == null || sBillBarCode.Equals(""))
                {
                    return CustomError("未输入条形码！");
                }
                else
                {
                    //拆分条形码
                    string[] NewBarCode;
                    if (sBillBarCode.CompareTo("#") > 0)
                    {
                        NewBarCode = sBillBarCode.Split(Convert.ToChar("#"));
                        sBillBarCode = NewBarCode[0];
                    }
                    string sBillNo = sBillBarCode;
                    ds = oCN.RunProcReturn("select top 1 * from h_v_Sc_ProcessExchangeBillList  where 单据号= '" + sBillNo + "' and 末道工序='是' ", "h_v_Sc_ProcessExchangeBillList");
                    if (ds == null || ds.Tables[0].Rows.Count == 0)
                    {
                        return CustomError("不存在此流转卡号！");
                    }
                }

            }
            catch (Exception e)
            {
                ds = null;
            }
            return CustomCorrect(ds);
        }

        /// <summary>
        /// 流水号回车方法(进站接收单、出站汇报单)
        ///参数：string sql。
        ///返回值：object。

 WebAPI/Controllers/ReportController.cs

@@ -273,7 +273,7 @@
                    FentityModel.Add("FMoEntrySeq", dr1["FMOENTRYSEQ"].ToString());//生产订单行号
                    FentityModel.Add("FMoId", dr1["HICMOInterID"].ToString());//生产订单内码
                    FentityModel.Add("FFinishQty", item["接收数量"].ToString());//完成数量1
                    FentityModel.Add("FQuaQty", item["合格数量"].ToString());//合格数量1FFailQty
                    //FentityModel.Add("FQuaQty", item["合格数量"].ToString());//合格数量1FFailQty
                    FentityModel.Add("FFailQty", item["不良数量"].ToString());//不合格数量
                    FentityModel.Add("FStockInOrgId ", new JObject() { ["Fnumber"] = OrganizationNUM });// 入库组织 
                    FentityModel.Add("FStockId", new JObject() { ["Fnumber"] = dr1["FStockNUM"].ToString() }); // 仓库 
@@ -281,10 +281,12 @@
                    FentityModel.Add("FMOENTRYID", dr1["FMOENTRYID"].ToString());//  
                    FentityModel.Add("FOwnerTypeId", dr1["FOWNERTYPEID"].ToString()); //货主类型：FOwnerTypeId(必填项)
                    FentityModel.Add("FOwnerId", new JObject() { ["Fnumber"] = dr1["FOwnerNumber"].ToString() }); //货主：FOwnerId(必填项)
                    FentityModel.Add("FBomId", new JObject() { ["F    number"] = dr1["FBOMNUM"].ToString() }); //BOM版本：FBomId(必填项)
                    FentityModel.Add("FBomId", new JObject() { ["Fnumber"] = dr1["FBOMNUM"].ToString() }); //BOM版本：FBomId(必填项)
                    FentityModel.Add("FCostRate", dr1["FCostRate"].ToString());// 成本权重
                    FentityModel.Add("FISBACKFLUSH", dr1["FISBACKFLUSH"].ToString() == "1" ? true : false);// 倒冲领料
                    FentityModel.Add("FCHECKPRODUCT", dr1["HCHECKPRODUCT"].ToString() == "1" ? true : false);// 产品检验
                    FentityModel.Add("FMOMAINENTRYID", dr1["FMOENTRYID"].ToString());//
                    //FentityModel.Add("FSRCENTRYSEQ", dr1["HSEQ"].ToString());//源单行号
                    FentityModel.Add("FLot", new JObject() { ["FNumber"] = dr1["FBATCHNO"].ToString() }); //批号
                    //FentityModel.Add("F_RCZU_LZKH", dr1["工序流转卡号"].ToString());//  工序流转卡 
                    JArray Fentity2 = new JArray();