From 1623d00256f88e1df9590e9efce533b8b2dca6c5 Mon Sep 17 00:00:00 2001
From: 18110972313 <780768673@qq.com>
Date: Mon, 12 May 2025 20:01:41 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=A4=87=E8=B4=A7=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=9F=A5=E8=AF=A2MES=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 zi-wms-environment/launch/CNMsvr.run.xml               | 10 ----------
 .../java/com/cim/idm/controller/SaleOutController.java |  2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)
 delete mode 100644 zi-wms-environment/launch/CNMsvr.run.xml

diff --git a/zi-wms-environment/launch/CNMsvr.run.xml b/zi-wms-environment/launch/CNMsvr.run.xml
deleted file mode 100644
index 70ab03e..0000000
--- a/zi-wms-environment/launch/CNMsvr.run.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="CNMsvr" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-    <module name="zi-wms-boot" />
-    <option name="SPRING_BOOT_MAIN_CLASS" value="com.zi.mwms.solution.Application" />
-    <option name="VM_PARAMETERS" value="-DWMS_HOME=$ProjectFileDir$/zi-wms-environment/ -DconfigRootPath=$ProjectFileDir$/zi-wms-environment/config -DLOGDIR=$ProjectFileDir$/../logs -Dcompany=BOE -Dfactory=B16 -Dcim=MWMS -Dmode=DEV10539622 -Dsvr=CNMsvr -DSeq=CNMsvr1 -Dclient=OIC -Dmode=DEV -Dservice=8400 -Dnetwork=;225.11.11.4 -Ddaemon= -DworkerWeight=2 -DworkerTasks=1 -DschedulerWeight=10 -Ddq=${USERNAME} -DdataField=Message -Ddbtype=DEV -Didmframe.flow.bpelj=http://bpel.boe.com/bpelj/ -Dspring.jdbc.getParameterType.ignore=true -Dhttp.port=18873 -Duseamqp=false -Dscheduler=false -DuseTibrv=false -Dtypemode=Local" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/SaleOutController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/SaleOutController.java
index 34b58e5..f3e4744 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/controller/SaleOutController.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/SaleOutController.java
@@ -1182,6 +1182,6 @@ public class SaleOutController {
 		if (sendERPStockOut == null || "".equals(sendERPStockOut)) {
 			return AjaxResult.me().setSuccess(false).setMessage("过账失败");
 		}
-		return AjaxResult.me().setResultObj(null);
+		return AjaxResult.me().setSuccess(true).setErrorCode(200);
 	}
 }