增加采购退货

cdk

2 天以前 9d36af31f3646a9ece38f17fcde31f1320d767ec

增加采购退货

 HandleData/AE_MES_ERP.cs

@@ -149,6 +149,7 @@
                case "TB_MESTOERP_WWDDXD"://委外订单下达
                case "TB_MESTOERP_WWLL"://委外领料单
                case "TB_MESTOERP_XSTH"://销售退货
                case "TB_MESTOERP_CGTL"://采购退货
                case "TB_MESTOERP_WWCG"://委外下推采购
                    result = MesToErp(drSource, ref msg, rtaskid);
                    break;
@@ -1211,6 +1212,7 @@
        private bool TB_ERPTOMES_GYS(DataSet ds, string operatype, ref string ErrorMsg)
        {
            string sql = "";
            string dtName = "";
            //用来拼ID集合
            List<string> IDList = new List<string>();

@@ -1238,7 +1240,7 @@
                {
                    #region INSERT
                    //dt.Columns.Add("MAA005", typeof(string));

                    dtName = dt.TableName;
                    foreach (DataRow dr in dt.Rows)
                    {
                        IDList.Add(dr["ERPID"].ToString());
@@ -1263,11 +1265,11 @@
                    colMapping[6] = new SqlBulkCopyColumnMapping("FUseOrgId", "FUseOrgId"); //    内/外销
                    if (dt.Columns.Contains("GYSA006"))
                    {
                        colMapping[7] = new SqlBulkCopyColumnMapping("GYSA006", "GYSA006"); //备注
                        colMapping[7] = new SqlBulkCopyColumnMapping("GYSA006", "GYS006"); //备注
                    }
                    //colMapping[8] = new SqlBulkCopyColumnMapping("AUDITING", "AUDITING");

                    return DataTableToSQLServer(dt, conStr, "GS_GYS", colMapping, ref ErrorMsg);
                    DataTableToSQLServer(dt, conStr, "GS_GYS", colMapping, ref ErrorMsg);
                    #endregion
                }
                else if (operatype == "UPDATE")
@@ -1316,13 +1318,14 @@
                    }
                    sql = string.Format(@" delete from GS_GYS where ERPID in ('{0}'); ", string.Join("','", IDList));

                    return _sqlHelper.ExecuteNonQuery(sql) > 0;
                    _sqlHelper.ExecuteNonQuery(sql);
                    #endregion
                }
                return true;
            }
            catch (Exception ex)
            {
                ErrorMsg = ex.Message;
                ErrorMsg = "[" + dtName + "]" + ex.Message;
                return false;
            }
        }
@@ -3209,7 +3212,7 @@
                // sendt.arg0.
                US.category = task_name;
                US.data = data_inserted;
                US.op = operatype;
                US.op = dr["mesid"].ToString();
                string res = a.Body(US).msg.ToString();

                sql = string.Format(@" update  sysdec set  states='NEW' WHERE TASK_ID='{0}' ", rtaskid);
@@ -3230,10 +3233,6 @@
                    _sqlHelper.ExecuteNonQuery(sql);
                }

                if (string.IsNullOrWhiteSpace(res)) {
                    res = "数据有异常";
                }

                //string res = a.arg0.ws.MES_TO_ERP_DataTransport(task_name, descript, create_time, creator, operatype, source_table, target_table, data, data_inserted, data_deleted);
                if (res.Contains("OK"))
                {
@@ -3242,7 +3241,7 @@
                }
                else if(res.Contains("MES单号唯一检测不通过"))
                {
                    ErrorMsg = res;
                    ErrorMsg = "OK-" + res;
                    return true;
                }
                else
@@ -4461,7 +4460,24 @@
                            foreach (DataRow dr in dt.Rows)
                            {
                                IDList.Add(dr["ERPID"].ToString());

                                if (dt.Columns.Contains("XSTHB012"))
                                {
                                    switch (dr["XSTHB012"].ToString())
                                    {
                                        case "Son":
                                            dr["XSTHB012"] = "套件子项";
                                            break;
                                        case "Standard":
                                            dr["XSTHB012"] = "标准产品";
                                            break;
                                        case "Parent":
                                            dr["XSTHB012"] = "套件父项";
                                            break;
                                        case "Service":
                                            dr["XSTHB012"] = "服务";
                                            break;
                                    }
                                }
                                dr["AUDITING"] = "Y";
                            }

