diff --git a/lc123/cloud/app/api/controller/WMSChangeWhDiffAreaController.java b/lc123/cloud/app/api/controller/WMSChangeWhDiffAreaController.java
index 7fb0d4b..8a052e4 100644
--- a/lc123/cloud/app/api/controller/WMSChangeWhDiffAreaController.java
+++ b/lc123/cloud/app/api/controller/WMSChangeWhDiffAreaController.java
@@ -14,9 +14,9 @@ import kd.bos.openapi.common.result.CustomApiResult;
 import kd.bos.orm.query.QFilter;
 import kd.bos.servicehelper.BusinessDataServiceHelper;
 import kd.bos.servicehelper.operation.OperationServiceHelper;
-import org.apache.commons.lang3.StringUtils;
 import tqq9.lc123.cloud.app.api.model.WMSXmlReturn;
 import tqq9.lc123.cloud.app.api.utils.ApiResultExt;
+import tqq9.lc123.cloud.app.api.utils.Constants;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -217,6 +217,7 @@ public class WMSChangeWhDiffAreaController {
                         for (IOperateInfo iOperateInfo : allErrorOrValidateInfo) {
                             errormsg = errormsg.append("；").append(iOperateInfo.getMessage());
                         }
+                        OperationResult deleteResult = OperationServiceHelper.executeOperate(Constants.TYPE_DELETE, "im_otheroutbill", new DynamicObject[]{outBill}, OperateOption.create());
                         response.setMessage(errormsg.substring(1));
                         response.setCode("-1");
                         response.setFlag("failure");
@@ -229,6 +230,8 @@ public class WMSChangeWhDiffAreaController {
                             for (IOperateInfo iOperateInfo : allErrorOrValidateInfo) {
                                 errormsg = errormsg.append("；").append(iOperateInfo.getMessage());
                             }
+                            OperationResult unsubmitResult = OperationServiceHelper.executeOperate(Constants.TYPE_UNSUBMIT, "im_otheroutbill", new DynamicObject[]{outBill}, OperateOption.create());
+                            OperationResult deleteResult = OperationServiceHelper.executeOperate(Constants.TYPE_DELETE, "im_otheroutbill", new DynamicObject[]{outBill}, OperateOption.create());
                             response.setMessage(errormsg.substring(1));
                             response.setCode("-1");
                             response.setFlag("failure");
diff --git a/lc123/cloud/app/api/controller/WMSPurInController.java b/lc123/cloud/app/api/controller/WMSPurInController.java
index a0fe190..23dbc2d 100644
--- a/lc123/cloud/app/api/controller/WMSPurInController.java
+++ b/lc123/cloud/app/api/controller/WMSPurInController.java
@@ -97,9 +97,9 @@ public class WMSPurInController {
         resultBean.setType(Constants.TYPE_PUSH);
 
         //判断回传类型
-        VoucherType=billTypeMap.get(VoucherType);
+        VoucherType = billTypeMap.get(VoucherType);
         String entityType = "";
-        if(VoucherType==null){
+        if (VoucherType == null) {
             errormsg = "传入参数 VoucherType 为无效值";
             resultExt = ApiResultExt.errorRetrun(entityType, errormsg, error, resultExt);
             return CustomApiResult.success(resultExt);
@@ -247,6 +247,7 @@ public class WMSPurInController {
                     HashMap<String, Object> returnMap = resultExt.addOneErrorToResultBeanByNumber(results, sumbitResult.getInteractionContext().getSimpleMessage(), PURINBILL);
                     results = (List<ApiResultExt.ResultBean>) returnMap.get("ResultBeanList");
                 }
+                OperationResult deleteResult = OperationServiceHelper.executeOperate(Constants.TYPE_DELETE, PURINBILL, load, operateOption);
             } else {
                 //开始审核
                 OperationResult auditResult = OperationServiceHelper.executeOperate(Constants.TYPE_AUDIT, PURINBILL, load, operateOption);
@@ -265,6 +266,9 @@ public class WMSPurInController {
                         results = (List<ApiResultExt.ResultBean>) returnMap.get("ResultBeanList");
                     }
                 }
+                OperationResult unsubmitResult = OperationServiceHelper.executeOperate(Constants.TYPE_UNSUBMIT, PURINBILL, load, operateOption);
+                OperationResult deleteResult = OperationServiceHelper.executeOperate(Constants.TYPE_DELETE, PURINBILL, load, operateOption);
+
             }
             //采购退货单
         } else if (StringUtils.equals("pm_purrefundapplybill", VoucherType)) {
@@ -349,6 +353,7 @@ public class WMSPurInController {
                     HashMap<String, Object> returnMap = resultExt.addOneErrorToResultBeanByNumber(results, sumbitResult.getInteractionContext().getSimpleMessage(), PURINBILL);
                     results = (List<ApiResultExt.ResultBean>) returnMap.get("ResultBeanList");
                 }
+                OperationResult deleteResult = OperationServiceHelper.executeOperate(Constants.TYPE_DELETE, PURINBILL, load, operateOption);
             } else {
                 //开始审核
                 OperationResult auditResult = OperationServiceHelper.executeOperate(Constants.TYPE_AUDIT, PURINBILL, load, operateOption);
@@ -366,6 +371,8 @@ public class WMSPurInController {
                         HashMap<String, Object> returnMap = resultExt.addOneErrorToResultBeanByNumber(results, auditResult.getInteractionContext().getSimpleMessage(), PURINBILL);
                         results = (List<ApiResultExt.ResultBean>) returnMap.get("ResultBeanList");
                     }
+                    OperationResult unsubmitResult = OperationServiceHelper.executeOperate(Constants.TYPE_UNSUBMIT, PURINBILL, load, operateOption);
+                    OperationResult deleteResult = OperationServiceHelper.executeOperate(Constants.TYPE_DELETE, PURINBILL, load, operateOption);
                 }
             }
             //其他入库申请单
@@ -451,7 +458,7 @@ public class WMSPurInController {
                     HashMap<String, Object> returnMap = resultExt.addOneErrorToResultBeanByNumber(results, sumbitResult.getInteractionContext().getSimpleMessage(), IM_OTHERINBILL);
                     results = (List<ApiResultExt.ResultBean>) returnMap.get("ResultBeanList");
                 }
-
+                OperationResult deleteResult = OperationServiceHelper.executeOperate(Constants.TYPE_DELETE, IM_OTHERINBILL, load, operateOption);
             } else {
                 //开始审核
                 OperationResult auditResult = OperationServiceHelper.executeOperate(Constants.TYPE_AUDIT, IM_OTHERINBILL, load, operateOption);
@@ -469,20 +476,23 @@ public class WMSPurInController {
                         HashMap<String, Object> returnMap = resultExt.addOneErrorToResultBeanByNumber(results, auditResult.getInteractionContext().getSimpleMessage(), IM_OTHERINBILL);
                         results = (List<ApiResultExt.ResultBean>) returnMap.get("ResultBeanList");
                     }
+                    OperationResult unsubmitResult = OperationServiceHelper.executeOperate(Constants.TYPE_UNSUBMIT, IM_OTHERINBILL, load, operateOption);
+                    OperationResult deleteResult = OperationServiceHelper.executeOperate(Constants.TYPE_DELETE, IM_OTHERINBILL, load, operateOption);
+
                 }
             }
 
         }
