333

DK.Service/PDAModuleLogic/PDAModuleLogicEntrucking.cs

@@ -495,27 +495,18 @@ namespace Dongke.IBOSS.PRD.Service.PDAModuleLogic
                             ";
                         int execute = conn.ExecuteNonQuery(sqlStr);
                         //修改装具状态
-                        if (execute > 0) {
-                            sqlStr = $@"UPDATE TP_PM_ENTRUCKING SET STATUS = '0' WHERE ENTRUCKINGCODE = '{entruckingCode}' ";
-                            execute = conn.ExecuteNonQuery(sqlStr);
-                            if (execute > 0)
-                            {
-                                conn.Commit();
-                                sre.Status = Constant.ServiceResultStatus.Success;
-                                sre.Message = "操作完成！";
-                            }
-                            else
-                            {
-                                sre.Status = Constant.ServiceResultStatus.NoModifyData;
-                                sre.Message = "操作失败，没有更新任何数据！";
-                            }
-                            }
-                            else
-                            {
-                                sre.Status = Constant.ServiceResultStatus.NoModifyData;
-                                sre.Message = "操作失败，没有更新任何数据！";
-                            }
+                        sqlStr = $@"UPDATE TP_PM_ENTRUCKING SET STATUS = '0' WHERE ENTRUCKINGCODE = '{entruckingCode}' ";
+                        execute = conn.ExecuteNonQuery(sqlStr);
+                        if (execute > 0){
+                            conn.Commit();
+                            sre.Status = Constant.ServiceResultStatus.Success;
+                            sre.Message = "操作完成！";
+                        }
+                        else{
+                            sre.Status = Constant.ServiceResultStatus.NoModifyData;
+                            sre.Message = "操作失败，没有更新任何数据！";
                         }
+                    }
                     else
                     {
                         sre.Status = Constant.ServiceResultStatus.NoSearchResults;

DK.Service/PMModuleLogic/PMModuleLogicDAL.cs

@@ -78,33 +78,29 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                 string logoCode = string.Empty;
                 string logoName = string.Empty;
                 string groutingdate = string.Empty;
-                #region 查询工序信息
-                ProcedureEntity procedure = GetProcedurByID(oracleTrConn, procedureID);
-                procedureInfo = procedure;
-                #endregion
-                if (barcodeTable.Columns.Contains("IsPDA"))
-                {
-                    if (procedure.ModelType != (int)Constant.ProcedureModelType.DeliverMud)
-                    {
-                        if (barcodeTable.Columns.Contains("IsPublicBody"))
-                        {
-                            barcodeTable.Columns.Remove("IsPublicBody");
-                            barcodeTable.Columns.Remove("IsPDA");
-                        }
-                    }
-                }
 
                 #region 验证是否扫描的是装具条码，是则不考虑工序的采集方式，均为集中采集。并查询出车上的所有条码
-                if (barcodeTable.Rows.Count == 1) {
+                int flag = 0;
+                if (barcodeTable.Rows.Count == 1)
+                {
                     //判断装具状态
                     DataTable dt = GetTruckStatus(oracleTrConn, barcodeTable.Rows[0]["Barcode"] + "");
-                    if (dt != null && dt.Rows.Count > 0) {
-                        if (dt.Rows[0]["STATUS"].Equals("1")) {
+                    if (dt != null && dt.Rows.Count > 0)
+                    {
+                        if (dt.Rows[0]["STATUS"].Equals("1"))
+                        {
                             dt = GetTruckBarcode(oracleTrConn, barcodeTable.Rows[0]["Barcode"] + "");
                             if (dt != null && dt.Rows.Count > 0)
                             {
-                                barcodeTable = dt;
-                                procedure.CollectType = 1;
+                                DataTable newbarcodeTable = new DataTable();
+                                newbarcodeTable = barcodeTable.Copy();
+                                newbarcodeTable.Rows.Clear();
+                                foreach (DataRow row in dt.Rows) {
+                                    DataRow item = barcodeTable.Rows[0];
+                                    item["Barcode"] = row["Barcode"];
+                                    newbarcodeTable.ImportRow(item);
+                                }
+                                flag = 1;
                             }
                             else
                             {
@@ -112,7 +108,8 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                                 return dtBarCode;
                             }
                         }
-                        else {
+                        else
+                        {
                             dtBarCode.Rows[0][Constant.BarCodeResultTableColumns.out_errMsg.ToString()] = "装具未使用！";
                             return dtBarCode;
                         }
@@ -120,6 +117,25 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
                 }
                 #endregion
 
+                #region 查询工序信息
+                ProcedureEntity procedure = GetProcedurByID(oracleTrConn, procedureID);
+                if (flag == 1) {
+                    procedure.CollectType = 1;
+                }
+                procedureInfo = procedure;
+                #endregion
+                if (barcodeTable.Columns.Contains("IsPDA"))
+                {
+                    if (procedure.ModelType != (int)Constant.ProcedureModelType.DeliverMud)
+                    {
+                        if (barcodeTable.Columns.Contains("IsPublicBody"))
+                        {
+                            barcodeTable.Columns.Remove("IsPublicBody");
+                            barcodeTable.Columns.Remove("IsPDA");
+                        }
+                    }
+                }
+
                 #region 防止多次重复提交，导致数据重复
                 // 通过锁定表tp_pm_usedbarcode中的条码，防止多次重复提交，导致数据重复
                 // TODO PDA还没有修改，暂时注释。PDA（集中采集画面）点击保存时如果不成功提示消息后，清除了当前画面中的数据。应该不清空数据，可以继续保存。
@@ -6668,15 +6684,12 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
             {
                 string sqlStr = $@"
                         SELECT
-	                        TD.BARCODE,G.GOODSCODE,P.PROCEDURENAME,U.USERCODE
+	                        TD.BARCODE,U.USERCODE AS GROUTINGUSERCODE
                         FROM
 	                        TP_PM_ENTRUCKINGDETAIL TD
 	                        INNER JOIN TP_PM_ENTRUCKING T ON T.ENTRUCKINGCODE = TD.ENTRUCKINGCODE AND T.BATCH = TD.BATCH
 	                        INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD ON GDD.BARCODE = TD.BARCODE
-	                        INNER JOIN TP_PM_INPRODUCTION IP ON IP.BARCODE = TD.BARCODE
-	                        INNER JOIN TP_PC_PROCEDURE P ON P.PROCEDUREID = IP.PROCEDUREID
-	                        INNER JOIN TP_MST_USER U ON U.USERID = IP.USERID
-	                        INNER JOIN TP_MST_GOODS G ON G.GOODSID = GDD.GOODSID
+	                        INNER JOIN TP_MST_USER U ON U.USERID = GDD.USERID
                         WHERE
 	                        TD.ENTRUCKINGCODE = '{entruckingCode}' 
 	                        AND T.STATUS = '1'