1

duhe

2 天以前 78549fbacdf433bb0026a2c2f41351e9638cb3d4

 WebAPI/Controllers/SCGL/Sc_MESBeginWorkBillController.cs

@@ -1038,14 +1038,14 @@
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "工单暂未处理,可以操作！";
                    objJsonResult.Message = "工单已处理,不允许操作！";
                    objJsonResult.data = null;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "工单已处理,不允许操作！";
                    objJsonResult.Message = "工单未处理,允许操作！";
                    objJsonResult.data = null;
                }

@@ -1662,7 +1662,17 @@
                ClsSc_MESBeginWorkBillMain.HICMOInterID = int.Parse(ds.Tables[0].Rows[0]["HICMOInterID"].ToString());
                ClsSc_MESBeginWorkBillMain.HICMOEntryID = int.Parse(ds.Tables[0].Rows[0]["HICMOEntryID"].ToString());
                ClsSc_MESBeginWorkBillMain.HICMOBillNo = ds.Tables[0].Rows[0]["HICMOBillNo"].ToString();
                ClsSc_MESBeginWorkBillMain.HProcExchInterID = int.Parse(ds.Tables[0].Rows[0]["HProcExchInterID"].ToString());
                ClsSc_MESBeginWorkBillMain.HProcExchEntryID = int.Parse(ds.Tables[0].Rows[0]["HProcExchEntryID"].ToString());
                ClsSc_MESBeginWorkBillMain.HProcExchBillNo = ds.Tables[0].Rows[0]["HProcExchBillNo"].ToString();
                ClsSc_MESBeginWorkBillMain.HPeopleSum = 1;

                //获取班次
                DataSet set = oCN.RunProcReturn("exec h_p_Gy_GetWorkShiftInfo " + int.Parse(ds.Tables[0].Rows[0]["HDeptID"].ToString()) + "," + int.Parse(ds.Tables[0].Rows[0]["HCenterID"].ToString()), "h_p_Gy_GetWorkShiftInfo");
                if (set.Tables[0].Rows.Count > 0)
                {
                    ClsSc_MESBeginWorkBillMain.HWorkShiftID = int.Parse(set.Tables[0].Rows[0]["HInterID"].ToString());
                }
                ds = oCN.RunProcReturn("select * from h_v_Cj_GetDefValByUser where 用户名称='" + user + "'", "h_v_xt_UserAssociationSelect");

                //if (ds.Tables[0].Rows[0]["HGroupID"].ToString() == "0")
@@ -1710,6 +1720,7 @@
                }

                oCN.BeginTran();
                DataSet ds2 = null;
                //保存
                //保存完毕后处理
                bool bResult = false;
@@ -1745,8 +1756,29 @@
                    }
                }

                string sReturn = "";
                if (oSystemParameter.ShowBill(ref sReturn) == true)
                {
                    if (oSystemParameter.omodel.WMS_CampanyName == "华舟")
                    {                       
                        LogService.Write("自动生成工作联系单...");

                        //自动生成工作联系单
                        ds2 = oCN.RunProcReturn("exec h_p_OA_WorkLinkBill_Create " + ds.Tables[0].Rows[0]["HInterID"].ToString() + "," + 3772, "h_p_OA_WorkLinkBill_Create");
                    }
                }

                oCN.Commit();

                if (ds2 != null && ds2.Tables[0].Rows.Count > 0)
                {
                    int HInterID = int.Parse(ds2.Tables[0].Rows[0]["NewHInterID"].ToString());
                    LogService.Write("执行消息推送..." + HInterID);

                    // 触发消息推送
                    Service.GeTuiService.PubishSingle(HInterID);
                }

                if (bResult)
                {