'销售bug'

src/main/java/com/steerinfo/dil/service/impl/AmsSaleOrderServiceImpl.java

@@ -121,7 +121,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             result += amsSaleOrderMapper.updateByPrimaryKeySelective(amsSaleOrder);
             List<Map<String, Object>> warehouseList = amsSaleOrderMapper.getWareHouse(amsSaleOrder.getSaleOrderId());
             if (warehouseList != null && warehouseList.size() != 0) {
-                String warehouse = (String) warehouseList.get(0).get("warehouse");
+                Object warehouse = warehouseList.get(0).get("warehouse");
                 if (warehouse != null && "副产品库".equals(warehouse)) {
                     result += amsSaleOrderMapper.closeOrderNotIn(amsSaleOrder.getSaleOrderId());
                 }
@@ -135,6 +135,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
                 List<AmsSaleMaterial> amsSaleMaterials = amsSaleMaterialMapper.selectByParameters(easMap);
                 if (amsSaleMaterials != null && amsSaleMaterials.size() != 0) {
                     AmsSaleMaterial amsSaleMaterial = amsSaleMaterials.get(0);
+                    amsSaleMaterial.setDeleted(new BigDecimal(0));
                     result += amsSaleMaterialMapper.updateByPrimaryKeySelective(amsSaleMaterial);
                 }
             }

src/main/java/com/steerinfo/dil/wsdl/WSFaceFacadeSoapBindingStub.java

