Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/SalesOrderService.java

@@ -337,4 +337,10 @@ public interface SalesOrderService {
      */
     public PagedResult<SalesOrder> salesOrderListAndItemPage(int pageNO, int pageSize, SalesOrder salesOrder, boolean isTotalNum);
 
+
+    /**
+     * 查询订单项集合
+     * @return
+     */
+    List<SalesOrderItem> selectSalesOrderItemList(Integer salesId);
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/ApprovalOrderServiceImpl.java

@@ -673,6 +673,11 @@ public class ApprovalOrderServiceImpl implements ApprovalOrderService {
                 approvalTaskService.revokeTask(approvalInfo.getActivitiId(),"审批人驳回审核");
                 break;
             case 3:
+                if(ainfo.getApprovalStatus() > 1){
+                    rj = ResponseJson.getFAILURE();
+                    rj.setResultMsg("已审批的订单不允许撤销！");
+                    return  rj;
+                }
                 //修改审批信息状态为撤销
                 info.setApprovalStatus(9);
                 if(approvalOrderMapper.updateApprovalInfo(info) < 1){

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

@@ -1009,4 +1009,8 @@ public class SalesOrderServiceImpl implements SalesOrderService {
         return PageUtil.getPage(list);
     }
 
+    @Override
+    public List<SalesOrderItem> selectSalesOrderItemList(Integer salesId) {
+        return salesOrderMapper.selectSalesOrderItemList(salesId);
+    }
 }

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

@@ -274,4 +274,10 @@ public interface SalesOrderMapper {
      */
     List<SalesOrder> salesOrderListAndItem(SalesOrder salesOrder);
 
+    /**
+     * 查询订单项集合
+     * @return
+     */
+    List<SalesOrderItem> selectSalesOrderItemList(Integer salesId);
+
 }

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

@@ -949,24 +949,31 @@ public class AdminSalesOrderController {
     @ResponseBody
     @RequestMapping("/confirm_salesOrder")
     @RequiresPermissions("salesOrder:confirm:salesOrder")
-    public ResponseJson confirmSalesOrder(HttpServletRequest request,Integer[] salesOrderIds) throws Exception {
+    public ResponseJson confirmSalesOrder(HttpServletRequest request,Integer[] salesOrderIds,Integer isSplit) throws Exception {
         ResponseJson rj = ResponseJson.getFAILURE();
         Integer flag = 0;
         String errorId = "";
-        for (Integer salesIds:salesOrderIds) {
-            try{
-                flag = salesOrderService.confirmSalesOrder(salesIds);
-            }catch (Exception e){
-                e.printStackTrace();
+            for (Integer salesIds : salesOrderIds) {
+                if(isSplit != null && isSplit == 1){
+                    try {
+                        flag = salesOrderService.confirmSalesOrder(salesIds);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }else if(isSplit != null && isSplit == 2){
+                    SalesOrder salesOrder = new SalesOrder();
+                    salesOrder.setSalesId(salesIds);
+                    salesOrder.setSalesStatus(1);
+                    flag = salesOrderService.updateSalesOrder(salesOrder);
+                }
+                if (flag < 1) {
+                    errorId += salesIds + ",";
+                }
             }
-            if(flag < 1){
-                errorId  += salesIds + ",";
+            if (errorId.length() > 0) {
+                rj.addResponseKeyValue("errorId", errorId);
+                return rj;
             }
-        }
-        if(errorId.length() > 0){
-            rj.addResponseKeyValue("errorId",errorId);
-            return rj;
-        }
         rj = new ResponseJson(200, "确认订单成功", 200);
         return rj;
     }

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

@@ -543,8 +543,11 @@ public class AwaitSendController {
             rj.setResultMsg("出货失败，请检查该物流单号（"+postNum+"）和订单状态。");
             return rj;
         }
+        //查询出库的产品项
+        List<SalesOrderItem> itemList = salesOrderService.selectSalesOrderItemList(salesOrder.getSalesId());
         rj = ResponseJson.getSUCCESS();
         rj.setResultMsg("物流单号（"+ postNum +"）出库成功。");
+        rj.addResponseKeyValue("itemList",itemList);
         return rj;
     }
 

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

@@ -68,7 +68,35 @@
                 <div class="formControls col-1 col-sm-1" style="width: 100px;">
                     <input type="submit" style="" class="btn btn-primary add-order-button"  value="出库" >
                 </div>
-                <div class="formControls col-6 col-sm-6"  id="msg" style="display: none; line-height: 31px;color:#f00">
+            </div>
+
+            <div class="row cl" id="msg" style="display: none">
+                <div class="formControls col-5 col-sm-5" style="margin-left: 200px">
+                    <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;">
+                        <i class="Hui-iconfont" style="font-size: 70px;color: #00B83F;">&#xe706;</i>
+                    </div>
+                    <br>
+                    <span style="font-size: 30px;;margin-left: -200px" id="isMsgId">出库成功</span>
+                </div>
+            </div>
+
+            <div class="row cl" id="tableId" style="display: none">
+                <div class="formControls col-6 col-sm-6">
+                    <span>请确认订单产品以及订单产品数量</span>
+                    <table class="table table-border table-bordered table-bg table-hover table-sort">
+                        <thead>
+                        <tr class="text-c">
+                            <th width="50">订单产品</th>
+                            <th width="50">产品数量</th>
+                        </tr>
+                        </thead>
+                        <tbody id="productHtml">
+
+                        </tbody>
+                    </table>
                 </div>
             </div>
 </br>
@@ -145,8 +173,28 @@
             callback: function (data) {//异步回调函数
                 if (data) {
                     $("#msg").show();
-                    $("#msg").html(data.resultMsg);
+                    $("#isMsgId").html(data.resultMsg);
                     if(data.returnCode == 200){
+                        $("#tableId").show();
+                        $("#iconfontId2").hide();
+                        $("#iconfontId").show();
+                        var html = "";
+                        if (data.returnMsg.itemList.length > 0 ) {
+                            for(var i=0;i<data.returnMsg.itemList.length;i++){
+                                var product = data.returnMsg.itemList[i];
+                                html += '<tr class="text-c">' +
+                                        ' <td>'+ cufte(product.itemProductName) +'</td>' +
+                                        ' <td>'+ cufte(product.itemNum) +'</td>' +
+                                        ' </tr>';
+                            }
+                        }
+                        $("#productHtml").html(html);
+                    }else{
+                        $("#iconfontId").hide();
+                        $("#iconfontId2").show();
+                        $("#tableId").hide();
+                        $("#productHtml").html("");
+
                     }
 
                     $("#postNum").val("");

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

@@ -495,9 +495,17 @@
          * 批量确认订单
          */
         function confirmOrder(){
-            var index = layer.load(1, {
-                shade: [0.5,'#fff'] //0.1透明度的白色背景
+            var isSplit = 1;//是否需要拆单
+            layer.confirm('是否需要进行拆单', {
+                btn: ['需要','不需要'] //按钮
+            }, function(){
+                isSplit = 1;
+            }, function(){
+                isSplit = 2;
             });
+            /*var index = layer.load(1, {
+                shade: [0.5,'#fff'] //0.1透明度的白色背景
+            });*/
 
             var salesOrderIds = "";
             $(".sales_id:checked").each(function(){
@@ -513,7 +521,8 @@
                 type:'POST',
                 url: '${path}/admin/salesOrder/confirm_salesOrder',
                 data:{
-                    "salesOrderIds" : salesOrderIds
+                    "salesOrderIds" : salesOrderIds,
+                    "isSplit" : isSplit
                 },
                 dataType: 'json',
                 success:function(res) {
@@ -668,16 +677,25 @@
          * 确认订单
          */
         function confirm_one(salesId){
-            var index = layer.load(1, {
-                shade: [0.5,'#fff'] //0.1透明度的白色背景
+            var isSplit = 1;//是否需要拆单
+            layer.confirm('是否需要进行拆单', {
+                btn: ['需要','不需要'] //按钮
+            }, function(){
+                isSplit = 1;
+            }, function(){
+                isSplit = 2;
             });
+            /*var index = layer.load(1, {
+                shade: [0.5,'#fff'] //0.1透明度的白色背景
+            });*/
 
             var salesOrderIds = salesId;
             $.ajax({
                 type:'POST',
                 url: '${path}/admin/salesOrder/confirm_salesOrder',
                 data:{
-                    "salesOrderIds" : salesOrderIds
+                    "salesOrderIds" : salesOrderIds,
+                    "isSplit" : isSplit
                 },
                 dataType: 'json',
                 success:function(res) {