wbc
2024-08-27 804f980b60f0fef5aeb87b8b126462975c2aa693
发货通知单字段新增、委外订单下达、委外下推采购
已修改2个文件
23 ■■■■ 文件已修改
HandleData/AE_MES_ERP.cs 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
frmMain.cs 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HandleData/AE_MES_ERP.cs
@@ -144,6 +144,8 @@
                case "TB_MESTOERP_SCDDXD"://推送审核送货单
                case "TB_MESTOERP_TransferIn"://分布式调入单
                case "TB_MESTOERP_ZJDB"://直接调拨单
                case "TB_MESTOERP_WWDDXD"://委外订单下达
                case "TB_MESTOERP_WWCG"://委外下推采购
                    result = MesToErp(drSource, ref msg, rtaskid);
                    break;
                case "TB_MESTOERP_GDRK"://ERP工单入库查询
@@ -3981,7 +3983,10 @@
                            colMapping[23] = new SqlBulkCopyColumnMapping("FHB022", "DFB022"); //出库下线
                            colMapping[24] = new SqlBulkCopyColumnMapping("FHB023", "DFB023"); //是否控制出库数量
                            colMapping[25] = new SqlBulkCopyColumnMapping("FHB024", "DFB024"); //累计出库数
                            colMapping[26] = new SqlBulkCopyColumnMapping("ERP_EntryID", "ID"); //明细ID
                            colMapping[26] = new SqlBulkCopyColumnMapping("FHB025", "DFB025"); //产品类型
                            colMapping[27] = new SqlBulkCopyColumnMapping("FHB026", "DFB026"); //父标识
                            colMapping[28] = new SqlBulkCopyColumnMapping("FHB027", "DFB027"); //标识列
                            colMapping[29] = new SqlBulkCopyColumnMapping("ERP_EntryID", "ID"); //明细ID
                            DataTableToSQLServer(dt, conStr, "COMDFB", colMapping, ref ErrorMsg);
                            #endregion
                        }
frmMain.cs
@@ -181,10 +181,12 @@
                                                                                'TB_MESTOERP_SLSH',
                                                                                'TB_MESTOERP_SCDDXD',
                                                                                'TB_MESTOERP_WLQDBB',
                                                                                'TB_MESTOERP_TransferIn'
                                                                                'TB_MESTOERP_TransferIn',
                                                                                'TB_MESTOERP_WWDDXD',
                                                                                'TB_MESTOERP_WWCG'
                                                                                ) 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
                                                        union all
@@ -238,9 +240,11 @@
                                                                                'TB_MESTOERP_SLSH',
                                                                                'TB_MESTOERP_SCDDXD',
                                                                                'TB_MESTOERP_WLQDBB',
                                                                                'TB_MESTOERP_TransferIn') then 3
                                                                                'TB_MESTOERP_TransferIn',
                                                                                'TB_MESTOERP_WWDDXD',
                                                                                'TB_MESTOERP_WWCG') 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 ('高冲物料变更','物料信息表','仓库信息表','部门信息表','员工信息表','生产投料单','部门信息表','领料单','成品入库单','采购入库单','生产订单下达','物料客户对应表','采购订单','发货通知单','销售出库单','分步调入单','生产领料单','生产退料单','生产补料单','供应商信息表')
                                                        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',
                                                                                                    'TB_MESTOERP_WWRK',
                                                                                                    'TB_MESTOERP_QTRK',
@@ -255,7 +259,9 @@
                                                                                                    'TB_MESTOERP_GDRK',
                                                                                                    'TB_MESTOERP_SLSH',
                                                                                                    'TB_MESTOERP_WLQDBB',
                                                                                                    'TB_MESTOERP_TransferIn')
                                                                                                    'TB_MESTOERP_TransferIn',
                                                                                                     'TB_MESTOERP_WWDDXD',
                                                                                                      'TB_MESTOERP_WWCG')
                                                    )
                                                    select rtrim(gp)+'-'+rtrim(rank() over(partition by gp order by data)) gcp,* from cte