修正增加釉料属性

DK.Basics/BaseResources/Constant.cs

@@ -1743,6 +1743,13 @@ namespace Dongke.IBOSS.PRD.Basics.BaseResources
             /// 商标名称
             /// </summary>
             out_logoName,
+
+            //xuwei add 2020-03-04
+            /// <summary>
+            /// 釉料名称
+            /// </summary>
+            out_glazeName,
+
             /// <summary>
             /// 商品限制天数
             /// </summary>

DK.Service/PMModuleLogic/PMModuleLogic.cs

@@ -55,6 +55,9 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
             barCodeResultTable.Columns.Add(Constant.BarCodeResultTableColumns.out_logoID.ToString());
             barCodeResultTable.Columns.Add(Constant.BarCodeResultTableColumns.out_logoCode.ToString());
             barCodeResultTable.Columns.Add(Constant.BarCodeResultTableColumns.out_logoName.ToString());
+            //xuwei add 2020-03-04 添加釉料属性
+            barCodeResultTable.Columns.Add(Constant.BarCodeResultTableColumns.out_glazeName.ToString());
+
             barCodeResultTable.Columns.Add(Constant.BarCodeResultTableColumns.out_deliverLimitCycle.ToString());
             barCodeResultTable.Columns.Add(Constant.BarCodeResultTableColumns.out_barcode.ToString());
 			barCodeResultTable.Columns.Add(Constant.BarCodeResultTableColumns.out_WaterLabelCode.ToString());

DK.Service/PMModuleLogic/PMModuleLogicPartial.cs

@@ -1281,7 +1281,6 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
 				if (paras[7].Value.ToString() == "null") //只有正确的条码，读注浆信息
 				{
 
-					//2020-03-04 添加关联字典表取釉料属性 
 					sqlString = @"select 
                                     tp_pm_inproduction.GoodsName,
                                     tp_pm_inproduction.GroutingUserID,
@@ -1297,9 +1296,7 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                                     --gt.gt.goodstypecode,gt.goodstypename,a.workcode,
                                     tp_mst_logo.logocode,
                                     u.username as GroutingUserName,
-                                    tp_mst_logo.logoname,
-									--xuwei add line 2020-03-04
-									glaze.DICTIONARYVALUE AS GLAZENAME
+                                    tp_mst_logo.logoname
                                     from tp_pm_inproduction
                                     left join TP_PM_GroutingDailyDetail gdd on gdd.GroutingDailyDetailID = tp_pm_inproduction.GroutingDailyDetailID
                                     left join tp_mst_logo
@@ -1308,8 +1305,6 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                                     LEFT JOIN TP_MST_GOODS G ON G.GoodsID = tp_pm_inproduction.goodsid
                                     --left join tp_mst_goodstype gt on gt.goodstypeid = g.goodstypeid
                                     --left join tp_mst_account a on a.accountid = gdd.accountid
-									--xuwei add line 2020-03-04
-									LEFT JOIN TP_MST_DataDictionary glaze ON glaze.DICTIONARYID = gdd.GLAZETYPEID 
                                     where tp_pm_inproduction.BarCode=:barcode";
 					paras = new OracleParameter[]{
 							new OracleParameter(":barcode",barcode),
@@ -1581,12 +1576,14 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                                     nvl(gdd.MaterialCode, nvl(g.MaterialCode,g.GoodsCode)) ||'#'|| to_char(g.GOODS_LINE_TYPE) as GOODSMODELforCheck, -- 用物料编码验证产品型号是否一致
                                     --nvl(gdd.MaterialCode, g.GoodsCode) as GOODSMODELforCheck, -- 用物料编码验证产品型号是否一致
                                     tp_mst_logo.logocode,
-                                    tp_mst_logo.logoname
+                                    tp_mst_logo.logoname,
+									glaze.DICTIONARYVALUE AS GLAZENAME
                                     from TP_PM_InProduction left join TP_PM_GroutingDailyDetail gdd on gdd.GroutingDailyDetailID = tp_pm_inproduction.GroutingDailyDetailID
                                      left join tp_mst_logo
                                     on TP_PM_InProduction.logoid=tp_mst_logo.logoid
-                                    LEFT JOIN TP_MST_GOODS G ON G.GoodsID = tp_pm_inproduction.goodsid
-                                    where TP_PM_InProduction.BarCode=:barcode";
+                                    LEFT JOIN TP_MST_GOODS G ON G.GoodsID = tp_pm_inproduction.goodsid 
+                                    LEFT JOIN TP_MST_DataDictionary glaze ON glaze.DICTIONARYID = gdd.GLAZETYPEID
+									where TP_PM_InProduction.BarCode=:barcode";
 							paras = new OracleParameter[]{
 								new OracleParameter(":barcode",barcode),
 							};
@@ -1604,6 +1601,7 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
 								dr[Constant.BarCodeResultTableColumns.out_logoID.ToString()] = ds.Tables[0].Rows[0]["logoid"].ToString();
 								dr[Constant.BarCodeResultTableColumns.out_logoCode.ToString()] = ds.Tables[0].Rows[0]["logoCode"].ToString();
 								dr[Constant.BarCodeResultTableColumns.out_logoName.ToString()] = ds.Tables[0].Rows[0]["logoName"].ToString();
+								dr[Constant.BarCodeResultTableColumns.out_glazeName.ToString()] = ds.Tables[0].Rows[0]["glazename"].ToString();
 
 								dr["GOODSMODELforCheck"] = ds.Tables[0].Rows[0]["GOODSMODELforCheck"].ToString();
 								dr["PlateLimitNum"] = ds.Tables[0].Rows[0]["PlateLimitNum"];