夏宝返修码格式调整；可打印备料单报表查询；生产汇报单审核同步到金蝶时添加生产日期字段；

yusijie

昨天 7b93639991a652a7d6e52ab6b390e786b12b663b

夏宝返修码格式调整；可打印备料单报表查询；生产汇报单审核同步到金蝶时添加生产日期字段；

 DAL/»ù´¡×ÊÁÏ/InterFace»ù´¡×ÊÁÏ/ClsIF_Material_View.cs

@@ -170,6 +170,7 @@
                omodel.HISKFPERIOD = DBUtility.ClsPub.isBool(DS.Tables[0].Rows[0]["HISKFPERIOD"]);
                omodel.HEXPPERIOD = Convert.ToInt64(DS.Tables[0].Rows[0]["HEXPPERIOD"]);
                omodel.HEXPUNIT = DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0]["HEXPUNIT"]);
                omodel.HSubjoin2 = DBUtility.ClsPub.isStrNull(DS.Tables[0].Rows[0]["HSubjoin2"]);
                return true;
 
            }

 Model/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/ClsGy_Material_Model.cs

@@ -34,7 +34,7 @@
        public Int64 HSPGroupID;//    int        --默认仓库组
        public Int64 HSPID;//        int        --默认仓位
        public string HSubjoin;// --附加属性
        public string HSubjoin2;// --附加属性
        public string HSubjoin2;// --附加属性  å¤å®ç”¨ï¼ˆæœºåž‹ç ï¼‰
        public string HColor;// --颜色
        public Int64 HErpclsID;//        int        --物料属性
        public string HPicNo;//        varchar        --图号
@@ -50,6 +50,5 @@
        public bool HISKFPERIOD;        //是否启用保质期
        public Int64 HEXPPERIOD;        //保质期
        public string HEXPUNIT;         //保质期单位

    }
}

 WarM/ÌõÂë´òÓ¡/Gy_BarCodeBill_Rework.cs

@@ -623,8 +623,10 @@
                        if (HBarCodeType == "唯一条码")
                        {
                            //条码前缀 = ç»„织代码 + ç‰©æ–™ä»£ç  + å¹´ + æœˆ + æ—¥
                            sTMNumber = HOrgNumber + sMaterID + sYear + sPeriod + sDay;
                            Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo '" + sTMNumber + "'", "h_p_WMS_GetMaxNo");    //获取最大流水号
                            //sTMNumber = HOrgNumber + sMaterID + sYear + sPeriod + sDay;
                            sTMNumber = sYear + sPeriod + sDay;

                            Ds = oCn.RunProcReturn("exec h_p_WMS_GetMaxNo_ReWorkBar '" + sTMNumber + "'", "h_p_WMS_GetMaxNo_ReWorkBar");    //获取最大流水号
                            LSH = ClsPub.isLong(Ds.Tables[0].Rows[0][0]);
                        }                     
                        else
@@ -670,8 +672,9 @@
                            {
                                Int32 HModelLen = grdMain.Rows[j].Cells[HMaterModelCol].Value.ToString().Length;
                                string HModelLeft = HModelLen >= 4 ? grdMain.Rows[j].Cells[HMaterModelCol].Value.ToString() : "";
                                //条码编号 = å·¥åŽ‚代码（1） + å¹´ + è½¦é—´ä»£ç ï¼ˆ060113） + æœˆ + åž‹å· + æ—¥ + æµæ°´å·
                                TM = 1 + sYear + 060113 + sPeriod + HModelLeft + sDay + LSH;
                                string HSubjoin2 = grdMain.Rows[j].Cells[HSubjoin2Col].Value.ToString();
                                //条码编号 = å·¥åŽ‚代码（1） + è½¦é—´ä»£ç ï¼ˆ060113）+ æœºåž‹å· + å¹´ + æœˆ + æ—¥ + æµæ°´å·
                                TM = "1" + 060113.ToString() + HSubjoin2 + sYear + sPeriod + sDay + LSH.ToString("D5");
                            }

                            HEntryID = j + 1;
@@ -910,6 +913,8 @@
            grdMain.Columns[HInnerBillNoCol].Visible = false;
            grdMain.Columns[HEndDateCol].Visible = false;
            grdMain.Columns[HBillNoCol].Visible = false;
            grdMain.Columns[HAuxPropNumberCol].Visible = false;
            grdMain.Columns[HAuxPropNameCol].Visible = false;

            //设置可编辑列
            string sAllowCol = HQtyCol.ToString() +
@@ -1050,6 +1055,7 @@
                                        grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = oMater.omodel.HAuxPropName;
                                        grdMain.Rows[sRow].Cells[HBatchManagerCol].Value = oMater.omodel.HBatchManager;
                                        grdMain.Rows[sRow].Cells[HISKFPERIODCol].Value = oMater.omodel.HISKFPERIOD;
                                        grdMain.Rows[sRow].Cells[HSubjoin2Col].Value = oMater.omodel.HSubjoin2;
                                        grdMain.Rows[sRow].Cells[HBarCodeTypeCol].Value = "唯一条码";
                                        //启用批次
                                        if (oMater.omodel.HBatchManager)

 WebAPI/Controllers/CJGL/Sc_ProcessExchangeBillController.cs

@@ -2443,5 +2443,52 @@
            }
        }
        #endregion

        #region å¯æ‰“印备料单报表（添康）

        [Route("Sc_ProcessExchangeBill/AllowedPrint")]
        [HttpGet]
        public object AllowedPrint(string sWhere, string user, string Organization, int page, int size)
        {
            try
            {
                List<object> columnNameList = new List<object>();

                sWhere = sWhere.Replace("'", "''");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("exec h_p_Sc_ProcessExchangeBillList_AllowedPrint " + page + "," + size + ",'" + Organization + "'," + "''", "h_p_Sc_ProcessExchangeBillList_AllowedPrint");                   
                }
                else
                {
                    ds = oCN.RunProcReturn("exec h_p_Sc_ProcessExchangeBillList_AllowedPrint " + page + "," + size + ",'" + Organization + "','" + sWhere + "'", "h_p_Sc_ProcessExchangeBillList_AllowedPrint");
                }

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = int.Parse(ds.Tables[1].Rows[0]["count"].ToString());
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

    }
}

 WebAPI/DLL/ClsSc_ICMOReportBill.cs

@@ -497,6 +497,7 @@
                        FentityModel.Add("FScrapQty", item["FScrapQty"].ToString());//报废数量
                        FentityModel.Add("FBASEFINISHQTY", item["FBASEFINISHQTY"].ToString());//基本单位完成数量
                        FentityModel.Add("FFINISHQTY", item["FFINISHQTY"].ToString());//完成数量
                        FentityModel.Add("FProduceDate", item["HPRODUCEDATE"].ToString());//生产日期                        
                        FentityModel.Add("FLot", new JObject() { ["FNumber"] = item["FLot"].ToString() });//批号
                                                                                                          //
                        if (oSystemParameter.omodel.WMS_CampanyName == "九菱") //系统参数  å®¢æˆ·å®šåˆ¶åŒ–名称     ç©ºç™½ä¸ºé€šç”¨