diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesJisShippingService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesJisShippingService.java
index 46905cf..9fa75f7 100644
--- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesJisShippingService.java
+++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesJisShippingService.java
@@ -47,8 +47,8 @@ public class MesJisShippingService implements IMesJisShippingService {
             BeanUtils.copyProperties(k, jisShipping, "id");
             jisShipping.setFactoryCode(orderManagement.getCustOrganizeCode());
             jisShipping.setShippingTime(TimeTool.getNowTime(true));
-            jisShipping.setErpWarerhouse(configService.getCfgValue(org, "ERP_WARERHOUSE"));
-            jisShipping.setErpWarehous(mesPartShippingGroup == null || StringUtils.isEmpty(mesPartShippingGroup.getSrcWarerhouse()) ? configService.getCfgValue(org, "ERP_WAREHOUS") : mesPartShippingGroup.getSrcWarerhouse());
+            jisShipping.setErpWarerhouse(mesPartShippingGroup == null || StringUtils.isEmpty(mesPartShippingGroup.getSrcWarerhouse()) ? configService.getCfgValue(org, "ERP_WARERHOUSE"): mesPartShippingGroup.getSrcWarerhouse());
+            jisShipping.setErpWarehous(configService.getCfgValue(org, "ERP_WAREHOUS"));
             jisShipping.setDock(orderManagement.getSendDockCode());
             jisShipping.setCusCode(orderManagement.getCustCode());
             jisShipping.setCusDock(orderManagement.getCustDockCode());