zzr99
2021-08-20 224715c790bb0c8c95426585b2b4e5c21b9dc9f4
nothing
22个文件已添加
10个文件已修改
867 ■■■■ 已修改文件
DAL/基础资料/InterFace基础资料/ClsIF_Property_View.cs 73 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/obj/Release/DBUtility.FrmSelectDate.resources 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/obj/Release/DBUtility.Xt_BillCheckFlowStatusNow.resources 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/obj/Release/DBUtility.Xt_BillType.resources 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/obj/Release/DBUtility.Xt_ProcessWait.resources 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/obj/Release/DBUtility.Xt_Wait.resources 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/obj/Release/DBUtility.csprojAssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/obj/Release/DBUtility.dll 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/obj/Release/DBUtility.frmBillQueryCondition_New.resources 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/obj/Release/DBUtility.frm_B_BillQueryCondition_New.resources 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/obj/Release/DBUtility.pdb 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/obj/Release/ResolveAssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
DBUtility/obj/Release/build.force 补丁 | 查看 | 原始文档 | blame | 历史
LMES/bin/x86/HXERP.ini 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WarM/条码打印/Gy_BarCodeBill.cs 61 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_GroupController.cs 70 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_ProcessController.cs 175 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_StockPlaceController.cs 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs 68 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/CJGL/Cj_StationInBillController.cs 136 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Models/基础资料/Gy_Process.cs 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user 150 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebAPI.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebAPI.csproj.user 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/»ù´¡×ÊÁÏ/InterFace»ù´¡×ÊÁÏ/ClsIF_Property_View.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Text;
using System.Data;
using DBUtility;
namespace DAL
{
@@ -17,8 +18,10 @@
        public ClsIF_Property_View()
        {
            base.MvarReportTitle = "辅助属性设置";
            base.MvarItemKey = "h_v_IF_Property";
            base.SQLName = "Select HItemID,HNumber è¾…助属性代码,HName è¾…助属性 from h_v_IF_Property where HStopflag=0  ";
            base.MvarItemKey = "h_v_IF_PropertyByMaterID";
            base.SQLName = "Select HItemID,HNumber è¾…助属性代码,HName è¾…助属性 from h_v_IF_PropertyByMaterID ";
            base.SQLWhere = " where HStopflag=0 ";
            base.SQLOrder = " ";
            //下拉SQL
            base.SQLNameForDown = " Select top 30 HItemID,HNumber è¾…助属性代码,HName è¾…助属性 from h_v_IF_Property ";
            base.SQLOrderForDown = "  Order by HNumber ";
@@ -94,5 +97,71 @@
                throw (e);
            }
        }
        /// <summary>
        /// åŸºç¡€èµ„料帮助-全部型
        /// </summary>
        /// <returns></returns>
        public override bool RefreshView(string sLike)
        {
            try
            {//
                Pub_Control.frmHlpInfo_View ofrm = new Pub_Control.frmHlpInfo_View();
                //
                string sSQL = SQLName + SQLWhere + sLike + SQLOrder;
                //编辑ofrm
                ofrm.sTitle = MvarReportTitle;
                ofrm.sBill = MvarItemKey;
                ofrm.txtFindInfo.Text = WherePart;
                //
                DataSet Ds;
                Pub_Class.ClsSqlHelper oCn = new Pub_Class.ClsSqlHelper();
                Ds = oCn.RunProcReturn(sSQL, MvarItemKey);
                if (Ds == null || Ds.Tables[0].Rows.Count == 0)
                {
                    return false;
                }
                //绑定
                ofrm.grdShow.DataSource = Ds.Tables[0].DefaultView;
                Ds.Dispose();
                Ds = null;
                ofrm.grdShow.SuspendLayout();
                ofrm.grdShow.Columns[0].Visible = false;
                ofrm.ShowDialog();
                //得到对应列
                int HItemIDCol = 0;
                int HNumberCol = 1;
                int HNameCol = 2;
                //
                if (ofrm.OKTag == Pub_Class.ClsPub.Enum_OKTag.OKTag_OK)
                {
                    if (ofrm.grdShow.CurrentRow == null)
                    {
                        return false;
                    }
                    oModel = new ClsGy_Base_Model();
                    oModel.HItemID = Pub_Class.ClsPub.isLong(ofrm.grdShow.Rows[ofrm.grdShow.CurrentRow.Index].Cells[0].Value);
                    oModel.HNumber = Pub_Class.ClsPub.isStrNull(ofrm.grdShow.Rows[ofrm.grdShow.CurrentRow.Index].Cells[1].Value);
                    oModel.HName = Pub_Class.ClsPub.isStrNull(ofrm.grdShow.Rows[ofrm.grdShow.CurrentRow.Index].Cells[2].Value);
                }
                else
                {
                    return false;
                }
                //
                ofrm.Dispose();
                ofrm = null;
                //
                return true;
            }
            catch (Exception e)
            {
                throw (e);
            }
        }
    }
}
DBUtility/obj/Release/.NETFramework,Version=v4.0.AssemblyAttributes.cs
New file
@@ -0,0 +1,4 @@
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.0", FrameworkDisplayName = ".NET Framework 4")]
DBUtility/obj/Release/DBUtility.FrmSelectDate.resources
Binary files differ
DBUtility/obj/Release/DBUtility.Gy_UserSelect.resources
Binary files differ
DBUtility/obj/Release/DBUtility.Xt_BillCheckFlowStatusNow.resources
Binary files differ
DBUtility/obj/Release/DBUtility.Xt_BillType.resources
Binary files differ
DBUtility/obj/Release/DBUtility.Xt_CheckFlow.resources
Binary files differ
DBUtility/obj/Release/DBUtility.Xt_CheckFlowList.resources
Binary files differ
DBUtility/obj/Release/DBUtility.Xt_CheckItem.resources
Binary files differ
DBUtility/obj/Release/DBUtility.Xt_CheckUserRight.resources
Binary files differ
DBUtility/obj/Release/DBUtility.Xt_ProcessWait.resources
Binary files differ
DBUtility/obj/Release/DBUtility.Xt_Wait.resources
Binary files differ
DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
Binary files differ
DBUtility/obj/Release/DBUtility.csproj.ResolveComReference.cache
Binary files differ
DBUtility/obj/Release/DBUtility.csprojAssemblyReference.cache
Binary files differ
DBUtility/obj/Release/DBUtility.dll
Binary files differ
DBUtility/obj/Release/DBUtility.frmBillQueryCondition_New.resources
Binary files differ
DBUtility/obj/Release/DBUtility.frm_B_BillQueryCondition_New.resources
Binary files differ
DBUtility/obj/Release/DBUtility.pdb
Binary files differ
DBUtility/obj/Release/ResolveAssemblyReference.cache
Binary files differ
DBUtility/obj/Release/build.force
LMES/bin/x86/HXERP.ini
New file
@@ -0,0 +1,37 @@
[po]
Server=47.96.97.237,15127
[Erp]
Server=47.96.97.237,15127
DataBase=HX_LMESsys
DataBaseNumber=001-智云LMES管理系统
UserName=HX_USER
PassWord=lc@841022
UserPsd=
Remember=
[K3Erp]
Server=47.96.97.237,15127
DataBase=
UserName=HX_USER
PassWord=lc@841022
[K32Erp]
Server=47.96.97.237,15127
DataBase=HX_LMESsys
UserName=HX_USER
PassWord=lc@841022
[SRM]
Server=.\sql2008
DataBase=hx_lims_SRM
UserName=HX_USER
PassWord=lc@841022
[UserInfo]
UserName=admin,景焕章,生管员,条码,测试用户
UserPsd=
Remember=1
HOrgName=手机事业部
[CLOUDINFO]
sCLOUDUrl=ddddd
sCLOUDAcc=4455xddd
sCLOUDUseName=顾问1
sCLOUDPsd=123456
WarM/ÌõÂë´òÓ¡/Gy_BarCodeBill.cs
@@ -156,6 +156,7 @@
        public Int64 HInterID = 0;      //内码
        public Int64 HOrgID = -1;
        public string HOrgNumber = "";
        public string ERPMode = ""; //ERP模式(WISE、CLOUD)
        public string CampanyName = ""; //客户定制化名称
        public string SourceQtyCtl = ""; //超源单数量控制
                                         //-------------------------------------------------------------------------