@@ -4488,7 +4504,10 @@
                            colMapping[11] = new SqlBulkCopyColumnMapping("XSTHB010", "XSTHB010"); //仓库
                            colMapping[12] = new SqlBulkCopyColumnMapping("XSTHB011", "XSTHB011"); //退货日期
                            colMapping[13] = new SqlBulkCopyColumnMapping("ERP_EntryID", "ID"); //明细ID
                            //colMapping[14] = new SqlBulkCopyColumnMapping("XSTHB006", "XSTHB012"); //明细ID
                            if (dt.Columns.Contains("XSTHB012"))
                            {
                                colMapping[14] = new SqlBulkCopyColumnMapping("XSTHB012", "XSTHB012"); //明细产品类型 
                            }
                            DataTableToSQLServer(dt, conStr, "GS_XSTHB", colMapping, ref ErrorMsg);

                            #endregion
@@ -4691,6 +4710,25 @@
                                    string B = A.ToString();
                                    dr["CGTHB008"] = B;
                                }

                                if (dt.Columns.Contains("CGTHB012"))
                                {
                                    switch (dr["CGTHB012"].ToString())
                                    {
                                        case "Son":
                                            dr["CGTHB012"] = "套件子项";
                                            break;
                                        case "Standard":
                                            dr["CGTHB012"] = "标准产品";
                                            break;
                                        case "Parent":
                                            dr["CGTHB012"] = "套件父项";
                                            break;
                                        case "Service":
                                            dr["CGTHB012"] = "服务";
                                            break;
                                    }
                                }
                            }

                            //插入前先删除重复键
@@ -4716,6 +4754,10 @@
                            colMapping[11] = new SqlBulkCopyColumnMapping("CGTHB010", "CGTHB010"); //计价单位
                            colMapping[12] = new SqlBulkCopyColumnMapping("CGTHB011", "CGTHB011"); //退货原因
                            colMapping[13] = new SqlBulkCopyColumnMapping("ERP_EntryID", "ID"); //明细ID
                            if (dt.Columns.Contains("CGTHB012"))
                            {
                                colMapping[14] = new SqlBulkCopyColumnMapping("CGTHB012", "CGTHB012"); //明细产品类型 
                            }
                            DataTableToSQLServer(dt, conStr, "GS_CGTHB", colMapping, ref ErrorMsg);
                            #endregion
                        }

 frmMain.cs

@@ -189,10 +189,11 @@
                                                                                'TB_MESTOERP_WWDDXD',
                                                                                'TB_MESTOERP_WWCG',
                                                                                'TB_MESTOERP_WWLL',
                                                                                'TB_MESTOERP_XSTH'
                                                                                'TB_MESTOERP_XSTH',
                                                                                'TB_MESTOERP_CGTL'
                                                                                ) then 3
                                                                else 4 end gp,* 
                                                        from SYSDEC  WITH(nolock) where states='NEW'  AND   descript IN ('用料清单变更','高冲物料变更','物料信息表','仓库信息表','部门信息表','员工信息表','部门信息表','领料单','委外领料单','销售退货单',
                                                        from SYSDEC  WITH(nolock) where states='NEW'  AND   descript IN ('用料清单变更','高冲物料变更','物料信息表','仓库信息表','部门信息表','员工信息表','部门信息表','领料单','委外领料单','销售退货单','采购退货单',
                                                                                  '成品入库单','采购入库单','收料通知单','生产订单下达','物料客户对应表','采购订单','发货通知单','销售退货','采购退货','销售出库单','生产领料单','分步调入单','生产退料单','直接调拨单','生产补料单','委外订单','其他入库单','其他出库单','供应商信息表','委外订单下达','委外下推采购')
                                                                --and task_name='TB_ERPTOMES_CG' 
                                                        order by create_time
@@ -254,7 +255,8 @@
                                                                                'TB_MESTOERP_TransferIn',
                                                                                'TB_MESTOERP_WWDDXD',
                                                                                'TB_MESTOERP_WWCG',
                                                                                'TB_MESTOERP_XSTH') then 3
                                                                                'TB_MESTOERP_XSTH',
                                                                                'TB_MESTOERP_CGTL') then 3
                                                                else 4 end gp,* 
                                                        from SYSDEC  WITH(nolock) where states='FAIL' and retry_times<1 and CREATE_TIME>'2024-06-14 13:13:34'  AND descript IN ('用料清单变更','高冲物料变更','物料信息表','仓库信息表','部门信息表','员工信息表','生产投料单','部门信息表','领料单','成品入库单','采购入库单','生产订单下达','物料客户对应表','采购订单','发货通知单','销售出库单','分步调入单','生产领料单','生产退料单','生产补料单','供应商信息表','委外订单下达','委外下推采购')
                                                                            and task_name not in ('TB_MESTOERP_WGRK',