Merge remote-tracking branch 'origin/develop' into develop

mahuandong
2 parents 59cdc073 9b3fb0b5
Showing 5 changed files with 95 additions and 7 deletions
src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java
src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderService.java
src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderServiceImpl.java
src/main/resources/templates/config/statusFlowDetail/statusFlowDetail.html
src/main/resources/templates/shipment/shipmentHeader/shipmentHeader.html
@@ -184,6 +184,22 @@ public class ShipmentHeaderController extends BaseController
 		return AjaxResult.success("删除成功！");
 	}
  
+
+	/**
+	 * 审核出库主单
+	 */
+	@RequiresPermissions("shipment:bill:edit")
+	@Log(title = "出库-出库单", operating="审核出库主单", action = BusinessType.UPDATE)
+	@PostMapping("/review")
+	@ResponseBody
+	public AjaxResult review(String ids)
+	{
+		if (StringUtils.isEmpty(ids)) {
+			return AjaxResult.error("id不能为空");
+		}
+		return shipmentHeaderService.review(ids);
+	}
+
 	/**
 	 *  出库单报表打印
 	 * @return
@@ -11,7 +11,6 @@ public interface ShipmentHeaderService extends IService&lt;ShipmentHeader&gt;{
     //新增出库主单
     AjaxResult<Boolean> saveHeader(ShipmentHeader shipmentHeader) ;
  
-
     //根据单据类型建单据号
     String createCode(String shipmentType);
  
@@ -20,4 +19,7 @@ public interface ShipmentHeaderService extends IService&lt;ShipmentHeader&gt;{
  
     AjaxResult addHistory(ShipmentHeader shipmentHeader) throws InvocationTargetException, IllegalAccessException;
  
+    //审核出库单
+    AjaxResult review(String ids);
+
 }
@@ -3,6 +3,7 @@ package com.huaheng.pc.shipment.shipmentHeader.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.huaheng.common.exception.service.ServiceException;
+import com.huaheng.common.support.Convert;
 import com.huaheng.common.utils.security.ShiroUtils;
 import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.pc.shipment.shipmentContainerHeader.service.ShipmentContainerHeaderService;
@@ -169,4 +170,59 @@ public class ShipmentHeaderServiceImpl extends ServiceImpl&lt;ShipmentHeaderMapper,
         }
         return null;
     }
+
+    /**审核出库单，加入订单池
+     * 1、找到主单，确定主单的状态是否小于100
+     * 2.小于100时，把主单和相应的子单加入到list中，大于等于100时，直接跳过
+     * 3.将修改后的主单列表和子单列表进行修改，加入订单池
+     *
+     * @param ids
+     * @return
+     */
+
+    @Override
+    public AjaxResult review(String ids) {
+
+        List<ShipmentHeader> shipmentHeaders = new ArrayList<>();
+        List<ShipmentDetail> shipmentDetails = new ArrayList<>();
+
+        //1、找到主单，确定主单的状态是否小于100
+        for (Integer id : Convert.toIntArray(ids)){
+            ShipmentHeader shipmentHeader = this.getById(id);
+            if(shipmentHeader == null){
+                return AjaxResult.error("id为"+id+"的主单在系统不存在");
+            }
+
+            //2.小于100时，把主单和相应的子单加入到list中，大于等于100时，直接跳过
+            if(shipmentHeader.getFirstStatus() < 100 && shipmentHeader.getLastStatus() <100){
+                shipmentHeader.setFirstStatus(100);
+                shipmentHeader.setLastStatus(100);
+                shipmentHeaders.add(shipmentHeader);
+
+                LambdaQueryWrapper<ShipmentDetail> lam = Wrappers.lambdaQuery();
+                lam.eq(ShipmentDetail::getShipmentId,id)
+                        .eq(ShipmentDetail::getWarehouseCode,ShiroUtils.getWarehouseCode());
+                List<ShipmentDetail> shipmentDetailList = shipmentDetailService.list(lam);
+                if(shipmentDetailList != null){
+                    for(ShipmentDetail shipmentDetail : shipmentDetailList){
+                        shipmentDetail.setStatus(100);
+                    }
+                    shipmentDetails.addAll(shipmentDetailList);
+                }else {
+                    return AjaxResult.error("id为"+id+"的出库明细在系统不存在");
+                }
+            }
+        }
+
+        // 3.将修改后的主单列表和子单列表进行修改，加入订单池
+        Boolean flag = this.updateBatchById(shipmentHeaders);
+        if (flag == false){
+            throw new ServiceException("修改主单状态失败");
+        }
+        flag = shipmentDetailService.updateBatchById(shipmentDetails);
+        if (flag == false){
+            throw new ServiceException("修改明细状态失败");
+        }
+        return AjaxResult.success("订单审核成功,成功加入订单池");
+    }
 }
@@ -23,6 +23,7 @@
     var editFlag = [[${@permission.hasPermi('config:statusFlowDetails:edit')}]];
     var removeFlag = [[${@permission.hasPermi('config:statusFlowDetails:remove')}]];
     var datas = [[${@dict.getType('sys_normal_disable')}]];
+    var moduleType = [[${@dict.getType('moduleType')}]];
     var nessaryDatas = [[${@dict.getType('nessary')}]];
     var moduleType = [[${@dict.getType('moduleType')}]];
  
@@ -87,10 +87,10 @@
                            shiro:hasPermission="shipment:bill:remove">
                             <i class="fa fa-trash-o"></i> 删除
                         </a>
-                        <!--<a class="btn btn-outline btn-success btn-rounded" onclick="analysis()"-->
-                           <!--shiro:hasPermission="shipment:bill:analysis">-->
-                            <!--<i class="fa fa-plus"></i> 订单分析-->
-                        <!--</a>-->
+                        <a class="btn btn-outline btn-success btn-rounded" onclick="review()"
+                           shiro:hasPermission="shipment:bill:edit">
+                            <i class="fa fa-plus"></i> 订单审核
+                        </a>
                         <a class="btn btn-outline btn-success btn-rounded" onclick="wave()"
                            shiro:hasPermission="shipment:bill:wave">
                             <i class="fa fa-plus"></i> 加入波次
@@ -214,7 +214,8 @@
     var uploadStatus=[[${@dict.getType('uploadStatus')}]];
     var detailCreateUrl=prefix_detail+"/add";
     var detailRemoveUrl=prefix_detail+"/remove";
-    var detailanalysisUrl=prefix+"/analysis";
+    var reviewUrl=prefix+"/review";
+    var analysisUrl=prefix+"/analysis";
     var inventoryStatus=[[${@dict.getType('inventoryStatus')}]];
     var rossDoccking = [[${@permission.hasPermi('shipment:bill:rossDoccking')}]];
     var rossDocckingUrl =prefix_detail+"/rossDoccking";
@@ -640,10 +641,22 @@
         });
     }
  
+    /* 订单审核 */
+    function review() {
+        var rows=$("#bootstrap-table").bootstrapTable('getSelections');
+        if (rows.length == 0) {
+            $.modal.alertWarning("请至少选择一条记录");
+            return;
+        }
+            var url = reviewUrl;
+            var data = { "ids": rows.map(function(v){return v.id;}).join(',') };
+            localSubmit(url, "post", "json", data);
+    }
+
  
     /* 订单分析 */
     function analysis() {
-        var rows=$("#bootstrap-table-detail").bootstrapTable('getSelections');
+        var rows=$("#bootstrap-table").bootstrapTable('getSelections');
         if (rows.length == 0) {
             $.modal.alertWarning("请至少选择一条记录");
             return;