@@ -33,7 +33,7 @@ public class WSFaceFacadeSoapBindingStub extends org.apache.axis.client.Stub imp
         oper.setStyle(org.apache.axis.constants.Style.RPC);
         oper.setUse(org.apache.axis.constants.Use.ENCODED);
         oper.addFault(new org.apache.axis.description.FaultDesc(
-                      new javax.xml.namespace.QName("http://172.16.33.111:8888/ormrpc/services/WSFaceFacade", "fault"),
+                      new javax.xml.namespace.QName("http://172.16.62.243:8888/ormrpc/services/WSFaceFacade", "fault"),
                       "com.steerinfo.dil.wsdl.WSInvokeException",
                       new javax.xml.namespace.QName("urn:client.facefacade", "WSInvokeException"), 
                       true
@@ -50,7 +50,7 @@ public class WSFaceFacadeSoapBindingStub extends org.apache.axis.client.Stub imp
         oper.setStyle(org.apache.axis.constants.Style.RPC);
         oper.setUse(org.apache.axis.constants.Use.ENCODED);
         oper.addFault(new org.apache.axis.description.FaultDesc(
-                      new javax.xml.namespace.QName("http://172.16.33.111:8888/ormrpc/services/WSFaceFacade", "fault"),
+                      new javax.xml.namespace.QName("http://172.16.62.243:8888/ormrpc/services/WSFaceFacade", "fault"),
                       "com.steerinfo.dil.wsdl.WSInvokeException",
                       new javax.xml.namespace.QName("urn:client.facefacade", "WSInvokeException"), 
                       true
@@ -67,7 +67,7 @@ public class WSFaceFacadeSoapBindingStub extends org.apache.axis.client.Stub imp
         oper.setStyle(org.apache.axis.constants.Style.RPC);
         oper.setUse(org.apache.axis.constants.Use.ENCODED);
         oper.addFault(new org.apache.axis.description.FaultDesc(
-                      new javax.xml.namespace.QName("http://172.16.33.111:8888/ormrpc/services/WSFaceFacade", "fault"),
+                      new javax.xml.namespace.QName("http://172.16.62.243:8888/ormrpc/services/WSFaceFacade", "fault"),
                       "com.steerinfo.dil.wsdl.WSInvokeException",
                       new javax.xml.namespace.QName("urn:client.facefacade", "WSInvokeException"), 
                       true
@@ -84,7 +84,7 @@ public class WSFaceFacadeSoapBindingStub extends org.apache.axis.client.Stub imp
         oper.setStyle(org.apache.axis.constants.Style.RPC);
         oper.setUse(org.apache.axis.constants.Use.ENCODED);
         oper.addFault(new org.apache.axis.description.FaultDesc(
-                      new javax.xml.namespace.QName("http://172.16.33.111:8888/ormrpc/services/WSFaceFacade", "fault"),
+                      new javax.xml.namespace.QName("http://172.16.62.243:8888/ormrpc/services/WSFaceFacade", "fault"),
                       "com.steerinfo.dil.wsdl.WSInvokeException",
                       new javax.xml.namespace.QName("urn:client.facefacade", "WSInvokeException"), 
                       true
@@ -103,7 +103,7 @@ public class WSFaceFacadeSoapBindingStub extends org.apache.axis.client.Stub imp
         oper.setStyle(org.apache.axis.constants.Style.RPC);
         oper.setUse(org.apache.axis.constants.Use.ENCODED);
         oper.addFault(new org.apache.axis.description.FaultDesc(
-                      new javax.xml.namespace.QName("http://172.16.33.111:8888/ormrpc/services/WSFaceFacade", "fault"),
+                      new javax.xml.namespace.QName("http://172.16.62.243:8888/ormrpc/services/WSFaceFacade", "fault"),
                       "com.steerinfo.dil.wsdl.WSInvokeException",
                       new javax.xml.namespace.QName("urn:client.facefacade", "WSInvokeException"), 
                       true
@@ -120,7 +120,7 @@ public class WSFaceFacadeSoapBindingStub extends org.apache.axis.client.Stub imp
         oper.setStyle(org.apache.axis.constants.Style.RPC);
         oper.setUse(org.apache.axis.constants.Use.ENCODED);
         oper.addFault(new org.apache.axis.description.FaultDesc(
-                      new javax.xml.namespace.QName("http://172.16.33.111:8888/ormrpc/services/WSFaceFacade", "fault"),
+                      new javax.xml.namespace.QName("http://172.16.62.243:8888/ormrpc/services/WSFaceFacade", "fault"),
                       "com.steerinfo.dil.wsdl.WSInvokeException",
                       new javax.xml.namespace.QName("urn:client.facefacade", "WSInvokeException"), 
                       true
@@ -139,7 +139,7 @@ public class WSFaceFacadeSoapBindingStub extends org.apache.axis.client.Stub imp
         oper.setStyle(org.apache.axis.constants.Style.RPC);
         oper.setUse(org.apache.axis.constants.Use.ENCODED);
         oper.addFault(new org.apache.axis.description.FaultDesc(
-                      new javax.xml.namespace.QName("http://172.16.33.111:8888/ormrpc/services/WSFaceFacade", "fault"),
+                      new javax.xml.namespace.QName("http://172.16.62.243:8888/ormrpc/services/WSFaceFacade", "fault"),
                       "com.steerinfo.dil.wsdl.WSInvokeException",
                       new javax.xml.namespace.QName("urn:client.facefacade", "WSInvokeException"), 
                       true
@@ -156,7 +156,7 @@ public class WSFaceFacadeSoapBindingStub extends org.apache.axis.client.Stub imp
         oper.setStyle(org.apache.axis.constants.Style.RPC);
         oper.setUse(org.apache.axis.constants.Use.ENCODED);
         oper.addFault(new org.apache.axis.description.FaultDesc(
-                      new javax.xml.namespace.QName("http://172.16.33.111:8888/ormrpc/services/WSFaceFacade", "fault"),
+                      new javax.xml.namespace.QName("http://172.16.62.243:8888/ormrpc/services/WSFaceFacade", "fault"),
                       "com.steerinfo.dil.wsdl.WSInvokeException",
                       new javax.xml.namespace.QName("urn:client.facefacade", "WSInvokeException"), 
                       true

src/main/java/com/steerinfo/dil/wsdl/WSJJBoomFacadeSrvProxyServiceLocator.java

@@ -22,7 +22,7 @@ public class WSJJBoomFacadeSrvProxyServiceLocator extends org.apache.axis.client
     }
 
     // Use to get a proxy class for WSJJBoomFacade
-    private String WSJJBoomFacade_address = "http://172.16.33.111:8888/ormrpc/services/WSJJBoomFacade";
+    private String WSJJBoomFacade_address = "http://172.16.62.243:8888/ormrpc/services/WSJJBoomFacade";
 
     public String getWSJJBoomFacadeAddress() {
         return WSJJBoomFacade_address;
@@ -105,7 +105,7 @@ public class WSJJBoomFacadeSrvProxyServiceLocator extends org.apache.axis.client
     }
 
     public javax.xml.namespace.QName getServiceName() {
-        return new javax.xml.namespace.QName("http://172.16.33.111:8888/ormrpc/services/WSJJBoomFacade", "WSJJBoomFacadeSrvProxyService");
+        return new javax.xml.namespace.QName("http://172.16.62.243:8888/ormrpc/services/WSJJBoomFacade", "WSJJBoomFacadeSrvProxyService");
     }
 
     private java.util.HashSet ports = null;
@@ -113,7 +113,7 @@ public class WSJJBoomFacadeSrvProxyServiceLocator extends org.apache.axis.client
     public java.util.Iterator getPorts() {
         if (ports == null) {
             ports = new java.util.HashSet();
-            ports.add(new javax.xml.namespace.QName("http://172.16.33.111:8888/ormrpc/services/WSJJBoomFacade", "WSJJBoomFacade"));
+            ports.add(new javax.xml.namespace.QName("http://172.16.62.243:8888/ormrpc/services/WSJJBoomFacade", "WSJJBoomFacade"));
         }
         return ports.iterator();
     }

src/main/resources/com/steerinfo/dil/mapper/AmsSaleOrderMapper.xml

@@ -732,5 +732,6 @@
     SELECT ASM.SALE_WAREHOUSE AS "warehouse"
     FROM AMS_SALE_MATERIAL ASM
     WHERE ASM.SALE_ORDER_ID = #{saleOrderId}
+    AND ASM.SALE_WAREHOUSE IS NOT NULL
   </select>
 </mapper>