库存管理

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java

@@ -620,6 +620,7 @@ public class AwaitSendController {
             return rj;
         }
         salesOrder.setSalesDeliver(2);
+        salesOrder.setSalesOldDeliver(1);
         Integer flag = 0;
         try{
             flag = salesOrderService.updateDeliver(salesOrder);
@@ -803,20 +804,20 @@ public class AwaitSendController {
 
         SalesOrder salesOrder = salesOrderService.getSalesOrderById(salesId);
         if(salesOrder == null){
-            rj.setResultMsg("出货失败，该订单号未查询到订单。");
+            rj.setResultMsg("标记失败，该订单号未查询到订单。");
             return rj;
         }
         if(salesOrder.getSalesShippingStatus() != 1){
-            rj.setResultMsg("出货失败，该订单未发货。");
+            rj.setResultMsg("标记失败，该订单未发货。");
             return rj;
         }
 
         if(type == salesOrder.getSalesDeliver()){
             if(type == 1){
-                rj.setResultMsg("出货失败，该订单已标记为未出库。");
+                rj.setResultMsg("标记未出库失败，该订单已标记为未出库。");
                 return rj;
             }else  if(type == 2){
-                rj.setResultMsg("出货失败，该订单已标记为已出库。");
+                rj.setResultMsg("标记出库失败，该订单已标记为已出库。");
                 return rj;
             }
         }
@@ -827,12 +828,12 @@ public class AwaitSendController {
         try{
             flag = salesOrderService.updateDeliver(salesOrder);
         }catch (Exception e){
-            rj.setResultMsg("出货失败;</br>原因："+e.getMessage());
+            rj.setResultMsg("标记失败;</br>原因："+e.getMessage());
             return rj;
         }
 
         if(flag < 1){
-            rj.setResultMsg("出货失败，请检查该订单的发货状态及产品库存是否充足。");
+            rj.setResultMsg("标记失败，请检查该订单的发货状态及产品库存是否充足。");
             return rj;
         }
         rj = ResponseJson.getSUCCESS();