From 92f20a5913ab53389e9d91de9d1e174b0161625d Mon Sep 17 00:00:00 2001 From: fei550 <1420031550@qq.com> Date: Wed, 6 Nov 2024 09:59:54 +0800 Subject: [PATCH] 1 --- .vs/SGGL_SeDin_New/v17/.wsuo | Bin 65536 -> 64000 bytes .../API/HJGL/APIPipelineComponentService.cs | 6 ++- .../WeldingManage/PipelineComponentService.cs | 35 ++++++++++-------- .../APIItem/HJGL/PipelineComponentItem.cs | 2 + 4 files changed, 26 insertions(+), 17 deletions(-) diff --git a/.vs/SGGL_SeDin_New/v17/.wsuo b/.vs/SGGL_SeDin_New/v17/.wsuo index aac6161431d64c86e12b00ceec5c95864a8a96d7..a6886c552170002e0ece760cd7229e6f0c330709 100644 GIT binary patch delta 1419 zcmdUvO-vI(6vubATU_dHODXlEG(gK1inh{iOF=C1QBb}F1mevEv2ZY&cxV-sq%|R) zI7mkmj|MNs#Kf={jwYI*hJ>RB&)&S4ltdDx{$FTAjV6+Ka*|)?eaxGg_uuYjvr;y1 zdUZpTmHBsHT0gNmo)!x%z|*ENm8pUth@gPMS8STv3a4TWKNxn-r23!@7NuR76;KT< z;3S~(UF2lUZg7};BVGDkB_u$qA%SixStPzV<7s^T2Ntb;I!fGB7K zG0+Y=z-iD4&VV@R0%t)t=mEW;4 zse1@MsZJFY#T?~n98B|?vZ|8i&SLC8(Ohv$qz7-XxFr&T_gH#V49BV0y zP?Wl**;uzE*+1@}#6{M~x2+lG}Y_gaO56Y!SM(>i53Qse+Br`?K^q&s# z9s3CHuLnt8FnTqd49-TvSAuhTG~Cu6nbq~ktnt#n!HiUB znXT4|IqzG=gj2Qhlk?tbIZz%*HE!{QwadtA36Z}MbtB*Om>uvi_lAis-0;hVJxQ|< z2h{K#--o>oI~11F5__k_vTQXfu6BxRRSBlD6UD0(HH0$u}^k9+RDlSri{66*0Y zf@ZSp_0jEbnVn+7BHK!_v?iTOr&6h$U=f3E8JxOiDCtdjU>J$1H^#Zi1}zJ$0hz!J zzH$S`2FMm50j_IT*tpJzdD-?|TU<1)&>fKTK>^^UYzE4AcvDamExb%+Zrie~r&{qw zd>^zH5CZ!_D>wiSfhe!5PYS1F{-(>iq3mhc3xSl5h1=nQF_hyK?BzCB$jkY zO7}A$^Ib8JBP-kUSN%q;Y)dwLm8?pK*Z#*H*8S)(ubP;YOGZgcPHDZGH;n>PAd`2E zQ$U}jY-Cab}Qb4Ov1mr(P=}0YBWx zxpc=UYJNpe1Rr??wS39a&wlk=7ZjG9?0;~gOSubd6UD4?irTDXv_)7U#cXlrq*>dr zv)Er+*;(%Od3>eiK2J%P-|wj?FZX*Q;gaI8*I!XuQr0Qo-!h%XV{H2=#`d_#ub`Rc z3!ZC*<@7)5PB}vw<(BiG1w{+75UWp)x`Kj^@$XzKN|sYax7jMI$(v@P2fkP7vb~YV zq?A3uwouFw)bfquhhC{e<|`X@OLKf<6&ppXf>fuk8QsBXs!=Vg^B35tT}Ybt z&@-!Bj+#P@o(XQz2OqCI@6QmDuDb7QD89*(MNfXW46l}rmI)KpFGLN4-|oE)A^A=1 zxIVKl($m+SKQJ&rcN&i&pLwFWfl+#>p04kkp{@ICq.Value==x.State.ToString()).Text.Trim(), PlanStartDate = string.Format("{0:g}", y.PlanStartDate), QRCode = x.QRCode, ReceiveMan = p.PersonName, ReceiveDate = string.Format("{0:g}", x.ReceiveDate), UnitWorkName=unitwork.UnitWorkName, + Remark = x.Remark }).FirstOrDefault(); bool isPower = Person_PersonsService.IsGeneralUnitByPersonId(personId, projectId); pipelineComponentDetail.pipelineComponentItem = q; @@ -83,12 +85,12 @@ namespace BLL { if (!string.IsNullOrEmpty(message)) { - q.State = HJGL_PipelineComponentService.state_Msg; + q.State = HJGL_PipelineComponentService.StatePenRec; q.Remark=message; } else { - q.State = HJGL_PipelineComponentService.state_1; + q.State = HJGL_PipelineComponentService.State1; } q.ReceiveMan = PersonId; diff --git a/SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs b/SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs index 091b54e0..1eb1927d 100644 --- a/SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs +++ b/SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs @@ -12,23 +12,27 @@ namespace BLL public class HJGL_PipelineComponentService { /// - /// 验收不合格 + /// 待整改 /// - public static int state_Msg = -1; + public static int StatePenRec = -2; + /// + /// 已整改 + /// + public static int StateRec = -1; /// /// 未验收 /// - public static int state_0 = 0; + public static int State0 = 0; /// /// 已验收 /// - public static int state_1 = 1; + public static int State1 = 1; /// /// 已装箱 /// - public static int state_2 = 2; + public static int State2 = 2; /// @@ -37,11 +41,12 @@ namespace BLL /// public static ListItem[] GetState() { - ListItem[] list = new ListItem[4]; - list[0] = new ListItem("未验收", state_0.ToString()); - list[1] = new ListItem("已验收", state_1.ToString()); - list[2] = new ListItem("已出库", state_2.ToString()); - list[3] = new ListItem("验收不合格", state_Msg.ToString()); + ListItem[] list = new ListItem[5]; + list[0] = new ListItem("未验收", State0.ToString()); + list[1] = new ListItem("已验收", State1.ToString()); + list[2] = new ListItem("已出库", State2.ToString()); + list[3] = new ListItem("待整改", StatePenRec.ToString()); + list[4] = new ListItem("已整改", StateRec.ToString()); return list; } /// @@ -199,7 +204,7 @@ namespace BLL model.PipelineId = PipelineId; model.PipelineComponentCode = model_mat.PrefabricatedComponents; model.DrawingName = model_mat.PrefabricatedComponents.Substring(0, model_mat.PrefabricatedComponents.LastIndexOf('-')).Replace("\"", ""); - model.State = state_0; + model.State = State0; model.ProductionState = 0; UpdatePipelineComponent(model); } @@ -210,7 +215,7 @@ namespace BLL model.PipelineId = PipelineId; model.PipelineComponentCode = model_mat.PrefabricatedComponents; model.DrawingName = model_mat.PrefabricatedComponents?.Substring(0, model_mat.PrefabricatedComponents.LastIndexOf('-')).Replace("\"", ""); - model.State = state_0; + model.State = State0; model.ProductionState = 0; model.IsPrint = false; AddPipelineComponent(model); @@ -290,9 +295,9 @@ namespace BLL public static void UpdateOutState(string pipelineComponentId,string BoxNumber) { var q=GetPipelineComponentById(pipelineComponentId); - if (q.State==state_1) + if (q.State==State1) { - q.State = state_2; + q.State = State2; q.BoxNumber=BoxNumber; UpdatePipelineComponent(q); @@ -408,7 +413,7 @@ namespace BLL Model.SGGLDB db = Funs.DB; var q = (from x in db.HJGL_Pipeline_Component join y in db.HJGL_Pipeline on x.PipelineId equals y.PipelineId - where y.ProjectId.Contains(projectId) && x.State.Equals(state_1) && + where y.ProjectId.Contains(projectId) && x.State.Equals(State1) && (string.IsNullOrEmpty(pipelineCode) || y.PipelineCode.Contains(pipelineCode)) && (string.IsNullOrEmpty(pipelineComponentCode) || x.PipelineComponentCode.Contains(pipelineComponentCode)) && (string.IsNullOrEmpty(flowingSection) || y.FlowingSection.Contains(flowingSection)) diff --git a/SGGL/Model/APIItem/HJGL/PipelineComponentItem.cs b/SGGL/Model/APIItem/HJGL/PipelineComponentItem.cs index 3f2c824c..bc9a91a7 100644 --- a/SGGL/Model/APIItem/HJGL/PipelineComponentItem.cs +++ b/SGGL/Model/APIItem/HJGL/PipelineComponentItem.cs @@ -14,11 +14,13 @@ namespace Model public string DrawingName { get; set; } public string BoxNumber { get; set; } public int? State { get; set; } + public string StateStr { get; set; } public string PlanStartDate { get; set; } public string QRCode { get; set; } public string ReceiveMan { get; set; } public string ReceiveDate { get; set; } public string UnitWorkName { get; set; } + public string Remark { get; set; } } public class PipelineComponentDetail {