-        int i=0;
+        int i = 0;
         //回传成功
-        if(results.size()>0){
+        if (results.size() > 0) {
             boolean billStatus = results.get(0).isBillStatus();
-            if (!billStatus){
-                i=1;
+            if (!billStatus) {
+                i = 1;
             }
         }
         int failCount = i;//失败数量
-        int successCount = 1-i;//成功数量
+        int successCount = 1 - i;//成功数量
         resultExt.setFailCount(failCount);
         resultExt.setSuccessCount(successCount);
         resultExt.setResult(results);
@@ -500,7 +510,7 @@ public class WMSPurInController {
         JSONObject entryOrder = request.getJSONObject("entryOrder");
         String billno = entryOrder.getString("entryOrderCode");
         String entryOrderType = entryOrder.getString("entryOrderType");
-        entryOrderType=billTypeMap.get(entryOrderType);
+        entryOrderType = billTypeMap.get(entryOrderType);
         JSONObject orderLines = request.getJSONObject("orderLines");
         WMSXmlReturn wmsXmlReturn = new WMSXmlReturn();
         WMSXmlReturn.Response response = new WMSXmlReturn.Response();
@@ -618,11 +628,11 @@ public class WMSPurInController {
                     key1 = extendProps.getString("key1");//注册证号
                     key3 = extendProps.getString("key3");//生产许可证
                     key2 = extendProps.getString("key2");//生产厂商
-                }else{
+                } else {
                     JSONArray extendProps = orderLine.getJSONArray("extendProps");
                     for (Object o : extendProps) {
                         JSONObject extendProp = gson.fromJson(gson.toJson(o), JSONObject.class);
-                        if(extendProp.getString("key1")!=null){
+                        if (extendProp.getString("key1") != null) {
                             key1 = extendProp.getString("key1");//注册证号
                             key3 = extendProp.getString("key3");//生产许可证
                             key2 = extendProp.getString("key2");//生产厂商
@@ -663,11 +673,11 @@ public class WMSPurInController {
                         key1 = extendProps.getString("key1");//注册证号
                         key3 = extendProps.getString("key3");//生产许可证
                         key2 = extendProps.getString("key2");//生产厂商
-                    }else{
+                    } else {
                         JSONArray extendProps = orderLine1.getJSONArray("extendProps");
                         for (Object o : extendProps) {
                             JSONObject extendProp = gson.fromJson(gson.toJson(o), JSONObject.class);
-                            if(extendProp.getString("key1")!=null){
+                            if (extendProp.getString("key1") != null) {
                                 key1 = extendProp.getString("key1");//注册证号
                                 key3 = extendProp.getString("key3");//生产许可证
                                 key2 = extendProp.getString("key2");//生产厂商
@@ -729,6 +739,7 @@ public class WMSPurInController {
                 } else {
                     errormsg = errormsg.append("；").append(sumbitResult.getInteractionContext().getSimpleMessage());
                 }
+                OperationResult deleteResult = OperationServiceHelper.executeOperate(Constants.TYPE_DELETE, PURINBILL, load, operateOption);
                 response.setMessage(errormsg.substring(1));
                 response.setCode("-1");
                 response.setFlag("failure");
@@ -748,6 +759,8 @@ public class WMSPurInController {
                     } else {
                         errormsg = errormsg.append("；").append(auditResult.getInteractionContext().getSimpleMessage());
                     }
+                    OperationResult unsubmitResult = OperationServiceHelper.executeOperate(Constants.TYPE_UNSUBMIT, PURINBILL, load, operateOption);
+                    OperationResult deleteResult = OperationServiceHelper.executeOperate(Constants.TYPE_DELETE, PURINBILL, load, operateOption);
                     response.setMessage(errormsg.substring(1));
                     response.setCode("-1");
                     response.setFlag("failure");
@@ -787,11 +800,11 @@ public class WMSPurInController {
                     key1 = extendProps.getString("key1");//注册证号
                     key3 = extendProps.getString("key3");//生产许可证
                     key2 = extendProps.getString("key2");//生产厂商
-                }else{
+                } else {
                     JSONArray extendProps = orderLine.getJSONArray("extendProps");
                     for (Object o : extendProps) {
                         JSONObject extendProp = gson.fromJson(gson.toJson(o), JSONObject.class);
-                        if(extendProp.getString("key1")!=null){
+                        if (extendProp.getString("key1") != null) {
                             key1 = extendProp.getString("key1");//注册证号
                             key3 = extendProp.getString("key3");//生产许可证
                             key2 = extendProp.getString("key2");//生产厂商
@@ -832,11 +845,11 @@ public class WMSPurInController {
                         key1 = extendProps.getString("key1");//注册证号
                         key3 = extendProps.getString("key3");//生产许可证
                         key2 = extendProps.getString("key2");//生产厂商
-                    }else{
+                    } else {
                         JSONArray extendProps = orderLine1.getJSONArray("extendProps");
                         for (Object o : extendProps) {
                             JSONObject extendProp = gson.fromJson(gson.toJson(o), JSONObject.class);
-                            if(extendProp.getString("key1")!=null){
+                            if (extendProp.getString("key1") != null) {
                                 key1 = extendProp.getString("key1");//注册证号
                                 key3 = extendProp.getString("key3");//生产许可证
                                 key2 = extendProp.getString("key2");//生产厂商
@@ -901,6 +914,7 @@ public class WMSPurInController {
                 } else {
                     errormsg = errormsg.append("；").append(sumbitResult.getInteractionContext().getSimpleMessage());
                 }
+                OperationResult deleteResult = OperationServiceHelper.executeOperate(Constants.TYPE_DELETE, PURINBILL, load, operateOption);
                 response.setMessage(errormsg.substring(1));
                 response.setCode("-1");
                 response.setFlag("failure");
@@ -920,6 +934,8 @@ public class WMSPurInController {
                     } else {
                         errormsg = errormsg.append("；").append(auditResult.getInteractionContext().getSimpleMessage());
                     }
+                    OperationResult unsubmitResult = OperationServiceHelper.executeOperate(Constants.TYPE_UNSUBMIT, PURINBILL, load, operateOption);
+                    OperationResult deleteResult = OperationServiceHelper.executeOperate(Constants.TYPE_DELETE, PURINBILL, load, operateOption);
                     response.setMessage(errormsg.substring(1));
                     response.setCode("-1");
                     response.setFlag("failure");
@@ -959,11 +975,11 @@ public class WMSPurInController {
                     key1 = extendProps.getString("key1");//注册证号
                     key3 = extendProps.getString("key3");//生产许可证
                     key2 = extendProps.getString("key2");//生产厂商
-                }else{
+                } else {
                     JSONArray extendProps = orderLine.getJSONArray("extendProps");
                     for (Object o : extendProps) {
                         JSONObject extendProp = gson.fromJson(gson.toJson(o), JSONObject.class);
-                        if(extendProp.getString("key1")!=null){
+                        if (extendProp.getString("key1") != null) {
                             key1 = extendProp.getString("key1");//注册证号
                             key3 = extendProp.getString("key3");//生产许可证
                             key2 = extendProp.getString("key2");//生产厂商
@@ -1004,11 +1020,11 @@ public class WMSPurInController {
                         key1 = extendProps.getString("key1");//注册证号
                         key3 = extendProps.getString("key3");//生产许可证
                         key2 = extendProps.getString("key2");//生产厂商
-                    }else{
+                    } else {
                         JSONArray extendProps = orderLine1.getJSONArray("extendProps");
                         for (Object o : extendProps) {
                             JSONObject extendProp = gson.fromJson(gson.toJson(o), JSONObject.class);
-                            if(extendProp.getString("key1")!=null){
+                            if (extendProp.getString("key1") != null) {
                                 key1 = extendProp.getString("key1");//注册证号
                                 key3 = extendProp.getString("key3");//生产许可证
                                 key2 = extendProp.getString("key2");//生产厂商
@@ -1071,6 +1087,7 @@ public class WMSPurInController {
                 } else {
                     errormsg = errormsg.append("；").append(sumbitResult.getInteractionContext().getSimpleMessage());
                 }
+                OperationResult deleteResult = OperationServiceHelper.executeOperate(Constants.TYPE_DELETE, IM_OTHERINBILL, load, operateOption);
                 response.setMessage(errormsg.substring(1));
                 response.setCode("-1");
                 response.setFlag("failure");
@@ -1090,6 +1107,8 @@ public class WMSPurInController {
                     } else {
                         errormsg = errormsg.append("；").append(auditResult.getInteractionContext().getSimpleMessage());
                     }
+                    OperationResult unsubmitResult = OperationServiceHelper.executeOperate(Constants.TYPE_UNSUBMIT, IM_OTHERINBILL, load, operateOption);
+                    OperationResult deleteResult = OperationServiceHelper.executeOperate(Constants.TYPE_DELETE, IM_OTHERINBILL, load, operateOption);
                     response.setMessage(errormsg.substring(1));
                     response.setCode("-1");
                     response.setFlag("failure");
diff --git a/lc123/cloud/app/api/controller/WMSSaleOutController.java b/lc123/cloud/app/api/controller/WMSSaleOutController.java
index 97693cd..c4650e9 100644
--- a/lc123/cloud/app/api/controller/WMSSaleOutController.java
+++ b/lc123/cloud/app/api/controller/WMSSaleOutController.java
@@ -242,6 +242,7 @@ public class WMSSaleOutController {
                     HashMap<String, Object> returnMap = resultExt.addOneErrorToResultBeanByNumber(results, sumbitResult.getInteractionContext().getSimpleMessage(), IM_SALOUTBILL);
                     results = (List<ApiResultExt.ResultBean>) returnMap.get("ResultBeanList");
                 }
+                OperationResult deleteResult = OperationServiceHelper.executeOperate(Constants.TYPE_DELETE, IM_SALOUTBILL, load, operateOption);
             } else {
                 //开始审核
                 OperationResult auditResult = OperationServiceHelper.executeOperate(Constants.TYPE_AUDIT, IM_SALOUTBILL, load, operateOption);
@@ -259,6 +260,8 @@ public class WMSSaleOutController {
                         HashMap<String, Object> returnMap = resultExt.addOneErrorToResultBeanByNumber(results, auditResult.getInteractionContext().getSimpleMessage(), IM_SALOUTBILL);
                         results = (List<ApiResultExt.ResultBean>) returnMap.get("ResultBeanList");
                     }
+                    OperationResult unsumbitResult = OperationServiceHelper.executeOperate(Constants.TYPE_UNSUBMIT, IM_SALOUTBILL, load, operateOption);
+                    OperationResult deleteResult = OperationServiceHelper.executeOperate(Constants.TYPE_DELETE, IM_SALOUTBILL, load, operateOption);
                 }
             }
             //销售退货单
@@ -343,6 +346,7 @@ public class WMSSaleOutController {
                     HashMap<String, Object> returnMap = resultExt.addOneErrorToResultBeanByNumber(results, sumbitResult.getInteractionContext().getSimpleMessage(), IM_SALOUTBILL);
                     results = (List<ApiResultExt.ResultBean>) returnMap.get("ResultBeanList");
                 }
+                OperationResult deleteResult = OperationServiceHelper.executeOperate(Constants.TYPE_DELETE, IM_SALOUTBILL, load, operateOption);
             } else {
                 //开始审核
                 OperationResult auditResult = OperationServiceHelper.executeOperate(Constants.TYPE_AUDIT, IM_SALOUTBILL, load, operateOption);
@@ -360,6 +364,8 @@ public class WMSSaleOutController {
                         HashMap<String, Object> returnMap = resultExt.addOneErrorToResultBeanByNumber(results, auditResult.getInteractionContext().getSimpleMessage(), IM_SALOUTBILL);
                         results = (List<ApiResultExt.ResultBean>) returnMap.get("ResultBeanList");
                     }
+                    OperationResult unsumbitResult = OperationServiceHelper.executeOperate(Constants.TYPE_UNSUBMIT, IM_SALOUTBILL, load, operateOption);
+                    OperationResult deleteResult = OperationServiceHelper.executeOperate(Constants.TYPE_DELETE, IM_SALOUTBILL, load, operateOption);
                 }
             }
             //销售退货单
@@ -457,6 +463,7 @@ public class WMSSaleOutController {
                     HashMap<String, Object> returnMap = resultExt.addOneErrorToResultBeanByNumber(results, sumbitResult.getInteractionContext().getSimpleMessage(), IM_OTHEROUTBILL);
                     results = (List<ApiResultExt.ResultBean>) returnMap.get("ResultBeanList");
                 }
+                OperationResult deleteResult = OperationServiceHelper.executeOperate(Constants.TYPE_DELETE, IM_OTHEROUTBILL, load, operateOption);
             } else {
                 //开始审核
                 OperationResult auditResult = OperationServiceHelper.executeOperate(Constants.TYPE_AUDIT, IM_OTHEROUTBILL, load, operateOption);
@@ -474,6 +481,8 @@ public class WMSSaleOutController {
                         HashMap<String, Object> returnMap = resultExt.addOneErrorToResultBeanByNumber(results, auditResult.getInteractionContext().getSimpleMessage(), IM_OTHEROUTBILL);
                         results = (List<ApiResultExt.ResultBean>) returnMap.get("ResultBeanList");
                     }
+                    OperationResult unsumbitResult = OperationServiceHelper.executeOperate(Constants.TYPE_UNSUBMIT, IM_OTHEROUTBILL, load, operateOption);
+                    OperationResult deleteResult = OperationServiceHelper.executeOperate(Constants.TYPE_DELETE, IM_OTHEROUTBILL, load, operateOption);
                 }
             }
         }
@@ -725,6 +734,7 @@ public class WMSSaleOutController {
                 } else {
                     errormsg = errormsg.append("；").append(sumbitResult.getInteractionContext().getSimpleMessage());
                 }
+                OperationResult deleteResult = OperationServiceHelper.executeOperate(Constants.TYPE_DELETE, IM_SALOUTBILL, load, operateOption);
                 response.setMessage(errormsg.substring(1));
                 response.setCode("-1");
                 response.setFlag("failure");
@@ -744,6 +754,8 @@ public class WMSSaleOutController {
                     } else {
                         errormsg = errormsg.append("；").append(auditResult.getInteractionContext().getSimpleMessage());
                     }
+                    OperationResult unsumbitResult = OperationServiceHelper.executeOperate(Constants.TYPE_UNSUBMIT, IM_SALOUTBILL, load, operateOption);
+                    OperationResult deleteResult = OperationServiceHelper.executeOperate(Constants.TYPE_DELETE, IM_SALOUTBILL, load, operateOption);
                     response.setMessage(errormsg.substring(1));
                     response.setCode("-1");
                     response.setFlag("failure");
@@ -893,6 +905,7 @@ public class WMSSaleOutController {
                 } else {
                     errormsg = errormsg.append("；").append(sumbitResult.getInteractionContext().getSimpleMessage());
                 }
+                OperationResult deleteResult = OperationServiceHelper.executeOperate(Constants.TYPE_DELETE, IM_SALOUTBILL, load, operateOption);
                 response.setMessage(errormsg.substring(1));
                 response.setCode("-1");
                 response.setFlag("failure");
@@ -913,6 +926,8 @@ public class WMSSaleOutController {
                     } else {
                         errormsg = errormsg.append("；").append(auditResult.getInteractionContext().getSimpleMessage());
                     }
+                    OperationResult unsumbitResult = OperationServiceHelper.executeOperate(Constants.TYPE_UNSUBMIT, IM_SALOUTBILL, load, operateOption);
+                    OperationResult deleteResult = OperationServiceHelper.executeOperate(Constants.TYPE_DELETE, IM_SALOUTBILL, load, operateOption);
                     response.setMessage(errormsg.substring(1));
                     response.setCode("-1");
                     response.setFlag("failure");
@@ -1075,6 +1090,7 @@ public class WMSSaleOutController {
                 } else {
                     errormsg = errormsg.append("；").append(sumbitResult.getInteractionContext().getSimpleMessage());
                 }
+                OperationResult deleteResult = OperationServiceHelper.executeOperate(Constants.TYPE_DELETE, IM_OTHEROUTBILL, load, operateOption);
                 response.setMessage(errormsg.substring(1));
                 response.setCode("-1");
                 response.setFlag("failure");
@@ -1094,6 +1110,8 @@ public class WMSSaleOutController {
                     } else {
                         errormsg = errormsg.append("；").append(auditResult.getInteractionContext().getSimpleMessage());
                     }
+                    OperationResult unsumbitResult = OperationServiceHelper.executeOperate(Constants.TYPE_UNSUBMIT, IM_OTHEROUTBILL, load, operateOption);
+                    OperationResult deleteResult = OperationServiceHelper.executeOperate(Constants.TYPE_DELETE, IM_OTHEROUTBILL, load, operateOption);
                     response.setMessage(errormsg.substring(1));
                     response.setCode("-1");
                     response.setFlag("failure");
diff --git a/lc123/cloud/app/api/utils/Constants.java b/lc123/cloud/app/api/utils/Constants.java
index 2817ad3..6014e6e 100644
--- a/lc123/cloud/app/api/utils/Constants.java
+++ b/lc123/cloud/app/api/utils/Constants.java
@@ -15,6 +15,7 @@ public class Constants {
     public static final String TYPE_DELETE = "delete";   //保存类型
     public static final String TYPE_PUSH = "push";   //下推类型
     public static final String TYPE_SUBMIT = "submit";   //提交类型
+    public static final String TYPE_UNSUBMIT = "unsubmit";   //提交类型
     public static final String TYPE_AUDIT = "audit";    //审核类型
     public static final String TYPE_UNAUDIT = "unaudit";    //反审核类型
     public static final String TYPE_ENABLE = "enable";    //启用类型
diff --git a/lc123/cloud/app/plugin/operate/im/OtherInApplyPushOtherInConvertPlugin.java b/lc123/cloud/app/plugin/operate/im/OtherInApplyPushOtherInConvertPlugin.java
index e34869c..eeb4ab7 100644
--- a/lc123/cloud/app/plugin/operate/im/OtherInApplyPushOtherInConvertPlugin.java
+++ b/lc123/cloud/app/plugin/operate/im/OtherInApplyPushOtherInConvertPlugin.java
@@ -115,7 +115,9 @@ public class OtherInApplyPushOtherInConvertPlugin extends AbstractConvertPlugIn
                                 entry.set("producedate", manufactureDate);
                                 entry.set("expirydate", expirationDate);
                                 entry.set("lotnumber", batch);
-                                entry.set("warehouse", bd_warehouse);
+                                if(bd_warehouse!=null){
+                                    entry.set("warehouse", bd_warehouse);
+                                }
                                 entry.set("tqq9_wmsdetailid", wmsDetailId);
                                 entry.set("tqq9_licenseno", licenceCode);
                                 entry.set("tqq9_zczh", tqq9_registration);
@@ -135,7 +137,9 @@ public class OtherInApplyPushOtherInConvertPlugin extends AbstractConvertPlugIn
                                 newEntry.set("producedate", manufactureDate);
                                 newEntry.set("expirydate", expirationDate);
                                 newEntry.set("lotnumber", batch);
-                                newEntry.set("warehouse", bd_warehouse);
+                                if(bd_warehouse!=null){
+                                    newEntry.set("warehouse", bd_warehouse);
+                                }
                                 newEntry.set("tqq9_wmsdetailid", wmsDetailId);
                                 newEntry.set("tqq9_licenseno", licenceCode);
                                 newEntry.set("tqq9_zczh", tqq9_registration);
diff --git a/lc123/cloud/app/plugin/operate/im/OtherOutApplyPushOtherOutConvertPlugin.java b/lc123/cloud/app/plugin/operate/im/OtherOutApplyPushOtherOutConvertPlugin.java
index 004963f..1c0be74 100644
--- a/lc123/cloud/app/plugin/operate/im/OtherOutApplyPushOtherOutConvertPlugin.java
+++ b/lc123/cloud/app/plugin/operate/im/OtherOutApplyPushOtherOutConvertPlugin.java
@@ -115,7 +115,9 @@ public class OtherOutApplyPushOtherOutConvertPlugin extends AbstractConvertPlugI
                                 entry.set("producedate", manufactureDate);
                                 entry.set("expirydate", expirationDate);
                                 entry.set("lotnumber", batch);
-                                entry.set("warehouse", bd_warehouse);
+                                if(bd_warehouse!=null){
+                                    entry.set("warehouse", bd_warehouse);
+                                }
                                 entry.set("tqq9_wmsdetailid", wmsDetailId);
                                 entry.set("tqq9_licenseno", licenceCode);
                                 entry.set("tqq9_zczh", tqq9_registration);
@@ -135,7 +137,9 @@ public class OtherOutApplyPushOtherOutConvertPlugin extends AbstractConvertPlugI
                                 newEntry.set("producedate", manufactureDate);
                                 newEntry.set("expirydate", expirationDate);
                                 newEntry.set("lotnumber", batch);
-                                newEntry.set("warehouse", bd_warehouse);
+                                if(bd_warehouse!=null){
+                                    newEntry.set("warehouse", bd_warehouse);
+                                }
                                 newEntry.set("tqq9_wmsdetailid", wmsDetailId);
                                 newEntry.set("tqq9_licenseno", licenceCode);
                                 newEntry.set("tqq9_zczh", tqq9_registration);
diff --git a/lc123/cloud/app/plugin/operate/im/SaleOutBillConvertPlugin.java b/lc123/cloud/app/plugin/operate/im/SaleOutBillConvertPlugin.java
index cd96984..9f4acfe 100644
--- a/lc123/cloud/app/plugin/operate/im/SaleOutBillConvertPlugin.java
+++ b/lc123/cloud/app/plugin/operate/im/SaleOutBillConvertPlugin.java
@@ -119,7 +119,9 @@ public class SaleOutBillConvertPlugin extends AbstractConvertPlugIn implements P
                                 entry.set("producedate", manufactureDate);
                                 entry.set("expirydate", expirationDate);
                                 entry.set("lotnumber", batch);
-                                entry.set("warehouse", bd_warehouse);
+                                if(bd_warehouse!=null){
+                                    entry.set("warehouse", bd_warehouse);
+                                }
                                 entry.set("tqq9_wmsdetailid", wmsDetailId);
                                 entry.set("tqq9_licenseno", licenceCode);
                                 entry.set("tqq9_registration", tqq9_registration);
@@ -139,7 +141,9 @@ public class SaleOutBillConvertPlugin extends AbstractConvertPlugIn implements P
                                 newEntry.set("producedate", manufactureDate);
                                 newEntry.set("expirydate", expirationDate);
                                 newEntry.set("lotnumber", batch);
-                                newEntry.set("warehouse", bd_warehouse);
+                                if(bd_warehouse!=null){
+                                    newEntry.set("warehouse", bd_warehouse);
+                                }
                                 newEntry.set("tqq9_wmsdetailid", wmsDetailId);
                                 newEntry.set("tqq9_licenseno", licenceCode);
                                 newEntry.set("tqq9_registration", tqq9_registration);