出库修改

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/SalesOrderServiceImpl.java

@@ -1436,10 +1436,10 @@ public class SalesOrderServiceImpl implements SalesOrderService {
     @Override
     public synchronized Integer updateDeliver(SalesOrder salesOrder) {
         Integer flag = 0;
-//        Integer flag = salesOrderMapper.updateDeliver(salesOrder);
-//        if(flag < 1){
-//            throw new RuntimeException("出库失败,订单出库失败。");
-//        }
+        flag = salesOrderMapper.updateDeliver(salesOrder);  //修改出库状态
+        if(flag < 1){
+            throw new RuntimeException("出库失败,订单出库失败。");
+        }
 
         boolean isMachineRetuen = false; //是否原机退回
         ComplaintDetectInfo complaintDetectInfo = new ComplaintDetectInfo();

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/SalesOrderMapper.java

@@ -292,7 +292,7 @@ public interface SalesOrderMapper {
      * @param salesOrder
      * @return
      */
-//    Integer updateDeliver(SalesOrder salesOrder);
+    Integer updateDeliver(SalesOrder salesOrder);
 
     /**
      * 获取出库数量