出库管理

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

@@ -1129,7 +1129,7 @@ public class SalesOrderServiceImpl implements SalesOrderService {
                         throw new RuntimeException("更新库存失败，增加库存记录失败。");
                     }
                 }else{
-                    throw new RuntimeException("更新库存失败，该产品库存不足。");
+                    throw new RuntimeException("更新库存失败，["+ info.getInventoryProductName()+ "("+ info.getProductColorName() +")" +"]库存不足。");
                 }
             }else{
                 throw new RuntimeException("更新库存失败，未查询到库存信息，请确认该仓库是否有该产品库存信息。");

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

@@ -77,6 +77,8 @@ public class AdminSalesOrderController {
     private KuaiDi100 kuaidi100;
     @Autowired
     private SmsService smsService;
+    @Autowired
+    private OrderWarehouseService orderWarehouseService;
     /**
      * 分页查询订单列表信息
      * @param request
@@ -1134,41 +1136,41 @@ public class AdminSalesOrderController {
      * @return
      * @throws Exception
      */
-    @ResponseBody
-    @RequestMapping("/notice_distribution")
-    @RequiresPermissions("salesOrder:distribution:salesOrder")
-    public ResponseJson noticeDistribution(HttpServletRequest request,Integer[] salesOrderIds,Integer warehouseId) throws Exception {
-        ResponseJson rj = ResponseJson.getFAILURE();
-        Integer flag = 0;
-        StringBuilder errorId = new StringBuilder();
-        if(warehouseId == null){
-            return rj;
-        }
-        for (Integer salesIds:salesOrderIds) {
-            SalesOrder salesOrder = salesOrderService.getSalesOrderById(salesIds);
-            if(salesOrder == null || salesOrder.getSalesPostFirm() == null || salesOrder.getSalesPostFirm().isEmpty()){
-                //检查订单是否已经有了配送方式,如果没有不允许通知配货
-                errorId.append(salesIds).append(",");
-                continue;
-            }
-            SalesOrder newOrder = new SalesOrder();
-            newOrder.setSalesId(salesIds);
-            newOrder.setSalesOrderId(salesOrder.getSalesDealCode());
-            newOrder.setSalesShippingStatus(11);
-            newOrder.setSalesWarehouseId(warehouseId);
-            flag = salesOrderService.noticeDistribution(newOrder);
-            if(flag < 1){
-                errorId.append(salesIds).append(",");
-            }
-        }
-        if(errorId.length() > 0){
-            rj.setResultMsg(errorId.toString());
-            logger.info("通知配货失败订单id:"+errorId);
-            return rj;
-        }
-        rj = new ResponseJson(200, "修改成功", 200);
-        return rj;
-    }
+//    @ResponseBody
+//    @RequestMapping("/notice_distribution")
+//    @RequiresPermissions("salesOrder:distribution:salesOrder")
+//    public ResponseJson noticeDistribution(HttpServletRequest request,Integer[] salesOrderIds,Integer warehouseId) throws Exception {
+//        ResponseJson rj = ResponseJson.getFAILURE();
+//        Integer flag = 0;
+//        StringBuilder errorId = new StringBuilder();
+//        if(warehouseId == null){
+//            return rj;
+//        }
+//        for (Integer salesIds:salesOrderIds) {
+//            SalesOrder salesOrder = salesOrderService.getSalesOrderById(salesIds);
+//            if(salesOrder == null || salesOrder.getSalesPostFirm() == null || salesOrder.getSalesPostFirm().isEmpty()){
+//                //检查订单是否已经有了配送方式,如果没有不允许通知配货
+//                errorId.append(salesIds).append(",");
+//                continue;
+//            }
+//            SalesOrder newOrder = new SalesOrder();
+//            newOrder.setSalesId(salesIds);
+//            newOrder.setSalesOrderId(salesOrder.getSalesDealCode());
+//            newOrder.setSalesShippingStatus(11);
+//            newOrder.setSalesWarehouseId(warehouseId);
+//            flag = salesOrderService.noticeDistribution(newOrder);
+//            if(flag < 1){
+//                errorId.append(salesIds).append(",");
+//            }
+//        }
+//        if(errorId.length() > 0){
+//            rj.setResultMsg(errorId.toString());
+//            logger.info("通知配货失败订单id:"+errorId);
+//            return rj;
+//        }
+//        rj = new ResponseJson(200, "修改成功", 200);
+//        return rj;
+//    }
 
 
     /**

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

@@ -625,7 +625,13 @@ public class AwaitSendController {
             return rj;
         }
         salesOrder.setSalesDeliver(2);
-        Integer flag = salesOrderService.updateDeliver(salesOrder);
+        Integer flag = 0;
+        try{
+            flag = salesOrderService.updateDeliver(salesOrder);
+        }catch (Exception e){
+            rj.setResultMsg("出货失败，该物流单号（"+postNum+"）无法出库;</br>原因："+e.getMessage());
+            return rj;
+        }
         if(flag < 1){
             rj.setResultMsg("出货失败，请检查该物流单号（"+postNum+"）和订单状态,产品库存是否充足。");
             return rj;

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/choose_warehouse.ftl

@@ -93,7 +93,7 @@
     function chooseWarehouseById(){
         var type = "${type!""}";
         var ids = "${ids!""}";
-        var warehouseId =  $("input[name='warehouseId']").val();
+        var warehouseId =  $("input[name='warehouseId']:checked").val();
 
         if(!isEmpty(warehouseId) || !isEmpty(ids)){
             layer.msg("通知配货数据有误！", {icon: 5, time: 3000});

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/deliver_list.ftl

@@ -71,15 +71,15 @@
             </div>
 
             <div class="row cl" id="msg" style="display: none">
-                <div class="formControls col-5 col-sm-5" style="width: 100%;margin-left: 200px">
+                <div class="formControls col-5 col-sm-5" style="width: 100%;">
                     <div id="iconfontId" style="display: none;">
                         <i class="Hui-iconfont" style="font-size: 70px;color: #00B83F;" >&#xe676;</i>
                     </div>
-                    <div id="iconfontId2" style="display: none;">
+                    <div id="iconfontId2" style="display: none;margin-left: 200px">
                         <i class="Hui-iconfont" style="font-size: 70px;color: #ff0000;;">&#xe706;</i>
                     </div>
                     <br>
-                    <span style="font-size: 30px;;margin-left: -200px" id="isMsgId">出库成功</span>
+                    <span style="font-size: 30px;display: block" id="isMsgId">出库成功</span>
                 </div>
             </div>