From 784b72c040f71966114f29417853d408e2f58026 Mon Sep 17 00:00:00 2001
From: "USER-20220102CG\\noblelift" <546428999@qq.com>
Date: Thu, 31 Aug 2023 22:01:57 +0800
Subject: [PATCH] =?UTF-8?q?rev=20=E6=96=B9=E5=90=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/nl/acs/device/wql/task_inst.xls  | Bin 157184 -> 157184 bytes
 .../agv/ndcone/AgvNdcOneDeviceDriver.java     |  36 +++++++++---------
 .../ConveyorPressStationDeviceDriver.java     |  10 +++--
 .../wms/service/impl/WmsToAcsServiceImpl.java |   1 +
 4 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device/wql/task_inst.xls b/acs/nladmin-system/src/main/java/org/nl/acs/device/wql/task_inst.xls
index cca434e2060c067f2fd7f3af8a4a1f4da6bb47fd..46630dad4d07bd631bc24329a62043c0ada98bcb 100644
GIT binary patch
delta 3024
zcmc&$X-rgC6#nj;VPHmq0S0ko6;u=khY_k`8pPsK(E^HA3naMVE?RJDDmvB*8h1Qa
zliCQxS{GET&s}hdZ5mvwO{1cv*8VWjq^;UEwl352-UCGFq^UpJ_cGu2?sv{T=iGDe
zyqP5zj7u&U_s`TDV2_z~@g^1OOQoU*^r!xwPsKOgSh*oIi~P_dpq=oL4Sw4tYG?7L
zY(HPB4lr7UBv$2QWjJ8LEda?_FPKm&=t@A4qm|XzY<+o_saYq7CFtdt0{u}VHO3s@
z)@poVEo*D_dSN}&+6uh>BJTrBkPy^4un}9<aFCO`oXzV}edG~=D|F6IZ28S)1{4?N
z(uYUf=1#QL<J{;mZuFjR^x&4dvqfTiOG69Y=0*>7qqlRT|6M_xA9{BQ64XGU?DBGl
z!rbUuL2doDg4*g`B5o&gtJ@kJZW1J_x|LRTT1Pj+{HL_q5@q|;>$K|EyoF6NUQwsC
z;7}1knZZFCIwP7R;#FgE1huKnk^V((%BKA<i5v4eU;2Wm;(u3=KR~&mgREBAxPuYE
z<E8?%4qEAW=sLE>y0K0O8zO>fcbMJT_S_}AId>*EdXgKR5B5KwYhFn6JLffZf>oX#
zUhYLdbWbPW?pLWt4@<lfCzcl|U<CU5`K3gpL_j(nQS4<wu~*Z|6+Vqan<^|6=SZf_
zju4t{Gt-nF8qe+(Lj7aRv?D&As_bU+wWrVw_EEI6j(EBsYo@3e&38*L8zm%YT6m(3
z>~SGf6`M)x*lu^2DMuZfsi@Is82enaDL!V(h)JOZJoZe`Vm(T*(Ka4GiM3H5{y1%8
zNf&3Mb+MW~%Vwjy@ixk^hsdWA6NOq(G#7c_ZlfwLPS^7(MRVY2cAUtQlq4tY+9IZ~
z--5Ve`mjd@1@K~K*fUAjD_8aTs+Z;?bCFdst7Tp9a6NTO@)xH_Bw6Lie#-)#)iaf@
zNkZgK*jxfLj?PoYda*oz;?!SP`Ak-{>P4D1C%<6g!s1n96fLt%(|$}B?{%K8Xg&!0
zNYQj+>Waukfq5lpkMauD3v<U8%}~bA>a_8+f}**~jEmxD>Xtdu^NY|_9WYsTW-beL
zO7P$xA{@*28zp#-C;BLp)XNCHVwyCqFn{9QX|oGj+g+G0ywH#Wo(B{R06t+}KL|Lf
z2QD%{VIDphc;5p!%lv>jcL=c30E~MRSnJ8JmB67uDj%y#=F7}UX}}adc~_WS%*n%m
znI_;Cv#A}BHyl{Q-1RLWi!*=C{G2%}9r(Z-Xkc#d1FXmZ4l{>l0>gZP5@wk>a3tsR
z14d^7A3FIPQN<58m^+LD1_l6InCqAyFo#=!p`(EX%ni)#1A+N(1D`VAVm5W)m5kw)
zFn`JXh`HlfU~mvn#(av|#T?fWnD-8_joF;di?RZR%v~$^At(nJ#J?Qpm>)CG$py9s
z19zDNLx382`s}OiO?9*Q{rxWR`CKx)_Q(&5%RGZRqceC55yiK{UHN9FrOQUpoz)#k
zlngXnn$NWt^PJPdgRZ#x$f>1&7)*7Gx#eqsz3UZ=Y*>5E-!ORt&~GD;E2w^dw)|b?
zCCSux6L4=UP+zY2kzs9LdGGd)I_n`E=G{ICe|}F0er~#tP{YoJ;wWYB$`Z$D->wYC
z=etrF-`K5Ssfy<qkCRVTsyIO-tD-~=%~$bb6;G;ohq0Cnd!pDUhOvgyRV-9-6JsqM
zXFNd-sv_-Ge7Z5#QX1m{DqxgpgNlb$tXJ{5ijn&i>)?Gm7=Kcq{i~zILF!%oyH9N;
z@A(11coxX1Q#vBo@88`ida-1Jo!6bmpCKvFpo|1gVUhr}k;J2X%6mFMt~kHaAf=hf
zb~RE=l{2oU8ze&*m0$1fW9L0m-miAPC5gVhKFt_(o=@maAc}llmE8SYd0@Sxi-e`L
z;Q40h`(I?U%Ue1uiG0a>XLt1<_BfT77wW~4LcLTpJfu;db6K-<hURPX<}*X3{zp<q
WNE^M4ODtW~06My&kNPZ6^85>26x7uK

delta 2538
zcmb7GYfzMB6n@^1Wmy(kS1xj00rA4+16){iY#gOQB(I?4C3QkGQ;bXn!jx@^L@iQr
zP7KqOikdoVDfKCG@e=l<Ov}(ep*f*WKeEZZROV%*^L-x(y6sf^&OXokKIgpWocFxn
zUdqq-mY?yhFEkiCRyNy4oTe3qwNmvBx@Wj%xslw+O1sc4$}R6eKVeji{dP%~9{`w8
zEts%YqPD=0Fi8?sbMkWR2!d)2>amKT5FycacOP?)k3Hy#2m)hpRO*U9-`(olW8Lg-
zHT76qpR@v_dh*`XYKsY0D`f0_ibI^d)75=Or672{mn)35KRT^|YE)l_sOSzptGk}$
zK~M0YCwtH%dh4!UiBozTdg-zU-R42}^PvAzL7X23PYKerK#}b7c!vgf(Dj1c{q=&}
z^+C}c4sNx(!R{e}L(^@vBYaa>gj-o%7exCaY;-UpwEI1tFZa>wb3KB#H~NtZ{3o62
zBSN~P{%_8=%?`6c=2mjvzq(U*<)w4BO>9l{U|lsJTZGfe0Vyu`UXAw9E3*fEqz9cZ
z<KOQhpx0xWu5GX>6;azvR1o()jg0dnIWCj3<1L|OrXZA=x=*R{3G{bvT~C+dlj%fS
z9i=5kQs;0h<t1g%0y&cQq`ynACd;%ZHIn=itQ3`^+hgSn%4B_Ys!S78Wcna^77b0(
zeQvXUhvT?pnKIMLlze+1L8S?~w6kk-l_P`Brw*f*L@Q<5^?+V>UOTK5n5J`ff^IM6
z;Q0<Un3ZbdW%@E9l75W0(iidizT2vwqfoO)uq`KX6pcvN_nzQ_)WcLI>M>hnolCpy
zza+_YI#H(kTqyB8Bw1F@rVJ8l0wryDltFppsWri_&_cCQk`QxWsI7z*F(vBSAl5Bh
zu=w{X%S);j>eRJm3zsffT~;+y)tahx?dlY<GG>XYS+MRsRr3;y*AH|C=U1W+Om&(U
zisu)-tggdP>Fa`}MaAllYvMXp<WBQ>+cw4vcu~2SyT<0~#1dgbMFw~S5b!kcA+sY3
zIBo!zGv8;v!Mw^FSTqi}$&75^9V3_i46xA$XkyOfry*-RaF+QJ^CDlMWCDL7GhbmY
zGy~-m0ka>MJqg&re9Fa>JkDG^8F<Kihxtu^pkfLaWC7$Hpn<uSd17B6J{M4!o2GKY
ze!$&nz+3##=HvnG%+1VW1A#Hma&YDv=BOaxSLRaYis>9T7zm#Me8gN(&J%NgKFLfz
z33CDSZRVrQ<3fP+S^Q)(?_^F21;U==IrAar(fk|Ie>PCZ+`^m{4lJF+AAaVbxxiNb
z3aerc<`4BeMJzkl$DH~K@ceSlUrcTFb&Auu#fMTWa|2@#0}0-U<)QLm3?^q~zW0dN
zxYu;KvQ;vHwmF9@7uMc2np5B4qBn5zYCX!vI|0VCo4GLJ^*yC{$G4JsdkuGXD|cy|
z>O;<rvy`#BL%qU2Lj&L6aRfl{P#%p#RI+!qI7~P9=7|Q%+LyyvvoDjeT|?V`bv~c*
z2<>8Qq@VZ4iYD^^SVg;r(=~jZv6;3oHd3pm{G_4pC#q)>V>3-<Y@`xRd0)e0ntqwF
zg}e{MilY>-;baY$YgnUUlZKZL>|vkEgR19V#$)u&!9OiSwgVlX0z*y$E5B0O>L)~m
z9Y-iq_{>Ep=AmMdK9uq^8;sJ!zSQ^pKoO~=o}XfrFp4VL<1E9tH{ka$9zsxKdx6>U
zHL&9Xka3+G`al_a(LP8rf@XKtN)LYP>T&d8MNAg8-;I~9Hb`Qj<e$-`{U4jB@wycT
hab$%-Dw_1Te&klJbj9Bn2WDu_UesoY-JLJ_{0#@@k%RyM

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
index dae5f3d..3ff35c6 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
@@ -214,7 +214,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
             //标准版-机械手对接位
             if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) {
                 lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) device.getDeviceDriver();
-                lnshPalletizingManipulatorSiteDeviceDriver.writing(2);
+                lnshPalletizingManipulatorSiteDeviceDriver.writing(3);
                 if (lnshPalletizingManipulatorSiteDeviceDriver.getMode() != 0
                         && lnshPalletizingManipulatorSiteDeviceDriver.getMove() != 0
                         && (lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 3 || lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 1)
@@ -247,7 +247,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
             //标准版-工位(交互模板)
             if(device.getDeviceDriver() instanceof LnshStationDeviceDriver){
                 lnshStationDeviceDriver=(LnshStationDeviceDriver) device.getDeviceDriver();
-                lnshStationDeviceDriver.writing(2);
+                lnshStationDeviceDriver.writing(3);
                 if(lnshStationDeviceDriver.getMode()!=0
                     &&lnshStationDeviceDriver.getMove() != 0
                             && (lnshStationDeviceDriver.getIo_action() == 3 || lnshStationDeviceDriver.getIo_action() == 1)
@@ -329,7 +329,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
             //标准版-下发条码输送线
             if(device.getDeviceDriver() instanceof ConveyorBarcodeDeviceDriver){
                 conveyorBarcodeDeviceDriver = (ConveyorBarcodeDeviceDriver) device.getDeviceDriver();
-                conveyorBarcodeDeviceDriver.writing(2);
+                conveyorBarcodeDeviceDriver.writing(3);
                 if (conveyorBarcodeDeviceDriver.getMode() != 0
                         && conveyorBarcodeDeviceDriver.getMove() != 0
                         && (conveyorBarcodeDeviceDriver.getIo_action() == 3 || conveyorBarcodeDeviceDriver.getIo_action() == 1)
@@ -362,7 +362,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
             //标准版-叠盘机 LnshFoldDiscSiteDeviceDriverl
             if(device.getDeviceDriver() instanceof LnshFoldDiscSiteDeviceDriver){
                 lnshFoldDiscSiteDeviceDriver = (LnshFoldDiscSiteDeviceDriver) device.getDeviceDriver();
-                lnshFoldDiscSiteDeviceDriver.writing(2);
+                lnshFoldDiscSiteDeviceDriver.writing(3);
                 if (lnshFoldDiscSiteDeviceDriver.getMode() != 0
                         && lnshFoldDiscSiteDeviceDriver.getMove() != 0) {
 //                        && (lnshFoldDiscSiteDeviceDriver.getIo_action() == 3 || lnshFoldDiscSiteDeviceDriver.getIo_action() == 1)
@@ -452,7 +452,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
             //标准版-机械手对接位
             if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) {
                 lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) device.getDeviceDriver();
-                lnshPalletizingManipulatorSiteDeviceDriver.writing(2);
+                lnshPalletizingManipulatorSiteDeviceDriver.writing(5);
                 if (lnshPalletizingManipulatorSiteDeviceDriver.getMode() != 0
                         && lnshPalletizingManipulatorSiteDeviceDriver.getMove() == 0
                         && (lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 3 || lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 2)
@@ -482,7 +482,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
             //标准版-工位(交互模板) LnshStationDeviceDriver
             if(device.getDeviceDriver() instanceof LnshStationDeviceDriver){
                 lnshStationDeviceDriver = (LnshStationDeviceDriver) device.getDeviceDriver();
-                lnshStationDeviceDriver.writing(2);
+                lnshStationDeviceDriver.writing(5);
                 if (lnshStationDeviceDriver.getMode() != 0
                         && lnshStationDeviceDriver.getMove() == 0
                         && (lnshStationDeviceDriver.getIo_action() == 3 || lnshStationDeviceDriver.getIo_action() == 2)
@@ -558,7 +558,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
             //标准版-下发条码输送线
             if(device.getDeviceDriver() instanceof ConveyorBarcodeDeviceDriver){
                 conveyorBarcodeDeviceDriver = (ConveyorBarcodeDeviceDriver) device.getDeviceDriver();
-                conveyorBarcodeDeviceDriver.writing(2);
+                conveyorBarcodeDeviceDriver.writing(5);
                 if (conveyorBarcodeDeviceDriver.getMode() != 0
                         && conveyorBarcodeDeviceDriver.getMove() != 0
                         && (conveyorBarcodeDeviceDriver.getIo_action() == 3 || conveyorBarcodeDeviceDriver.getIo_action() == 2)
@@ -588,7 +588,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
             //标准版-叠盘机
             if(device.getDeviceDriver() instanceof LnshFoldDiscSiteDeviceDriver){
                 lnshFoldDiscSiteDeviceDriver = (LnshFoldDiscSiteDeviceDriver) device.getDeviceDriver();
-                lnshFoldDiscSiteDeviceDriver.writing(2);
+                lnshFoldDiscSiteDeviceDriver.writing(5);
                 if (lnshFoldDiscSiteDeviceDriver.getMode() != 0
                         && lnshFoldDiscSiteDeviceDriver.getMove() != 0
 //                        && (lnshFoldDiscSiteDeviceDriver.getIo_action() == 3 || lnshFoldDiscSiteDeviceDriver.getIo_action() == 2)
@@ -695,7 +695,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
             //标准版-机械手对接位
             if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) {
                 lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) device.getDeviceDriver();
-                lnshPalletizingManipulatorSiteDeviceDriver.writing(13);
+                lnshPalletizingManipulatorSiteDeviceDriver.writing(4);
                 if (lnshPalletizingManipulatorSiteDeviceDriver.getMode() != 0
                         && lnshPalletizingManipulatorSiteDeviceDriver.getMove() == 0
                         && (lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 1 || lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 3)
@@ -728,7 +728,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
             //标准版-工位(交互模板)
             if(device.getDeviceDriver() instanceof LnshStationDeviceDriver){
                 lnshStationDeviceDriver = (LnshStationDeviceDriver) device.getDeviceDriver();
-                lnshStationDeviceDriver.writing(13);
+                lnshStationDeviceDriver.writing(4);
                 if (lnshStationDeviceDriver.getMode() != 0
                         && lnshStationDeviceDriver.getMove() == 0
                         && (lnshStationDeviceDriver.getIo_action() == 1 || lnshStationDeviceDriver.getIo_action() == 3)
@@ -761,7 +761,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
             //标准版-压制对接位
             if(device.getDeviceDriver() instanceof ConveyorPressStationDeviceDriver){
                 conveyorPressStationDeviceDriver = (ConveyorPressStationDeviceDriver) device.getDeviceDriver();
-                conveyorPressStationDeviceDriver.writing(13);
+                conveyorPressStationDeviceDriver.writing(4);
                 if (conveyorPressStationDeviceDriver.getMode() != 0
                         && conveyorPressStationDeviceDriver.getMove() == 0
                         && (conveyorPressStationDeviceDriver.getIo_action() == 1 || conveyorPressStationDeviceDriver.getIo_action() == 3)
@@ -810,7 +810,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
             //标准版-下发条码输送线
             if(device.getDeviceDriver() instanceof ConveyorBarcodeDeviceDriver){
                 conveyorBarcodeDeviceDriver = (ConveyorBarcodeDeviceDriver) device.getDeviceDriver();
-                conveyorBarcodeDeviceDriver.writing(13);
+                conveyorBarcodeDeviceDriver.writing(4);
                 if (conveyorBarcodeDeviceDriver.getMode() != 0
                         && conveyorBarcodeDeviceDriver.getMove() == 0
                         && (conveyorBarcodeDeviceDriver.getIo_action() == 1 || conveyorBarcodeDeviceDriver.getIo_action() == 3)
@@ -843,7 +843,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
             //标准版-叠盘机
             if(device.getDeviceDriver() instanceof LnshFoldDiscSiteDeviceDriver){
                 lnshFoldDiscSiteDeviceDriver = (LnshFoldDiscSiteDeviceDriver) device.getDeviceDriver();
-                lnshFoldDiscSiteDeviceDriver.writing(13);
+                lnshFoldDiscSiteDeviceDriver.writing(4);
                 if (lnshFoldDiscSiteDeviceDriver.getMode() != 0
                         && lnshFoldDiscSiteDeviceDriver.getMove() == 0
 //                        && (lnshFoldDiscSiteDeviceDriver.getIo_action() == 1 || lnshFoldDiscSiteDeviceDriver.getIo_action() == 3)
@@ -940,7 +940,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
                         && (lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 2 || lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 3)) {
                     inst.setExecute_status("6");
                     instructionService.update(inst);
-                    lnshPalletizingManipulatorSiteDeviceDriver.writing(3);
+                    lnshPalletizingManipulatorSiteDeviceDriver.writing(5);
                     data = AgvService.sendAgvOneModeInst(phase, index, 0);
                     lnshPalletizingManipulatorSiteDeviceDriver.setMessage("");
                     flag = true;
@@ -969,7 +969,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
                         && (lnshStationDeviceDriver.getIo_action() == 2 || lnshStationDeviceDriver.getIo_action() == 3)) {
                     inst.setExecute_status("6");
                     instructionService.update(inst);
-                    lnshStationDeviceDriver.writing(3);
+                    lnshStationDeviceDriver.writing(5);
                     data = AgvService.sendAgvOneModeInst(phase, index, 0);
                     lnshStationDeviceDriver.setMessage("");
                     flag = true;
@@ -998,7 +998,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
                         && (conveyorPressStationDeviceDriver.getIo_action() == 2 || conveyorPressStationDeviceDriver.getIo_action() == 3)) {
                     inst.setExecute_status("6");
                     instructionService.update(inst);
-                    conveyorPressStationDeviceDriver.writing(3);
+                    conveyorPressStationDeviceDriver.writing(5);
                     TaskDto task=taskService.findByCode(inst.getTask_code());
                     if(ObjectUtil.isNotEmpty(task)){
                         String direction=task.getDirection();
@@ -1058,7 +1058,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
                         && (conveyorBarcodeDeviceDriver.getIo_action() == 2 || conveyorBarcodeDeviceDriver.getIo_action() == 3)) {
                     inst.setExecute_status("6");
                     instructionService.update(inst);
-                    conveyorBarcodeDeviceDriver.writing(3);
+                    conveyorBarcodeDeviceDriver.writing(5);
                     data = AgvService.sendAgvOneModeInst(phase, index, 0);
                     conveyorBarcodeDeviceDriver.setMessage("");
                     flag = true;
@@ -1088,7 +1088,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
                 ) {
                     inst.setExecute_status("6");
                     instructionService.update(inst);
-                    lnshFoldDiscSiteDeviceDriver.writing(3);
+                    lnshFoldDiscSiteDeviceDriver.writing(5);
                     data = AgvService.sendAgvOneModeInst(phase, index, 0);
                     lnshFoldDiscSiteDeviceDriver.setMessage("");
                     flag = true;
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/conveyor_press_station/ConveyorPressStationDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/conveyor_press_station/ConveyorPressStationDeviceDriver.java
index e8bd4e5..9cb8c0e 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/conveyor_press_station/ConveyorPressStationDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/conveyor_press_station/ConveyorPressStationDeviceDriver.java
@@ -708,10 +708,12 @@ public class ConveyorPressStationDeviceDriver extends AbstractOpcDeviceDriver im
             lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
 
             if (resp.getCode() == 200) {
-                this.writing(200);
-                this.writing("to_command",resp.getIs_standing_finish());
-                this.writing("to_mix_num",resp.getMix_num());
-                this.setRequireSucess(true);
+                if(StrUtil.equals(resp.getIs_standing_finish(),"1")){
+                    this.writing(200);
+                    this.setRequireSucess(true);
+                }else {
+                    this.writing(400);
+                }
             } else {
                 this.writing(400);
                 message = RequestMethodEnum.getName("barcode_success_apply") + "barcode_success_apply 接口请求失败" + resp.getMessage();;
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
index 4331c5e..4752190 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
@@ -225,6 +225,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
                     jo.put("remark", remark);
                     jo.put("params", params);
                     jo.put("task_type", StrUtil.isEmpty(task_type) ? 1 : Integer.parseInt(task_type));
+                    jo.put("direction",direction);
                     // 如果是无光电的设备 指令完成变更起点、终点状态
                     JSONObject startjo = new JSONObject();
                     startjo.put("device_code", start_device_code);