@@ -373,6 +374,7 @@
            }
            else
            {
                ERPMode = oSystemParameter.omodel.WMS_WMSStockCtl_ERPMode;
                CampanyName = oSystemParameter.omodel.WMS_CampanyName;
                SourceQtyCtl = oSystemParameter.omodel.BarCode_SourceQtyCtl;
            }
@@ -975,6 +977,7 @@
            grdSub.RowCount = 0;
            grdMain.ColumnCount = 60;                       //总列数
            DBUtility.Xt_BaseBillFun.initGridFst(grdMain, this.Name);
            grdMain.Columns[HSnoCol].HeaderText = "序号";
            grdMain.Columns[HMainIDCol].HeaderText = "源单主ID";
            grdMain.Columns[HSubIDCol].HeaderText = "源单子ID";
            grdMain.Columns[HBillNoCol].HeaderText = "源单单号";
@@ -1027,7 +1030,6 @@
            grdMain.Columns[HInnerBillNoCol].HeaderText = "内部采购订单号";
            grdMain.Columns[HMakerCol].HeaderText = "制单人";
            ////
            grdMain.Columns[HSnoCol].HeaderText = "序号";
            //格式化 
            grdMain.Columns[HTagCol].Visible = false;                           //隐藏列
            grdMain.Columns[HMainIDCol].Visible = false;
@@ -1037,8 +1039,8 @@
            grdMain.Columns[HModelCol].Visible = false;
            //grdMain.Columns[HBatchNoCol].Visible = false;
            grdMain.Columns[HAuxPropIDCol].Visible = false;
            grdMain.Columns[HAuxPropNumberCol].Visible = false;
            grdMain.Columns[HAuxPropNameCol].Visible = false;
            //grdMain.Columns[HAuxPropNumberCol].Visible = false;
            //grdMain.Columns[HAuxPropNameCol].Visible = false;
            grdMain.Columns[HUnitIDCol].Visible = false;
            grdMain.Columns[HinitQtyCol].Visible = false;
            grdMain.Columns[HSupIDCol].Visible = false;
@@ -1153,8 +1155,8 @@
            grdSub.Columns[HMaterID2Col].Visible = false;
            grdSub.Columns[HModel2Col].Visible = false;
            grdSub.Columns[HAuxPropID2Col].Visible = false;
            grdSub.Columns[HAuxPropNumber2Col].Visible = false;
            grdSub.Columns[HAuxPropName2Col].Visible = false;
            //grdSub.Columns[HAuxPropNumber2Col].Visible = false;
            //grdSub.Columns[HAuxPropName2Col].Visible = false;
            grdSub.Columns[HUnitID2Col].Visible = false;
            grdSub.Columns[HPrintCol].Visible = false;
            grdSub.Columns[HSourceInterID2Col].Visible = false;
