From bf5dfe5c1078c71b0495371aecd56e38714a1daa Mon Sep 17 00:00:00 2001 From: wenjy Date: Tue, 24 Oct 2023 17:19:39 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E5=87=BA=E5=BA=93=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E6=B7=BB=E5=8A=A0=E5=9C=A8=E9=80=94=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/HighWayIot/v17/.suo | Bin 526336 -> 526336 bytes Aucma.Scada.Business/OutStoreBusiness.cs | 5 +++-- Aucma.Scada.Model/domain/BaseSpaceInfo.cs | 6 ++++++ ...ma.Scada.UI.csproj.AssemblyReference.cache | Bin 43658 -> 43558 bytes ....Repository.csproj.AssemblyReference.cache | Bin 22071 -> 22055 bytes .../service/Impl/BaseSpaceInfoServiceImpl.cs | 2 +- .../HighWayIot.csproj.AssemblyReference.cache | Bin 18694 -> 18694 bytes 7 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.vs/HighWayIot/v17/.suo b/.vs/HighWayIot/v17/.suo index a55a833e9b98e38467dcae07bd67d3f4d6569eb3..df8964488736864fc160825f3f25dbe06f180606 100644 GIT binary patch delta 1885 zcmbW1e@sm@5Al!G3U$sLW7b-8MsB)7riI+T4_;iO>8yAA?0L?6 z-uFDu^L^g;_J0?aDrHX@L@OXV_=iWl{1y6;e8~DT6u2qQn+(L1CyjS*p*-opiL_5UD!m} zdSC-hKm++;76^-Da^|Av;i2NGa*Jse!wb6+JP~=`09yov)#Av05>9gD#VfF75q|;f z``}qXp|_&CyQ12%F2jnMcwh(bfGiLLC{#172Xso}f@OiN9j+fN2BfXz$@^d0iZRum zRgRBPCe%ezmf|@hmQG>RZ0jvhprFTIoNCMRJ z^?2r1>h|}ADHgRNoY2leEo9NM)R ztJ1-v^(Oj$Z|LlQ>9@0xt&atKbs^&?=A_gK8WZeZDU+~aAmM812|Q#kVKUva=?fry zbGm7B%ELE{$<&3Wd;4V;s&{eIRmQoQ;TTR0_MUJWeb$wO2il50ob1Tj9bcZdEAHT* zB?YhMuPHR6JI9Y#i@?<+^Hy&x)026~>#~|IyYpW;95G$xBeOzHx0yPQ>@c*(I(4y` zQ+vS@N~VwvBXPRUgT4$iW9u+8G8kt;QJlTP^tS#IC0s>Laf*9{uV{@-{{Xt~=2(%9 z1%nsrU;cerPQ$+MkNupJ#d+0dBlVy6cg?zVCNU+@a{kSWHx^R3d#Z)QhoIFGa2+D` z!S>?NW}>5KaptbTzqv}1M)A(F7Pk&|dY^booY6aZ$XCLw^do4ABq4lTs${y7(}G*R z!dJgF?|h)f3vcUd+PO_?vR3Jq(sCY)pMIj?Bl?SGUVH&$ocnw@92RSXq14=hi* zH1VUmWXlgCP;3wQt>RpxCzv=W26?VImS|(Ko~a9rFdj)%joQWL(Zp0dNfLrdW%Sl_ z_+Wd~7yI}9T9EK*>UXCY(3y4LXsmEW`(qlh%g|B;WunM?^8R+chT zm%=o<&JWUNFXEr1T9*X;M@b{9##qFt9NEZYd@A|wNaB=jtrqx8shyEH|E~=UG`e@V T^BLeE3dq0$lmU0XdU@z?PG~H& delta 2362 zcmbu=eQXnD90%}wp5C?H)|PH7qs*}tD5DG}9gH$yK*t6Q*gHes+}L2?rWlzN9Wb^t ziWnr3>qFLPqK=agMPB4ioe5?MvOj=KXi&*QX0niokZ4@O@FjuO?*lCogsAb7&wkJI zd+wg+?)Thv@_v`R-?iU6R)`&TL9n20gyBde!qWt@mCEF}`Dl!R39P>R7ezi4q?@e+ zr8^yadcFrDgLIa*>z;tDqQoZX9A26auf= zOIRwxDy6lV@#xvW0WZKLmbyvHe_;4G2?1} z&-{LQDfx^p#3hgu?eiQzSgz=9zgJN~NWw9<-5Qm--THl(Rp|m_+vk~3lh%ZyHJYA$9m8nW;IfIW*jpA zZbu}(qRij&ld_X&mQF&3mF9K#8>*cKJI+W1Qw!{%CxdyZRUhiG5Usd~i2M#>Sr%CG ziSABvJ)BM6r#h+D;HJ7etv^GNU2$Jwvc16A=_8|<|H$uR0iP%Tddad##9=`G>mw z{!F_o_=g(*1rdZ^Bn3eq-bSf9kCGre&E5`$D^1=|`exCl_w6V#=mX5Ix2Zm= z9XLQ-D^3knExfh0{JNvmqSSWW?!3J6^06D*kHVUpB^|A`zcHo2p~z+yZuSQAyIm)J zpCA3c+W5hz#e1$4Ts`((=%>+bGs5{_o^XA%?+>>52c}#brQga=AnH4!()_5(uEZVk z%Br1I4baf5-E@4YuFT}nXC697G}{1S12@f1{xRJ~VR#%yjDSD|LH&@bb(ELE^I#dO zG5VM?2p>zugItwK-foEbbVZgbM zs68}jFEaDrfoZX`19s%krm1IXXhEaNrMs>TNNVrjA7TzJc{5Q<U@K^@e?de{IBuo3pc7L+trYW%CYa3o%lTlRSJ2v9J9 O2oe~(Jb9+Ri+=)_l!rS2 diff --git a/Aucma.Scada.Business/OutStoreBusiness.cs b/Aucma.Scada.Business/OutStoreBusiness.cs index 37f06fc6..81e1cc34 100644 --- a/Aucma.Scada.Business/OutStoreBusiness.cs +++ b/Aucma.Scada.Business/OutStoreBusiness.cs @@ -272,8 +272,8 @@ namespace Aucma.Scada.Business //{ // spaceInfo.spaceStock = spaceInfo.spaceStock + 1; //} - - //_spaceInfoService.UpdateSpaceInfo(spaceInfo); + spaceInfo.outRouteAmount += 1; + _spaceInfoService.UpdateSpaceInfo(spaceInfo); } #region 轮询获取出库任务下发至PLC，等待PLC执行反馈，完成后再次下发 @@ -448,6 +448,7 @@ namespace Aucma.Scada.Business //读取PLC获取货道信息：存放数量、在途数量 //spaceInfo.materialType = taskInfo.materialType; spaceInfo.spaceStock -= 1; + spaceInfo.outRouteAmount -= 1; if (spaceInfo.spaceStock == 0) { spaceInfo.materialType = string.Empty; diff --git a/Aucma.Scada.Model/domain/BaseSpaceInfo.cs b/Aucma.Scada.Model/domain/BaseSpaceInfo.cs index d43b011f..e9436815 100644 --- a/Aucma.Scada.Model/domain/BaseSpaceInfo.cs +++ b/Aucma.Scada.Model/domain/BaseSpaceInfo.cs @@ -74,6 +74,12 @@ namespace Aucma.Scada.Model.domain [SugarColumn(ColumnName = "ONROUTE_AMOUNT")] public int onRouteAmount { get; set; } + /// + /// 出库数量 + /// + [SugarColumn(ColumnName = "OUTROUTE_AMOUNT")] + public int outRouteAmount { get; set; } + /// /// 入库标识:1-允许入库；2-禁止入库 /// diff --git a/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache b/Aucma.Scada.UI/obj/Debug/Aucma.Scada.UI.csproj.AssemblyReference.cache index 6f44751a0989fe596af7c9481c2d34f3beb81cf8..297f546cb3fc3ba2a8629ff1210e5aa89c71e1ba 100644 GIT binary patch delta 236 zcmeCW%CzhX(}XJ4-)uW|iZ<3qGEQ!Y_L!`~?moGg$$Ro4Cilr#+&w2pF?%sGOsn*iT_&$*Nt^70*lwMoE4Mi&M>FeA-Y|)Evc53yW==M7 zMzC2RGk3FlPUaLan{3CC%ew#i9-X4i8#sI!Co^){L50mXZ{Rw>%)znbKE$L(Q7xEB zlizdLPyV07z4;&CH)dA;cMpNOe+tDybb}lSakS9n|6Gz_CxScxa{L4@KadkQ&l7ty F82|^-Sk?dl delta 303 zcmZ2>g{kW*(}XJ4b(*VkGB?&oGERP=!7*7OI%=|&sOjYO(HxVrncTtjHYR5<{fFCk zvKzA-m_32n0ZdUc1T4 zti`OSg{;*wH_v8;+LRN`2e-+S$7gaoyDQK{w#nVR*^?VmcqY4YXmPwh6eyi`xCv4@Yzpd9oy; zeDy4>^&KFaw+h8V{0Py;G5HVo%*i>?-aw3S3B<3QlMTK6Ckwc$PTs)Fzu8Lc&13)- CuyFJM diff --git a/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache b/HighWayIot.Repository/obj/Debug/HighWayIot.Repository.csproj.AssemblyReference.cache index f0f6b71af4744c2c7c50bc85428ed1960f671181..d55bf36fd4040b7f566289c334489d89c0372f06 100644 GIT binary patch delta 63 zcmdnKhH?2C#t9{?`>*fODcV@+%Q*QIqut~w%IcH%vIcK%W7^Ej%CY3WPSIvNHlSQT OyE{~lf3pCGx*q^UxfjR) delta 66 zcmZ3!hH?8E#t9{??+*n^r){kCWt`lg!!h|3qt)bAIql8bOl&Ny-0U^dX`9X1pmOc( P&LFwT+D!bLIMn?B96c36 diff --git a/HighWayIot.Repository/service/Impl/BaseSpaceInfoServiceImpl.cs b/HighWayIot.Repository/service/Impl/BaseSpaceInfoServiceImpl.cs index bb13a1f7..1b0a56c6 100644 --- a/HighWayIot.Repository/service/Impl/BaseSpaceInfoServiceImpl.cs +++ b/HighWayIot.Repository/service/Impl/BaseSpaceInfoServiceImpl.cs @@ -110,7 +110,7 @@ namespace HighWayIot.Repository.service.Impl try { Expression> exp = s1 => true; - exp = exp.And(x => x.storeCode == store && x.materialType == materialType && x.spaceStatus == 1 && x.spaceStock > 0); //相同型号、启用状态、库存不为空的货道信息 + exp = exp.And(x => x.storeCode == store && x.materialType == materialType && x.spaceStatus == 1 && x.spaceStock - x.outRouteAmount > 0); //相同型号、启用状态、库存不为空的货道信息 spaceInfos = _mesRepository.GetList(exp); diff --git a/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache b/HighWayIot/obj/Debug/HighWayIot.csproj.AssemblyReference.cache index d4a84e2a150726aa4f943d35a4bf4e79a3a582af..835e29a10c16c7e85ce7276d9bc285ec80796046 100644 GIT binary patch delta 20 ccmZph#Mm~8al;-aR{nPnb&570WO8)_09H8&BLDyZ delta 20 ccmZph#Mm~8al;-a)|(sZrPDSaWO8)_09YUhFaQ7m