看板接口修改,工序编辑接口修改

yl

2022-08-22 facb807b19e232c44852a91b6b442285eddfb0f5

看板接口修改,工序编辑接口修改

 .vs/VueWebApi/v16/.suo

Binary files differ

 VueWebApi/Controllers/ProductionManagementController.cs

@@ -15,7 +15,7 @@
{
    [RoutePrefix(prefix: "api/ProductionManagement")]
    [ControllerGroup("生产管理", "在线接口")]
    [ChannelActionFilter]
    //[ChannelActionFilter]
    public class ProductionManagementController : ApiController
    {
        //定义全局信息返回变量
@@ -76,6 +76,7 @@
        [HttpPost]
        public HttpResponseMessage MarkSaveErpOrder([FromBody] JObject obj)
        {
            string erporderid = obj["erporderid"].ToString(); //订单id
            string erpordercode = obj["erpordercode"].ToString(); //订单编号
            string partcode = obj["partcode"].ToString(); //产品编码
            string wkshopcode = obj["wkshopcode"].ToString(); //车间编码
@@ -85,7 +86,7 @@
            string ordernum = obj["ordernum"].ToString(); //下单单数
            string relse_qty = obj["relse_qty"].ToString(); //已下单数量
            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //操作人员
            mes = ProductionManagementBLL.MarkSaveErpOrder(erpordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, username);
            mes = ProductionManagementBLL.MarkSaveErpOrder(erporderid,erpordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, username);
            return TJson.toJson(mes);
        }
        #endregion
@@ -94,15 +95,16 @@
        /// <summary>
        /// ERP订单关闭
        /// </summary>
        /// <param name="erporderid">订单id</param>
        /// <param name="erpordercode">订单号</param>
        /// <returns></returns>
        [Route(template: "ClosedErpOrder")]
        [HttpPost]
        public HttpResponseMessage ClosedErpOrder(string erpordercode)
        public HttpResponseMessage ClosedErpOrder(string erporderid, string erpordercode)
        {
            //var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //操作人员
            var username = "Admin";
            mes = ProductionManagementBLL.ClosedErpOrder(erpordercode, username);
            mes = ProductionManagementBLL.ClosedErpOrder(erporderid,erpordercode, username);
            return TJson.toJson(mes);
        }
        #endregion

 VueWebApi/DLL/BLL/ProductionManagementBLL.cs

@@ -18,16 +18,16 @@
        #endregion

        #region[ERP订单下达]
        public static ToMessage MarkSaveErpOrder(string erpordercode, string partcode, string wkshopcode, string warehousecode, string erpqty, string markqty, string ordernum, string relse_qty, string username)
        public static ToMessage MarkSaveErpOrder(string erporderid, string erpordercode, string partcode, string wkshopcode, string warehousecode, string erpqty, string markqty, string ordernum, string relse_qty, string username)
        {
            return ProductionManagementDAL.MarkSaveErpOrder(erpordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, username);
            return ProductionManagementDAL.MarkSaveErpOrder(erporderid,erpordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, username);
        }
        #endregion

        #region[ERP订单关闭]
        public static ToMessage ClosedErpOrder(string erpordercode, string username)
        public static ToMessage ClosedErpOrder(string erporderid, string erpordercode, string username)
        {
            return ProductionManagementDAL.ClosedErpOrder(erpordercode,username);
            return ProductionManagementDAL.ClosedErpOrder(erporderid,erpordercode, username);
        }
        #endregion


 VueWebApi/DLL/DAL/ProductModelDAL.cs

@@ -1125,6 +1125,8 @@
        public static ToMessage AddUpdateStep(string stepid, string stepcode, string stepname, string steptypecode, string enable, string description, string username, string operType)
        {
            var dynamicParams = new DynamicParameters();
            List<object> list = new List<object>();
            var sql_1 = "";
            try
            {
                if (operType == "Add")
@@ -1167,6 +1169,7 @@
                }
                if (operType == "Update")
                {
                    list.Clear();
                    //如果当前工序使用状态位N(未启用),需判断当前工序对应工艺路线被引用的工单是否关闭
                    if (enable == "N")
                    {
@@ -1184,18 +1187,29 @@
                            return mes;
                        }
                    }
                    //当前工序类型与关联工作站中的类型是否匹配,不匹配则清除关联工作站数据，同时清理工序标(关联工作站标识字段为N)
                    var sql_10 = @"select *  from TFlw_Rteqp where step_code=@stepcode";
                    dynamicParams.Add("@stepcode", stepcode);
                    var data_10 = DapperHelper.selectdata(sql_10, dynamicParams);
                    if (data_10.Rows.Count > 0)
                    {
                        if (data_10.Rows[0]["STYLE"].ToString() != "steptypecode") 
                        {
                            //删除工序关联工作站表
                            sql_1 = @"delete TFlw_Rteqp  where step_code=@stepcode";
                            list.Add(new { str = sql_1, parm = new { stepcode = stepcode } });
                            //修改工序表关联工作站标识
                            sql_1 = @"update TStep set is_eqp='N' where stepcode=@stepcode";
                            list.Add(new { str = sql_1, parm = new { stepcode = stepcode } });
                        }
                    }

                    var sql = @"update TStep set stepname=@stepname,flwtype=@steptypecode,enable=@enable,descr=@description,

                    sql_1 = @"update TStep set stepname=@stepname,flwtype=@steptypecode,enable=@enable,descr=@description,
                                lm_user=@username,lm_date=@CreateDate where id=@stepid";
                    dynamicParams.Add("@stepid", stepid);
                    dynamicParams.Add("@stepname", stepname);
                    dynamicParams.Add("@steptypecode", steptypecode);
                    dynamicParams.Add("@enable", enable);
                    dynamicParams.Add("@description", description);
                    dynamicParams.Add("@username", username);
                    dynamicParams.Add("@CreateDate", DateTime.Now.ToString());
                    int cont = DapperHelper.SQL(sql, dynamicParams);
                    if (cont > 0)
                    list.Add(new { str = sql_1, parm = new { stepid = stepid, stepname= stepname, steptypecode = steptypecode, enable= enable, description = description, username= username, CreateDate= DateTime.Now.ToString() } });
                    bool aa = DapperHelper.DoTransaction(list);
                    if (aa)
                    {
                        mes.code = "200";
                        mes.count = 0;

 VueWebApi/DLL/DAL/ProductionManagementDAL.cs

@@ -76,7 +76,7 @@
                }
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select A.status,A.wo,A.materiel_code as partcode,B.partname,B.partspec,A.qty,A.relse_qty,A.wkshp_code,C.org_name as wkshp_name,
                var sql = @"select A.id, A.status,A.wo,A.materiel_code as partcode,B.partname,B.partspec,A.qty,A.relse_qty,A.wkshp_code,C.org_name as wkshp_name,
                            A.stck_code,D.name as stck_name,A.planstartdate,A.planenddate,U.username as createuser,A.createdate 
                            from TKimp_Ewo A
                            left join TMateriel_Info B on A.materiel_code=B.partcode
@@ -102,7 +102,7 @@
        #endregion

        #region[ERP订单下达]
        public static ToMessage MarkSaveErpOrder(string erpordercode, string partcode, string wkshopcode, string warehousecode, string erpqty, string markqty, string ordernum, string relse_qty, string username)
        public static ToMessage MarkSaveErpOrder(string erporderid, string erpordercode, string partcode, string wkshopcode, string warehousecode, string erpqty, string markqty, string ordernum, string relse_qty, string username)
        {
            var sql = "";
            List<object> list = new List<object>();
@@ -181,26 +181,28 @@
                }
                if (decimal.Parse(erpqty) == decimal.Parse(markqty) + decimal.Parse(relse_qty))   //如果ERP订单=下单数量+已下单数量,则更新ERP订单表状态为CREATED:已创建
                {
                    sql = @"update  TKimp_Ewo set status='CREATED',relse_qty=relse_qty+@sumqty where wo=@wo";
                    sql = @"update  TKimp_Ewo set status='CREATED',relse_qty=relse_qty+@sumqty where wo=@wo and id=@erporderid";
                    list.Add(new
                    {
                        str = sql,
                        parm = new
                        {
                            wo = erpordercode,
                            erporderid = erporderid,
                            sumqty = sumqty
                        }
                    });
                }
                else   //更新ERP订单表状态为CREATING:创建中
                {
                    sql = @"update  TKimp_Ewo set status='CREATING',relse_qty=relse_qty+@sumqty where wo=@wo";
                    sql = @"update  TKimp_Ewo set status='CREATING',relse_qty=relse_qty+@sumqty where wo=@wo and id=@erporderid";
                    list.Add(new
                    {
                        str = sql,
                        parm = new
                        {
                            wo = erpordercode,
                            erporderid = erporderid,
                            sumqty = sumqty
                        }
                    });
@@ -233,7 +235,7 @@
        #endregion

        #region[ERP订单关闭]
        public static ToMessage ClosedErpOrder(string erpordercode, string username)
        public static ToMessage ClosedErpOrder(string erporderid,string erpordercode, string username)
        {
            var sql = "";
            List<object> list = new List<object>();
@@ -253,13 +255,14 @@
                else
                {
                    //关闭订单
                    sql = @"update  TKimp_Ewo set status='CLOSED' where wo=@wo";
                    sql = @"update  TKimp_Ewo set status='CLOSED' where wo=@wo and id=@erporderid";
                    list.Add(new
                    {
                        str = sql,
                        parm = new
                        {
                            wo = erpordercode
                            wo = erpordercode,
                            erporderid= erporderid
                        }
                    });
                }
@@ -729,8 +732,10 @@
            try
            {
                //获取工序任务信息
                sql = @"select A.wo_code,A.seq,B.stepcode,B.stepname,A.plan_qty,A.good_qty,A.ng_qty  from  TK_Wrk_Step A
                sql = @"select A.wo_code,P.partcode,P.partname,P.partspec,A.seq,B.stepcode,B.stepname,A.plan_qty,A.good_qty,A.ng_qty  from  TK_Wrk_Step A
                        left join TStep B on A.step_code=B.stepcode
                         left join TK_Wrk_Man M on A.wo_code=M.wo_code
                         left join TMateriel_Info P on M.materiel_code=P.partcode
                        where A.wo_code=@wo_code";
                dynamicParams.Add("@wo_code", wo_code);
                var data = DapperHelper.selectdata(sql, dynamicParams);

 VueWebApi/Image/app_6_1.png

 VueWebApi/Image/app_6_10.png

 VueWebApi/Image/app_6_11.png

 VueWebApi/Image/app_6_12.png

 VueWebApi/Image/app_6_13.png

 VueWebApi/Image/app_6_14.png

 VueWebApi/Image/app_6_2.png

 VueWebApi/Image/app_6_3.png

 VueWebApi/Image/app_6_4.png

 VueWebApi/Image/app_6_5.png

 VueWebApi/Image/app_6_6.png

 VueWebApi/Image/app_6_7.png

 VueWebApi/Image/app_6_8.png

 VueWebApi/Image/app_6_9.png

 VueWebApi/Logs/2022-08-22.TXT

 VueWebApi/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <_PublishTargetUrl>D:\网站发布\XKDMesApi</_PublishTargetUrl>
    <History>True|2022-08-22T02:59:23.2073567Z;True|2022-08-22T10:53:58.0920733+08:00;True|2022-08-22T10:53:10.2446944+08:00;True|2022-08-22T10:43:35.3791396+08:00;True|2022-08-18T09:45:46.4643950+08:00;True|2022-08-18T09:40:55.2601145+08:00;True|2022-08-16T16:17:14.3399134+08:00;True|2022-08-15T17:58:16.1460123+08:00;True|2022-08-15T17:55:55.7137518+08:00;True|2022-08-15T17:44:37.6024482+08:00;True|2022-08-15T17:44:21.9583041+08:00;True|2022-08-15T17:43:23.1305690+08:00;True|2022-08-15T17:29:31.1670490+08:00;True|2022-08-15T17:26:42.9269470+08:00;True|2022-08-15T17:23:27.0940168+08:00;True|2022-08-15T17:07:32.9192045+08:00;True|2022-08-15T16:47:03.8611076+08:00;True|2022-08-15T16:41:50.6843705+08:00;True|2022-08-15T16:38:26.7407413+08:00;True|2022-08-15T16:31:49.0805578+08:00;True|2022-08-15T16:27:33.6712012+08:00;True|2022-08-15T16:24:35.1042794+08:00;True|2022-08-15T16:21:57.2757683+08:00;True|2022-08-15T16:18:17.3545368+08:00;True|2022-08-15T16:15:04.2645412+08:00;True|2022-08-15T14:44:09.3078026+08:00;True|2022-08-15T11:20:09.2930712+08:00;True|2022-08-15T10:42:12.2991587+08:00;True|2022-08-15T10:41:38.3711025+08:00;True|2022-08-15T10:19:06.9974383+08:00;True|2022-08-12T17:15:09.2133281+08:00;True|2022-08-12T10:48:05.8776009+08:00;True|2022-08-12T10:26:16.4183447+08:00;True|2022-08-12T08:33:01.9502005+08:00;True|2022-08-11T09:06:08.8394009+08:00;True|2022-08-11T08:39:06.2534634+08:00;True|2022-08-11T08:05:13.6919725+08:00;True|2022-08-08T14:48:16.3637965+08:00;True|2022-08-05T15:44:02.3797448+08:00;True|2022-08-05T09:57:55.7744103+08:00;True|2022-08-04T15:24:38.8785046+08:00;True|2022-08-04T15:11:16.7054147+08:00;True|2022-08-04T14:53:52.7239932+08:00;True|2022-08-04T14:48:35.6115863+08:00;True|2022-08-04T14:39:16.1113507+08:00;True|2022-08-04T12:26:39.4998322+08:00;True|2022-08-04T10:34:23.9626503+08:00;True|2022-08-04T08:12:51.4305728+08:00;True|2022-08-03T15:43:09.2317512+08:00;True|2022-08-02T19:17:55.0460145+08:00;True|2022-08-02T19:08:13.5872184+08:00;True|2022-08-02T18:50:12.1280167+08:00;True|2022-08-02T18:05:53.6540810+08:00;True|2022-08-02T16:13:26.3567210+08:00;True|2022-08-02T15:27:59.9264333+08:00;True|2022-07-25T15:35:49.6958399+08:00;True|2022-07-25T15:30:40.4444876+08:00;True|2022-07-25T13:33:38.4068153+08:00;True|2022-07-22T15:00:56.7326322+08:00;True|2022-07-22T14:51:18.0169121+08:00;True|2022-07-22T14:26:08.4246205+08:00;True|2022-07-22T14:23:05.0897016+08:00;True|2022-07-22T14:18:18.7806854+08:00;True|2022-07-22T14:09:29.7924367+08:00;True|2022-07-22T14:02:26.6403133+08:00;True|2022-07-22T13:56:40.0887615+08:00;True|2022-07-22T13:50:10.7852190+08:00;True|2022-07-22T11:38:25.6671780+08:00;True|2022-07-22T10:55:36.7947659+08:00;True|2022-07-21T17:53:41.1464086+08:00;True|2022-07-21T17:43:33.5311479+08:00;True|2022-07-21T16:09:07.7687640+08:00;True|2022-07-21T16:04:47.9317019+08:00;True|2022-07-21T15:58:21.2359033+08:00;True|2022-07-21T15:56:07.7425829+08:00;True|2022-07-21T15:51:34.7108381+08:00;True|2022-07-21T15:48:57.5735708+08:00;True|2022-07-21T15:44:25.8205030+08:00;True|2022-07-21T15:25:51.4222269+08:00;True|2022-07-21T15:22:36.8818295+08:00;True|2022-07-21T15:19:28.8532774+08:00;True|2022-07-21T14:57:45.7532568+08:00;True|2022-07-21T11:16:12.0900762+08:00;True|2022-07-21T10:10:40.4714948+08:00;True|2022-07-21T10:00:19.5258058+08:00;True|2022-07-14T14:34:28.5093226+08:00;True|2022-07-14T13:59:59.7754985+08:00;True|2022-07-14T12:46:29.6685284+08:00;True|2022-07-14T09:22:25.9079652+08:00;True|2022-07-14T09:22:04.6797478+08:00;True|2022-07-14T09:10:45.0177607+08:00;True|2022-07-14T08:41:43.3026713+08:00;True|2022-07-14T08:27:32.7454972+08:00;True|2022-07-14T08:21:58.6572366+08:00;True|2022-07-14T08:17:59.2904747+08:00;True|2022-07-14T08:12:39.8483472+08:00;True|2022-06-30T15:04:41.6941982+08:00;True|2022-06-24T16:39:01.1080301+08:00;True|2022-06-17T13:23:15.1455451+08:00;True|2022-06-17T13:22:18.5517557+08:00;True|2022-06-17T13:19:27.7323818+08:00;True|2022-06-17T13:12:24.1252779+08:00;True|2022-06-17T13:09:20.4234258+08:00;True|2022-06-17T13:06:49.9869509+08:00;True|2022-06-17T12:58:54.6964621+08:00;False|2022-06-17T12:58:10.6767711+08:00;False|2022-06-17T12:57:08.9747950+08:00;False|2022-06-17T12:56:18.4650121+08:00;False|2022-06-17T12:55:57.9981927+08:00;True|2022-06-13T14:21:36.5610928+08:00;True|2022-06-13T11:41:39.4210151+08:00;True|2022-06-11T02:35:03.4727934+08:00;True|2022-06-11T02:31:13.7362660+08:00;True|2022-06-11T02:30:58.3616790+08:00;True|2022-06-11T01:57:04.4951468+08:00;True|2022-06-10T13:27:13.2097124+08:00;</History>
    <History>True|2022-08-22T12:48:56.2180227Z;True|2022-08-22T19:07:12.1093584+08:00;True|2022-08-22T19:04:07.7837887+08:00;True|2022-08-22T14:38:00.9342884+08:00;True|2022-08-22T10:59:23.2073567+08:00;True|2022-08-22T10:53:58.0920733+08:00;True|2022-08-22T10:53:10.2446944+08:00;True|2022-08-22T10:43:35.3791396+08:00;True|2022-08-18T09:45:46.4643950+08:00;True|2022-08-18T09:40:55.2601145+08:00;True|2022-08-16T16:17:14.3399134+08:00;True|2022-08-15T17:58:16.1460123+08:00;True|2022-08-15T17:55:55.7137518+08:00;True|2022-08-15T17:44:37.6024482+08:00;True|2022-08-15T17:44:21.9583041+08:00;True|2022-08-15T17:43:23.1305690+08:00;True|2022-08-15T17:29:31.1670490+08:00;True|2022-08-15T17:26:42.9269470+08:00;True|2022-08-15T17:23:27.0940168+08:00;True|2022-08-15T17:07:32.9192045+08:00;True|2022-08-15T16:47:03.8611076+08:00;True|2022-08-15T16:41:50.6843705+08:00;True|2022-08-15T16:38:26.7407413+08:00;True|2022-08-15T16:31:49.0805578+08:00;True|2022-08-15T16:27:33.6712012+08:00;True|2022-08-15T16:24:35.1042794+08:00;True|2022-08-15T16:21:57.2757683+08:00;True|2022-08-15T16:18:17.3545368+08:00;True|2022-08-15T16:15:04.2645412+08:00;True|2022-08-15T14:44:09.3078026+08:00;True|2022-08-15T11:20:09.2930712+08:00;True|2022-08-15T10:42:12.2991587+08:00;True|2022-08-15T10:41:38.3711025+08:00;True|2022-08-15T10:19:06.9974383+08:00;True|2022-08-12T17:15:09.2133281+08:00;True|2022-08-12T10:48:05.8776009+08:00;True|2022-08-12T10:26:16.4183447+08:00;True|2022-08-12T08:33:01.9502005+08:00;True|2022-08-11T09:06:08.8394009+08:00;True|2022-08-11T08:39:06.2534634+08:00;True|2022-08-11T08:05:13.6919725+08:00;True|2022-08-08T14:48:16.3637965+08:00;True|2022-08-05T15:44:02.3797448+08:00;True|2022-08-05T09:57:55.7744103+08:00;True|2022-08-04T15:24:38.8785046+08:00;True|2022-08-04T15:11:16.7054147+08:00;True|2022-08-04T14:53:52.7239932+08:00;True|2022-08-04T14:48:35.6115863+08:00;True|2022-08-04T14:39:16.1113507+08:00;True|2022-08-04T12:26:39.4998322+08:00;True|2022-08-04T10:34:23.9626503+08:00;True|2022-08-04T08:12:51.4305728+08:00;True|2022-08-03T15:43:09.2317512+08:00;True|2022-08-02T19:17:55.0460145+08:00;True|2022-08-02T19:08:13.5872184+08:00;True|2022-08-02T18:50:12.1280167+08:00;True|2022-08-02T18:05:53.6540810+08:00;True|2022-08-02T16:13:26.3567210+08:00;True|2022-08-02T15:27:59.9264333+08:00;True|2022-07-25T15:35:49.6958399+08:00;True|2022-07-25T15:30:40.4444876+08:00;True|2022-07-25T13:33:38.4068153+08:00;True|2022-07-22T15:00:56.7326322+08:00;True|2022-07-22T14:51:18.0169121+08:00;True|2022-07-22T14:26:08.4246205+08:00;True|2022-07-22T14:23:05.0897016+08:00;True|2022-07-22T14:18:18.7806854+08:00;True|2022-07-22T14:09:29.7924367+08:00;True|2022-07-22T14:02:26.6403133+08:00;True|2022-07-22T13:56:40.0887615+08:00;True|2022-07-22T13:50:10.7852190+08:00;True|2022-07-22T11:38:25.6671780+08:00;True|2022-07-22T10:55:36.7947659+08:00;True|2022-07-21T17:53:41.1464086+08:00;True|2022-07-21T17:43:33.5311479+08:00;True|2022-07-21T16:09:07.7687640+08:00;True|2022-07-21T16:04:47.9317019+08:00;True|2022-07-21T15:58:21.2359033+08:00;True|2022-07-21T15:56:07.7425829+08:00;True|2022-07-21T15:51:34.7108381+08:00;True|2022-07-21T15:48:57.5735708+08:00;True|2022-07-21T15:44:25.8205030+08:00;True|2022-07-21T15:25:51.4222269+08:00;True|2022-07-21T15:22:36.8818295+08:00;True|2022-07-21T15:19:28.8532774+08:00;True|2022-07-21T14:57:45.7532568+08:00;True|2022-07-21T11:16:12.0900762+08:00;True|2022-07-21T10:10:40.4714948+08:00;True|2022-07-21T10:00:19.5258058+08:00;True|2022-07-14T14:34:28.5093226+08:00;True|2022-07-14T13:59:59.7754985+08:00;True|2022-07-14T12:46:29.6685284+08:00;True|2022-07-14T09:22:25.9079652+08:00;True|2022-07-14T09:22:04.6797478+08:00;True|2022-07-14T09:10:45.0177607+08:00;True|2022-07-14T08:41:43.3026713+08:00;True|2022-07-14T08:27:32.7454972+08:00;True|2022-07-14T08:21:58.6572366+08:00;True|2022-07-14T08:17:59.2904747+08:00;True|2022-07-14T08:12:39.8483472+08:00;True|2022-06-30T15:04:41.6941982+08:00;True|2022-06-24T16:39:01.1080301+08:00;True|2022-06-17T13:23:15.1455451+08:00;True|2022-06-17T13:22:18.5517557+08:00;True|2022-06-17T13:19:27.7323818+08:00;True|2022-06-17T13:12:24.1252779+08:00;True|2022-06-17T13:09:20.4234258+08:00;True|2022-06-17T13:06:49.9869509+08:00;True|2022-06-17T12:58:54.6964621+08:00;False|2022-06-17T12:58:10.6767711+08:00;False|2022-06-17T12:57:08.9747950+08:00;False|2022-06-17T12:56:18.4650121+08:00;False|2022-06-17T12:55:57.9981927+08:00;True|2022-06-13T14:21:36.5610928+08:00;True|2022-06-13T11:41:39.4210151+08:00;True|2022-06-11T02:35:03.4727934+08:00;True|2022-06-11T02:31:13.7362660+08:00;True|2022-06-11T02:30:58.3616790+08:00;True|2022-06-11T01:57:04.4951468+08:00;True|2022-06-10T13:27:13.2097124+08:00;</History>
  </PropertyGroup>
  <ItemGroup>
    <File Include="Areas/HelpPage/HelpPage.css">
@@ -696,16 +696,16 @@
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/VueWebApi.dll">
      <publishTime>08/22/2022 10:59:18</publishTime>
      <publishTime>08/22/2022 20:48:50</publishTime>
    </File>
    <File Include="bin/VueWebApi.dll.config">
      <publishTime>06/15/2022 15:31:43</publishTime>
    </File>
    <File Include="bin/VueWebApi.pdb">
      <publishTime>08/22/2022 10:59:18</publishTime>
      <publishTime>08/22/2022 20:48:50</publishTime>
    </File>
    <File Include="bin/VueWebApi.xml">
      <publishTime>08/22/2022 10:59:18</publishTime>
      <publishTime>08/22/2022 20:48:50</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>02/08/2013 16:42:28</publishTime>
@@ -1266,88 +1266,130 @@
      <publishTime>08/11/2022 08:20:52</publishTime>
    </File>
    <File Include="Image/app_1.png">
      <publishTime>08/19/2022 09:53:24</publishTime>
      <publishTime>08/22/2022 12:08:31</publishTime>
    </File>
    <File Include="Image/app_1_1.png">
      <publishTime>08/19/2022 09:53:24</publishTime>
      <publishTime>08/22/2022 12:08:31</publishTime>
    </File>
    <File Include="Image/app_1_2.png">
      <publishTime>08/19/2022 09:53:24</publishTime>
      <publishTime>08/22/2022 12:08:31</publishTime>
    </File>
    <File Include="Image/app_2.png">
      <publishTime>08/19/2022 09:53:24</publishTime>
      <publishTime>08/22/2022 12:08:31</publishTime>
    </File>
    <File Include="Image/app_3.png">
      <publishTime>08/19/2022 09:53:24</publishTime>
      <publishTime>08/22/2022 12:08:31</publishTime>
    </File>
    <File Include="Image/app_3_1.png">
      <publishTime>08/19/2022 09:53:24</publishTime>
      <publishTime>08/22/2022 12:08:31</publishTime>
    </File>
    <File Include="Image/app_3_2.png">
      <publishTime>08/19/2022 09:53:24</publishTime>
      <publishTime>08/22/2022 12:08:31</publishTime>
    </File>
    <File Include="Image/app_4.png">
      <publishTime>08/19/2022 09:53:24</publishTime>
      <publishTime>08/22/2022 12:08:31</publishTime>
    </File>
    <File Include="Image/app_4_1.png">
      <publishTime>08/19/2022 09:53:24</publishTime>
      <publishTime>08/22/2022 12:08:31</publishTime>
    </File>
    <File Include="Image/app_4_2.png">
      <publishTime>08/19/2022 09:53:24</publishTime>
      <publishTime>08/22/2022 12:08:31</publishTime>
    </File>
    <File Include="Image/app_4_3.png">
      <publishTime>08/19/2022 09:53:24</publishTime>
      <publishTime>08/22/2022 12:08:31</publishTime>
    </File>
    <File Include="Image/app_4_4.png">
      <publishTime>08/19/2022 09:53:24</publishTime>
      <publishTime>08/22/2022 12:08:31</publishTime>
    </File>
    <File Include="Image/app_5.png">
      <publishTime>08/19/2022 09:53:24</publishTime>
      <publishTime>08/22/2022 12:08:31</publishTime>
    </File>
    <File Include="Image/app_5_1.png">
      <publishTime>08/19/2022 09:53:24</publishTime>
      <publishTime>08/22/2022 12:08:31</publishTime>
    </File>
    <File Include="Image/app_5_2.png">
      <publishTime>08/19/2022 09:53:21</publishTime>
      <publishTime>08/22/2022 12:08:31</publishTime>
    </File>
    <File Include="Image/app_5_3.png">
      <publishTime>08/19/2022 09:53:21</publishTime>
      <publishTime>08/22/2022 12:08:31</publishTime>
    </File>
    <File Include="Image/app_5_4.png">
      <publishTime>08/19/2022 09:53:21</publishTime>
      <publishTime>08/22/2022 12:08:31</publishTime>
    </File>
    <File Include="Image/app_5_5.png">
      <publishTime>08/19/2022 09:53:21</publishTime>
      <publishTime>08/22/2022 12:08:31</publishTime>
    </File>
    <File Include="Image/app_5_6.png">
      <publishTime>08/19/2022 09:53:21</publishTime>
      <publishTime>08/22/2022 12:08:31</publishTime>
    </File>
    <File Include="Image/app_5_7.png">
      <publishTime>08/19/2022 09:53:21</publishTime>
      <publishTime>08/22/2022 12:08:31</publishTime>
    </File>
    <File Include="Image/app_5_8.png">
      <publishTime>08/19/2022 09:53:21</publishTime>
      <publishTime>08/22/2022 12:08:31</publishTime>
    </File>
    <File Include="Image/app_5_9.png">
      <publishTime>08/19/2022 09:53:21</publishTime>
      <publishTime>08/22/2022 12:08:31</publishTime>
    </File>
    <File Include="Image/app_6.png">
      <publishTime>08/19/2022 09:53:24</publishTime>
      <publishTime>08/22/2022 12:08:31</publishTime>
    </File>
    <File Include="Image/app_6_1.png">
      <publishTime>08/22/2022 12:08:31</publishTime>
    </File>
    <File Include="Image/app_6_10.png">
      <publishTime>08/22/2022 12:08:31</publishTime>
    </File>
    <File Include="Image/app_6_11.png">
      <publishTime>08/22/2022 12:08:31</publishTime>
    </File>
    <File Include="Image/app_6_12.png">
      <publishTime>08/22/2022 12:08:31</publishTime>
    </File>
    <File Include="Image/app_6_13.png">
      <publishTime>08/22/2022 12:08:31</publishTime>
    </File>
    <File Include="Image/app_6_14.png">
      <publishTime>08/22/2022 12:08:27</publishTime>
    </File>
    <File Include="Image/app_6_2.png">
      <publishTime>08/22/2022 12:08:31</publishTime>
    </File>
    <File Include="Image/app_6_3.png">
      <publishTime>08/22/2022 12:08:31</publishTime>
    </File>
    <File Include="Image/app_6_4.png">
      <publishTime>08/22/2022 12:08:31</publishTime>
    </File>
    <File Include="Image/app_6_5.png">
      <publishTime>08/22/2022 12:08:31</publishTime>
    </File>
    <File Include="Image/app_6_6.png">
      <publishTime>08/22/2022 12:08:31</publishTime>
    </File>
    <File Include="Image/app_6_7.png">
      <publishTime>08/22/2022 12:08:31</publishTime>
    </File>
    <File Include="Image/app_6_8.png">
      <publishTime>08/22/2022 12:08:31</publishTime>
    </File>
    <File Include="Image/app_6_9.png">
      <publishTime>08/22/2022 12:08:31</publishTime>
    </File>
    <File Include="Image/app_7.png">
      <publishTime>08/19/2022 09:53:24</publishTime>
      <publishTime>08/22/2022 12:08:31</publishTime>
    </File>
    <File Include="Image/app_8.png">
      <publishTime>08/19/2022 09:53:24</publishTime>
      <publishTime>08/22/2022 12:08:31</publishTime>
    </File>
    <File Include="Image/app_9.png">
      <publishTime>08/19/2022 09:53:24</publishTime>
      <publishTime>08/22/2022 12:08:31</publishTime>
    </File>
    <File Include="Image/index_1.png">
      <publishTime>08/19/2022 09:53:21</publishTime>
      <publishTime>08/22/2022 12:08:31</publishTime>
    </File>
    <File Include="Image/index_2.png">
      <publishTime>08/19/2022 09:53:21</publishTime>
      <publishTime>08/22/2022 12:08:31</publishTime>
    </File>
    <File Include="index.html">
      <publishTime>06/30/2022 14:02:46</publishTime>
@@ -1407,7 +1449,7 @@
      <publishTime>06/10/2022 08:20:24</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>08/22/2022 10:59:22</publishTime>
      <publishTime>08/22/2022 20:48:55</publishTime>
    </File>
  </ItemGroup>
</Project>

 VueWebApi/Tools/ScanStartReport.cs

@@ -232,7 +232,7 @@
                                            {
                                                decimal sqty = data3.AsEnumerable().Select(d => d.Field<decimal>("SQTY")).Sum();  //上道收料数量
                                                decimal good_qty = data2.AsEnumerable().Select(d => d.Field<decimal>("GOOD_QTY")).Sum();  //本道报工总数量
                                                decimal ng_qty = data2.AsEnumerable().Select(d => d.Field<decimal>("GOOD_QTY")).Sum();  //本道不良总数量
                                                decimal ng_qty = data2.AsEnumerable().Select(d => d.Field<decimal>("NG_QTY")).Sum();  //本道不良总数量

                                                decimal sybqty = sqty - good_qty - ng_qty;//本道剩余可报数量=上道收料总数量-本道报工总数量-本道不良总数量
                                                if (sybqty <= 0)

 VueWebApi/VueWebApi.csproj

@@ -409,6 +409,20 @@
    <Content Include="Image\app_5_8.png" />
    <Content Include="Image\app_5_9.png" />
    <Content Include="Image\app_6.png" />
    <Content Include="Image\app_6_1.png" />
    <Content Include="Image\app_6_10.png" />
    <Content Include="Image\app_6_11.png" />
    <Content Include="Image\app_6_12.png" />
    <Content Include="Image\app_6_13.png" />
    <Content Include="Image\app_6_14.png" />
    <Content Include="Image\app_6_2.png" />
    <Content Include="Image\app_6_3.png" />
    <Content Include="Image\app_6_4.png" />
    <Content Include="Image\app_6_5.png" />
    <Content Include="Image\app_6_6.png" />
    <Content Include="Image\app_6_7.png" />
    <Content Include="Image\app_6_8.png" />
    <Content Include="Image\app_6_9.png" />
    <Content Include="Image\app_7.png" />
    <Content Include="Image\app_8.png" />
    <Content Include="Image\app_9.png" />

 VueWebApi/bin/VueWebApi.pdb

Binary files differ

 VueWebApi/bin/VueWebApi.xml

@@ -1368,10 +1368,11 @@
            <param name="obj">提交数据</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.ClosedErpOrder(System.String)">
        <member name="M:VueWebApi.Controllers.ProductionManagementController.ClosedErpOrder(System.String,System.String)">
            <summary>
            ERP订单关闭
            </summary>
            <param name="erporderid">订单id</param>
            <param name="erpordercode">订单号</param>
            <returns></returns>
        </member>

 VueWebApi/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache

Binary files differ

 VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_1.png

 VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_10.png

 VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_11.png

 VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_12.png

 VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_13.png

 VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_14.png

 VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_2.png

 VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_3.png

 VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_4.png

 VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_5.png

 VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_6.png

 VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_7.png

 VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_8.png

 VueWebApi/obj/Release/Package/PackageTmp/Image/app_6_9.png

 VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb

Binary files differ

 VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml

@@ -1368,10 +1368,11 @@
            <param name="obj">提交数据</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.ClosedErpOrder(System.String)">
        <member name="M:VueWebApi.Controllers.ProductionManagementController.ClosedErpOrder(System.String,System.String)">
            <summary>
            ERP订单关闭
            </summary>
            <param name="erporderid">订单id</param>
            <param name="erpordercode">订单号</param>
            <returns></returns>
        </member>

 VueWebApi/obj/Release/VueWebApi.pdb

Binary files differ