@@ -1336,6 +1338,7 @@
            }
            DAL.ClsIF_Material_View oMater = new DAL.ClsIF_Material_View();//物料
            DAL.ClsIF_Unit_View oUnit = new DAL.ClsIF_Unit_View();//计量单位
            DAL.ClsIF_Property_View oProperty = new DAL.ClsIF_Property_View();//辅助属性
            if (!grdStatus)
            {
                return;
@@ -1368,6 +1371,9 @@
                                        grdMain.Rows[sRow].Cells[HMinQtyCol].Value = oMater.omodel.HQtyMin;
                                        grdMain.Rows[sRow].Cells[HDateCol].Value = dtpHDate.Value.ToShortDateString();
                                        grdMain.Rows[sRow].Cells[HShowDateCol].Value = dtpHDate.Value.ToShortDateString();
                                        grdMain.Rows[sRow].Cells[HAuxPropIDCol].Value = 0;
                                        grdMain.Rows[sRow].Cells[HAuxPropNumberCol].Value = "";
                                        grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = "";
                                        if (oUnit.GetInfoByID(oMater.omodel.HUnitID))
                                        {
                                            grdMain.Rows[sRow].Cells[HUnitIDCol].Value = oUnit.omodel.HItemID.ToString();
@@ -1392,6 +1398,9 @@
                                        grdMain.Rows[sRow].Cells[HUnitIDCol].Value = 0;
                                        grdMain.Rows[sRow].Cells[HUnitNumberCol].Value = "";
                                        grdMain.Rows[sRow].Cells[HUnitNameCol].Value = "";
                                        grdMain.Rows[sRow].Cells[HAuxPropIDCol].Value = 0;
                                        grdMain.Rows[sRow].Cells[HAuxPropNumberCol].Value = "";
                                        grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = "";
                                    }
                                }
                                else
@@ -1402,6 +1411,11 @@
                                    grdMain.Rows[sRow].Cells[HMaterModelCol].Value = "";
                                    grdMain.Rows[sRow].Cells[HMinQtyCol].Value = 0;
                                    grdMain.Rows[sRow].Cells[HUnitIDCol].Value = 0;
                                    grdMain.Rows[sRow].Cells[HUnitNumberCol].Value = "";
                                    grdMain.Rows[sRow].Cells[HUnitNameCol].Value = "";
                                    grdMain.Rows[sRow].Cells[HAuxPropIDCol].Value = 0;
                                    grdMain.Rows[sRow].Cells[HAuxPropNumberCol].Value = "";
                                    grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = "";
                                }
                                break;
@@ -1435,6 +1449,31 @@
                            case HDateCol:
                                BLL.ClsPub_BLL.Sub_SelectDate(grdMain, sRow, HDateCol);
                                oEdit.Text = DBUtility.ClsPub.isStrNull(grdMain.Rows[sRow].Cells[HDateCol].Value);
                                break;
                            case HAuxPropNumberCol:
                                oProperty.WherePart = "";
                                if (ERPMode == "CLOUD")
                                {
                                    sWhere = " and HMaterNumber = '" + DBUtility.ClsPub.isStrNull(grdMain.Rows[grdMain.CurrentCell.RowIndex].Cells[HMaterNumberCol].Value) + "'";
                                }
                                else
                                {
                                    sWhere = "";
                                }
                                if (oProperty.RefreshView(sWhere))
                                {
                                    grdMain.Rows[sRow].Cells[HAuxPropIDCol].Value = oProperty.oModel.HItemID.ToString();
                                    grdMain.Rows[sRow].Cells[HAuxPropNumberCol].Value = oProperty.oModel.HNumber;
                                    grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = oProperty.oModel.HName;
                                    oEdit.Text = oProperty.oModel.HNumber;
                                }
                                else
                                {
                                    grdMain.Rows[sRow].Cells[HAuxPropIDCol].Value = 0;
                                    grdMain.Rows[sRow].Cells[HAuxPropNumberCol].Value = "";
                                    grdMain.Rows[sRow].Cells[HAuxPropNameCol].Value = "";
                                }
                                break;
@@ -1793,13 +1832,14 @@
            //grdMain.Rows[i].Cells[HSourceNumberCol].Value = oTable.Rows[0]["生产线代码"].ToString();
            grdMain.Rows[i].Cells[HSourceNameCol].Value = oTable.Rows[0]["生产线"].ToString();
            grdMain.Rows[i].Cells[HEndDateCol].Value = oTable.Rows[0]["计划完工日期"].ToString();
            grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["最小包装数"].ToString();
            grdMain.Rows[i].Cells[HMinQtyCol].Value = oTable.Rows[0]["最小包装数"].ToString();
            //--
            //设置可编辑列
            string sAllowCol = HQtyCol.ToString() +
                                "," + HMinQtyCol.ToString() +
                                "," + HAuxPropNumberCol.ToString() +
                                "," + HBatchNoCol.ToString() +
                                "," + HRemarkCol.ToString() +
                                "," + HMinQtyCol.ToString();
                                "," + HRemarkCol.ToString();
            grdMain.Columns[HBillNoCol].ReadOnly = true;
            //设置合计列
            string sTotalCol = HQtyCol.ToString();
@@ -1870,9 +1910,10 @@
            //--
            //设置可编辑列
            string sAllowCol = HQtyCol.ToString() +
                                "," + HMinQtyCol.ToString() +
                                "," + HAuxPropNumberCol.ToString() +
                                "," + HBatchNoCol.ToString() +
                                "," + HRemarkCol.ToString() +
                                "," + HMinQtyCol.ToString();
                                "," + HRemarkCol.ToString();
            grdMain.Columns[HBillNoCol].ReadOnly = true;
            //设置合计列
            string sTotalCol = HQtyCol.ToString();
WebAPI/Controllers/BaseSet/Gy_GroupController.cs
@@ -20,7 +20,7 @@
        /// <summary>
        /// è¿”回工作中心列表
        /// è¿”回班组列表
        ///参数:string sql。
        ///返回值:object。
        /// </summary>
@@ -79,7 +79,7 @@
            try
            {
                ds = oCN.RunProcReturn("select * from h_v_GroupList where HitemID=" + HInterID, "h_v_GroupList");
                ds = oCN.RunProcReturn("select * from h_v_GroupListDetail where HitemID=" + HInterID, "h_v_GroupListDetail");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
@@ -220,22 +220,18 @@
        {
            try
            {
                DAL.ClsGy_Group_Ctl oDept = new DAL.ClsGy_Group_Ctl();
                var _value = oMain["oMain"].ToString();
                string msg1 = _value.ToString();
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg2 = sArray[0].ToString();
                string msg3 = sArray[1].ToString();
                string msg4 = sArray[2].ToString();
                string msg5 = sArray[3].ToString();
                //反序列化
                msg2 = "[" + msg2.ToString() + "]";
                List<Gy_Group> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Group>>(msg2);
                long HItemID = int.Parse(msg3);
                msg1 = "[" + msg1.ToString() + "]";
                DAL.ClsGy_Group_Ctl oDept = new DAL.ClsGy_Group_Ctl();
                List<Gy_Group> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Group>>(msg1);
                long HItemID = list[0].HItemID;
                string HNumber = list[0].HNumber;
                string HName = list[0].HName;
                string HShortNumber = list[0].HNumber;
                long HParentID = list[0].HParentID.ToString() == "" ? 0 : list[0].HParentID;
                long HParentID = list[0].HParentID;
                string HHelpCode = list[0].HHelpCode;
                string HRemark = list[0].HRemark;
                string HStopflag = list[0].HStopflag;
@@ -246,30 +242,30 @@
                var HProcID = list[0].HProcID;
                //判断权限
                if (!ClsPub.Security_Log(msg5, 1, true, msg4))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有找到该功能模块!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (!DBUtility.ClsPub.AllowNumber(HNumber))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "代码中不能出现连续‘.’并且首位末位不能为‘.’!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (oDept.HavSameNumber(HItemID, HNumber))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "代码重复!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "没有找到该功能模块!";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //if (!DBUtility.ClsPub.AllowNumber(HNumber))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "代码中不能出现连续‘.’并且首位末位不能为‘.’!";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //if (oDept.HavSameNumber(HItemID, HNumber))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "代码重复!";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //若MAINDI重复则重新获取
                oCN.BeginTran();
                //主表
@@ -288,7 +284,7 @@
                //修改子项目代码
                //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Group,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
                //将上级 ä¸ºéžæœ«çº§
                oCN.RunProc("Update Gy_Group set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                //oCN.RunProc("Update Gy_Group set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                //
                oCN.Commit();
                objJsonResult.code = "1";
WebAPI/Controllers/BaseSet/Gy_ProcessController.cs
@@ -17,7 +17,143 @@
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        DataSet ds;
        /// <summary>
        /// ä¿®æ”¹å•据-保存按钮
        ///参数:string sql。
        ///返回值:object。
        /// </summary>
        [Route("Gy_Process/EditBill")]
        [HttpPost]
        //原代码 ç”¨äºŽ æ›¿æ¢å­é¡¹ç›®
        public object EditBill([FromBody] JObject oMain)
        {
            try
            {
                var _value = oMain["oMain"].ToString();
                string msg1 = _value.ToString();
                //反序列化
                msg1 = "[" + msg1.ToString() + "]";
                DAL.ClsGy_Process_Ctl oDept = new DAL.ClsGy_Process_Ctl();
                List<Gy_Process> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Process>>(msg1);
                long HItemID = list[0].HItemID;
                string HNumber = list[0].HNumber;
                string HName = list[0].HName;
                string HShortNumber = list[0].HNumber;
                long HParentID = list[0].HParentID;
                string HHelpCode = list[0].HHelpCode;
                bool HTypeFlow = list[0].HTypeFlow;
                bool HTypeCount = list[0].HTypeCount;
                string HDeptNumber = "";
                long HLevel = ClsPub.GetLevel(list[0].HNumber.Trim());
                bool HEndFlag = false;
                long HProcessID_K3 = list[0].HProcessID_K3;
                string HBillSubType = list[0].HType;
                bool HAutoTrunFlag = list[0].HAutoTrunFlag;
                string HFixPrice = list[0].HFixPrice;
                string HOverFixPrice = list[0].HOverFixPrice;
                string HSNo = list[0].HSNo;
                string HBarCode = list[0].HBarCode;
                string HProcMulID = list[0].HProcMulID;
                string HProcCheckNote = list[0].HProcCheckNote;
                string HRemark = list[0].HRemark;
                bool HStopflag = list[0].HStopflag;
                string HUseFlag = list[0].HUseFlag;
                long HEmpQty = list[0].HEmpQty;
                string HBarCodeForBase = list[0].HBarCodeForBase;
                long HDeptID = list[0].HDeptID;
                long HProcID = list[0].HProcID;
                //判断权限
                //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "没有找到该功能模块!";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //if (!DBUtility.ClsPub.AllowNumber(HNumber))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "代码中不能出现连续‘.’并且首位末位不能为‘.’!";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //if (oDept.HavSameNumber(HItemID, HNumber))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "代码重复!";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //若MAINDI重复则重新获取
                //主表
                //oCN.RunProc("Update Gy_Process set " +
                //    " (HNumber,HName,HHelpCode,HShortNumber,HParentID" +
                //    ",HTypeFlow,HTypeCount,HDeptNumber,HSNo" +
                //    ",HLevel,HEndFlag,HStopflag,HRemark,HDeptID,HBarCodeForBase,HProcessID_K3,HBillSubType,HAutoTrunFlag" +
                //    ",HFixPrice,HOverFixPrice,HProcMulID,HProcCheckNote) " +
                //    " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
                //    "," + Convert.ToString(HTypeFlow ? 1 : 0) + "," + Convert.ToString(HTypeCount ? 1 : 0) + ",'" + HDeptNumber + "'," + HSNo.ToString() +
                //    "," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HDeptID +
                //    ",'" + HBarCode + "'," + HProcessID_K3 + ",'" + HBillSubType + "'," + Convert.ToString(HAutoTrunFlag ? 1 : 0) +
                //    "," + HFixPrice.ToString() + "," +HOverFixPrice.ToString() + "," + HProcMulID.ToString() + ",'" + HProcCheckNote.ToString() + "')", ref DBUtility.ClsPub.sExeReturnInfo);
                oCN.BeginTran();
                oCN.RunProc("Update Gy_Process set " +
                    " HNumber='" + HNumber + "'" +
                    ",HName='" + HName + "'" +
                    ",HHelpCode='" + HHelpCode + "'" +
                    ",HShortNumber='" + HShortNumber + "'" +
                    ",HParentID= " + HParentID +
                    ",HTypeFlow= '" + HTypeFlow + "'" +
                    ",HTypeCount= '" + HTypeCount + "'" +
                    ",HDeptNumber='" + HDeptNumber + "'" +
                    ",HSNo= " + HSNo +
                    ",HLevel= " + HLevel +
                    ",HEndFlag= '" + HEndFlag + "'" +
                    ",HStopflag= '" + HStopflag + "'" +
                    ",HRemark='" + HRemark + "'" +
                    ",HDeptID= " + HDeptID +
                    ",HBarCodeForBase='" + HBarCodeForBase + "'" +
                    ",HProcessID_K3= " + HProcessID_K3 +
                    ",HBillSubType='" + HBillSubType + "'" +
                    ",HAutoTrunFlag= '" + HAutoTrunFlag + "'" +
                    ",HFixPrice= " + HFixPrice +
                    ",HOverFixPrice= " + HOverFixPrice +
                    ",HProcMulID= " + HProcMulID +
                    ",HProcCheckNote='" + HProcCheckNote + "'" +
                    " Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                //修改上级为非末级代码
                oCN.RunProc("Update Gy_Process set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                //return true;
                //修改子项目代码
                //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Group,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
                //将上级 ä¸ºéžæœ«çº§
                //oCN.RunProc("Update Gy_Group set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                //
                oCN.Commit();
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "修改单据成功!";
                //objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.Message;
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        /// <summary>
        /// è¿”回工序列表
        ///参数:string sql。
@@ -67,6 +203,45 @@
        }
        /// <summary>
        /// æ ¹æ®åŸºç¡€èµ„æ–™ID æŸ¥æ‰¾è®°å½•
        ///参数:string sql。
        ///返回值:object。
        /// </summary>
        [Route("Gy_Process/cx")]
        [HttpGet]
        public object cx(long HInterID)
        {
            try
            {
                ds = oCN.RunProcReturn("select * from h_v_Gy_ProcessListDetail where HitemID=" + HInterID, "h_v_Gy_ProcessListDetail");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "false!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess!";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        //
    }
WebAPI/Controllers/BaseSet/Gy_StockPlaceController.cs
@@ -17,56 +17,6 @@
        SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
        DataSet ds;
        /// <summary>
        /// è¿”回部门列表
        ///参数:string sql。
        ///返回值:object。
        /// </summary>
        [Route("Gy_Department/list")]
        [HttpGet]
        public object list(string sWhere)
        {
            try
            {
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_IF_DepartmentList " + sWhere, "h_v_IF_DepartmentList");
                }
                else
                {
                    string sql1 = "select * from h_v_IF_DepartmentList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    ds = oCN.RunProcReturn(sql, "h_v_IF_DepartmentList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "false!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess!";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        /// <summary>
        /// æ ¹æ®åŸºç¡€èµ„æ–™ID æŸ¥æ‰¾è®°å½•
        ///参数:string sql。
WebAPI/Controllers/BaseSet/Gy_WorkCenterController.cs
@@ -222,22 +222,18 @@
        {
            try
            {
                DAL.ClsGy_WorkCenter_Ctl oDept = new DAL.ClsGy_WorkCenter_Ctl();
                var _value = oMain["oMain"].ToString();
                string msg1 = _value.ToString();
                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                string msg2 = sArray[0].ToString();
                string msg3 = sArray[1].ToString();
                string msg4 = sArray[2].ToString();
                string msg5 = sArray[3].ToString();
                //反序列化
                msg2 = "[" + msg2.ToString() + "]";
                List<Gy_WorkCenter> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_WorkCenter>>(msg2);
                long HItemID = int.Parse(msg3);
                msg1 = "[" + msg1.ToString() + "]";
                DAL.ClsGy_WorkCenter_Ctl oDept = new DAL.ClsGy_WorkCenter_Ctl();
                List<Gy_WorkCenter> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_WorkCenter>>(msg1);
                long HItemID = list[0].HItemID;
                string HNumber = list[0].HNumber;
                string HName = list[0].HName;
                string HShortNumber = list[0].HNumber;
                long HParentID = list[0].HParentID.ToString() == "" ? 0 : list[0].HParentID;
                long HParentID = list[0].HParentID;
                string HHelpCode = list[0].HHelpCode;
                string HRemark = list[0].HRemark;
                string HStopflag = list[0].HStopflag;
@@ -249,30 +245,30 @@
                var HWorkTimes = list[0].HWorkTimes;
                //判断权限
                if (!ClsPub.Security_Log(msg5, 1, true, msg4))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "没有找到该功能模块!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (!DBUtility.ClsPub.AllowNumber(HNumber))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "代码中不能出现连续‘.’并且首位末位不能为‘.’!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (oDept.HavSameNumber(HItemID, HNumber))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "代码重复!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "没有找到该功能模块!";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //if (!DBUtility.ClsPub.AllowNumber(HNumber))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "代码中不能出现连续‘.’并且首位末位不能为‘.’!";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //if (oDept.HavSameNumber(HItemID, HNumber))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "代码重复!";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //若MAINDI重复则重新获取
                oCN.BeginTran();
                //主表
@@ -311,7 +307,7 @@
            }
        }
        /// <summary>
        /// ç»´ä¿®åˆ—表修改按钮方法
        /// å·¥ä½œä¸­å¿ƒåˆ—表修改按钮方法
        ///参数:string sql。
        ///返回值:object。
        /// </summary>
@@ -321,7 +317,7 @@
        {
            try
            {
                ds = oCN.RunProcReturn("select * from Gy_WorkCenter where HItemID=" + HInterID, "Gy_WorkCenter");
                ds = oCN.RunProcReturn("select a.*,b.HName HDeptName from Gy_WorkCenter a left join Gy_Department b on a.HDeptID = b.HItemID where a.HItemID=" + HInterID, "Gy_WorkCenter");
                objJsonResult.code = "1";
                objJsonResult.count = 1;
WebAPI/Controllers/CJGL/Cj_StationInBillController.cs
@@ -20,12 +20,7 @@
        DataSet ds;
        DataSet ds1;
        /// <summary>
        /// æ–°å¢žå•据-保存按钮
        ///参数:string sql。
        ///返回值:object。
        /// </summary>
        #region æ–°å¢žå•据-保存按钮
        [Route("Cj_StationInBill/AddBill")]
        [HttpPost]
        public object AddBill([FromBody] JObject oMain)
@@ -149,8 +144,6 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //若MAINDI重复则重新获取
                oCN.BeginTran();
@@ -235,10 +228,6 @@
                    return objJsonResult;
                }
                
                ds = oCN.RunProcReturn("exec h_p_MES_StationInBill_QtyCtrl " + HInterID + "", "h_p_MES_StationInBill_QtyCtrl");
                if (ds == null)
                {
@@ -306,12 +295,9 @@
            }
            return false;
        }
        #endregion
        /// <summary>
        /// å·¥åºè¿›ç«™æŽ¥æ”¶å•流水号回车获取工序信息
        ///参数:string sql。
        ///返回值:object。
        /// </summary>
        #region å·¥åºè¿›ç«™æŽ¥æ”¶å•流水号回车获取工序信息
        [Route("Cj_StationInBill/txtHProcNo_KeyDown")]
        [HttpGet]
        public object txtHProcNo_KeyDown(string sBillNo,string sProcNo)
@@ -354,12 +340,9 @@
                return objJsonResult;
            }
        }
        #endregion
        /// <summary>
        /// è¿”回委外工序接收单列表
        ///参数:string sql。
        ///返回值:object。
        /// </summary>
        #region è¿”回委外工序接收单列表
        [Route("Cj_StationInBill/get_Display")]
        [HttpGet]
        public object get_Display(string sWhere)
@@ -402,12 +385,53 @@
                return objJsonResult;
            }
        }
        #endregion
        /// <summary>
        /// ç¼–辑页面根据id获取工序进站接收单信息
        ///参数:string sql。
        ///返回值:object。
        /// </summary>
        #region ç¼–辑前判断
        [Route("Cj_StationInBill/set_ShowBillJudge")]
        [HttpGet]
        public object set_ShowBillJudge(string HBillNo)
        {
            try
            {
                ds = oCN.RunProcReturn("exec h_p_MES_StationInBill_DelCtrl  '" + HBillNo + "'", "h_p_MES_StationInBill_DelCtrl");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "判断关联失败!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else if(ds.Tables[0].Rows.Count > 0 && Pub_Class.ClsPub.isInt(ds.Tables[0].Rows[0][0]) == 2)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = Pub_Class.ClsPub.isStrNull(ds.Tables[0].Rows[0][1]);
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess!";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception!" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
        #region ç¼–辑页面根据id获取工序进站接收单信息
        [Route("Cj_StationInBill/GetStationInBill")]
        [HttpGet]
        public object GetStationOutBill(int HInterID)
@@ -441,8 +465,9 @@
                return objJsonResult;
            }
        }
        #endregion
        #region [审核]
        #region å®¡æ ¸
        [Route("Cj_StationInBill/set_CheckBill")]
        [HttpGet]
        public object set_CheckBill(int HInterID,string CurUserName)
@@ -459,19 +484,17 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                Int64 lngBillKey = 0;
                lngBillKey = HInterID;
                if (lngBillKey == 0)
                if (HInterID == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HInterID为0!";
                    objJsonResult.Message = "单据ID为0,不能审核!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                DAL.ClsSc_StationInBill oBill = new DAL.ClsSc_StationInBill();
                //查看是否已审核,关闭,作废
                if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
                if (oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
                {
                    if (oBill.omodel.HChecker.Trim() != "")
                    {
@@ -491,10 +514,10 @@
                    return objJsonResult;
                }
                //审核
                if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
                if (Cj_StationInBillCheckBill(HInterID,CurUserName, ref DBUtility.ClsPub.sExeReturnInfo))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "审核成功!";
                    objJsonResult.data = null;
                    return objJsonResult;
@@ -518,6 +541,47 @@
                return objJsonResult;
            }
        }
        //审核
        public bool Cj_StationInBillCheckBill(Int64 lngBillKey, string CurUserName, ref string sReturn)
        {
            try
            {
                string HChecker = CurUserName;
                string HCheckDate = DBUtility.ClsPub.GetServerDate(-1);
                oCN.BeginTran();
                ds = oCN.RunProcReturn("Select * from Sc_StationInBillMain Where HInterID=" + lngBillKey.ToString(), "Sc_StationInBillMain");
                if (ds.Tables[0].Rows.Count == 0)
                {
                    sReturn = "单据未找到!";
                    return false;
                }
                oCN.RunProc(" Update Sc_StationInBillMain set HChecker='" + HChecker + "',HCheckDate='" + HCheckDate + "' Where HInterID=" + lngBillKey.ToString());
                oCN.RunProc("exec h_p_Mes_ProcessExchangeRelationQty_Check_In " + lngBillKey.ToString() + ",1");
                //判断是否是 é¦–道工序
                DataSet ds1;
                ds1 = oCN.RunProcReturn("select HLastProc,HFstProc " +
                    " from Sc_ProcessExchangeBillMain a " +
                    " inner join Sc_ProcessExchangeBillSub b on a.HInterID=b.HInterID " +
                    " Where a.HInterID=(Select HProcExchInterID from Sc_StationInBillMain Where HInterID=55) " +
                    " and b.HEntryID=(Select HProcExchEntryID from Sc_StationInBillMain Where HInterID=55)", "Sc_ProcessExchangeBillMain");
                if (ds1 == null || ds1.Tables[0].Rows.Count == 0)
                {
                }
                else if (Pub_Class.ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HFstProc"]) == "是")
                {
                }
                sReturn = sReturn + " å®¡æ ¸åŠŸèƒ½ï¼";
                oCN.Commit();
                return true;
            }
            catch (Exception e)
            {
                sReturn = e.Message;
                oCN.RollBack();
                return false; ;
            }
        }
        #endregion
WebAPI/Models/»ù´¡×ÊÁÏ/Gy_Process.cs
New file
@@ -0,0 +1,40 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace WebAPI.Models
{
    public class Gy_Process
    {
        public long HItemID { get; set; }
        public string HNumber { get; set; }       // ä»£ç 
        public string HName { get; set; }         //
        public string HHelpCode { get; set; }      //助记码
        public string HShortNumber { get; set; }   //短代码
        public bool HEndFlag { get; set; }      //末级标志
        public bool HStopflag { get; set; }     //禁用标志
        public string HRemark { get; set; }       //备注
        public string HUseFlag { get; set; }      //使用标志
        public long HParentID { get; set; }      //父级ID
        public bool HTypeFlow { get; set; }
        public bool HTypeCount { get; set; }
        public string HDeptNumber { get; set; }
        public string HBarCode { get; set; }
        public string HLevel { get; set; }
        public long HProcessID_K3 { get; set; }
        public string HType { get; set; }
        public bool HAutoTrunFlag { get; set; }
        public string HFixPrice { get; set; }
        public string HOverFixPrice { get; set; }
        public string HSNo { get; set; }
        public string HProcMulID { get; set; }
        public string HProcCheckNote { get; set; }
        public long HDeptID { get; set; }
        public long HEmpQty { get; set; }
        public long HProcID { get; set; }
        public string HBarCodeForBase { get; set; }
    }
}
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -9,7 +9,7 @@
  </PropertyGroup>
  <ItemGroup>
    <File Include="apiapp.json">
      <publishTime>08/16/2021 17:23:16</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="bin/Antlr3.Runtime.dll">
      <publishTime>02/22/2013 08:43:40</publishTime>
@@ -18,31 +18,31 @@
      <publishTime>02/22/2013 08:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>08/20/2021 19:17:14</publishTime>
      <publishTime>08/20/2021 14:25:34</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>08/20/2021 19:17:14</publishTime>
      <publishTime>08/20/2021 14:25:34</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>08/20/2021 19:17:11</publishTime>
      <publishTime>08/20/2021 14:25:30</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>08/20/2021 19:17:11</publishTime>
      <publishTime>08/20/2021 14:25:30</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 14:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>08/20/2021 11:01:15</publishTime>
      <publishTime>08/20/2021 14:25:24</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>08/20/2021 11:01:15</publishTime>
      <publishTime>08/20/2021 14:25:24</publishTime>
    </File>
    <File Include="bin/Interop.gregn6Lib.dll">
      <publishTime>08/17/2021 09:09:33</publishTime>
      <publishTime>08/20/2021 14:25:31</publishTime>
    </File>
    <File Include="bin/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>08/16/2021 17:23:13</publishTime>
      <publishTime>09/20/2018 19:08:18</publishTime>
    </File>
    <File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
      <publishTime>09/20/2018 19:23:20</publishTime>
@@ -60,37 +60,37 @@
      <publishTime>07/25/2012 11:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>08/20/2021 11:01:15</publishTime>
      <publishTime>08/20/2021 14:25:25</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>08/20/2021 11:01:15</publishTime>
      <publishTime>08/20/2021 14:25:25</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="bin/Newtonsoft.Json.dll">
      <publishTime>08/03/2014 20:33:56</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>08/20/2021 10:44:25</publishTime>
      <publishTime>08/20/2021 14:25:20</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>08/20/2021 10:44:25</publishTime>
      <publishTime>08/20/2021 14:25:20</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>08/20/2021 10:44:25</publishTime>
      <publishTime>08/20/2021 14:25:22</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>08/20/2021 10:44:25</publishTime>
      <publishTime>08/20/2021 14:25:22</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>08/20/2021 10:44:25</publishTime>
      <publishTime>08/20/2021 14:25:23</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>08/20/2021 10:44:25</publishTime>
      <publishTime>08/20/2021 14:25:23</publishTime>
    </File>
    <File Include="bin/stdole.dll">
      <publishTime>08/15/2021 14:25:35</publishTime>
      <publishTime>01/13/2021 17:00:05</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/15/2015 17:57:08</publishTime>
@@ -156,7 +156,7 @@
      <publishTime>11/28/2018 13:01:00</publishTime>
    </File>
    <File Include="bin/System.Web.Http.WebHost.dll">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="bin/System.Web.Mvc.dll">
      <publishTime>01/28/2015 04:02:18</publishTime>
@@ -189,10 +189,10 @@
      <publishTime>11/24/2014 11:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>08/20/2021 19:16:51</publishTime>
      <publishTime>08/20/2021 14:25:39</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>08/20/2021 19:16:51</publishTime>
      <publishTime>08/20/2021 14:25:39</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/17/2013 17:03:52</publishTime>
@@ -204,166 +204,166 @@
      <publishTime>11/29/2018 13:26:30</publishTime>
    </File>
    <File Include="Content/bootstrap.css">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:27</publishTime>
    </File>
    <File Include="Content/bootstrap.min.css">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:27</publishTime>
    </File>
    <File Include="Content/Site.css">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:27</publishTime>
    </File>
    <File Include="DLL/BLL.dll">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="DLL/DAL.dll">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="DLL/DBUtility.dll">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="DLL/Model.dll">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="DLL/Newtonsoft.Json.Net35.dll">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="DLL/Pub_Class.dll">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="DLL/Pub_Control.dll">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="DLL/SQLHelper.dll">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.eot">
      <publishTime>08/16/2021 17:23:16</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.svg">
      <publishTime>08/16/2021 17:23:16</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.ttf">
      <publishTime>08/16/2021 17:23:16</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="fonts/glyphicons-halflings-regular.woff">
      <publishTime>08/16/2021 17:23:16</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Global.asax">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Index.html">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="packages.config">
      <publishTime>08/16/2021 17:23:16</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.js">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Views/Scripts/bootstrap.min.js">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.js">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.js">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Views/Scripts/jquery-1.10.2.min.map">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.js">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.min.js">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.js">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Views/Scripts/modernizr-2.6.2.js">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Views/Shared/Error.cshtml">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Views/Shared/_Layout.cshtml">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Views/web.config">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Views/_ViewStart.cshtml">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Department_Model.datasource">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Group_Model.datasource">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Source_Model.datasource">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
      <publishTime>08/16/2021 17:23:15</publishTime>
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Web References/WebS/Reference.map">
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>08/20/2021 11:01:21</publishTime>
      <publishTime>08/20/2021 14:25:53</publishTime>
    </File>
  </ItemGroup>
</Project>
WebAPI/WebAPI.csproj
@@ -461,6 +461,7 @@
    <Compile Include="Models\WWSendOutBillViewModel.cs" />
    <Compile Include="Models\WW_EntrustProcSendWorkViewModel.cs" />
    <Compile Include="Models\WW_EntrustWorkOrderViewModel.cs" />
    <Compile Include="Models\基础资料\Gy_Process.cs" />
    <Compile Include="Models\基础资料\Warehouse.cs" />
    <Compile Include="Properties\Resources.Designer.cs">
      <AutoGen>True</AutoGen>
WebAPI/WebAPI.csproj.user
@@ -7,7 +7,7 @@
    <WebStackScaffolding_IsReferencingScriptLibrariesSelected>True</WebStackScaffolding_IsReferencingScriptLibrariesSelected>
    <WebStackScaffolding_LayoutPageFile />
    <WebStackScaffolding_IsAsyncSelected>False</WebStackScaffolding_IsAsyncSelected>
    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\Git\houduan\WebAPI\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>false</UseIISExpress>
    <Use64BitIISExpress />