入库任务建立

pengcheng
1 parent e12715b5
Showing 7 changed files with 185 additions and 173 deletions
src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java
src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
src/main/resources/application-druid.properties
src/main/resources/templates/task/taskHeader/add.html
src/main/resources/templates/task/taskHeader/taskHeader.html
@@ -309,60 +309,6 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
             if(taskHeader==null){
                 throw new ServiceException("有相同的组盘头，但找不到相应的任务头");
             }
-
-            if(shipmentContainerDetaill == null) {
-                //shipmentContainerDetaill为空时，说明组盘明细不是新建，so修改任务明细
-                //查找任务明细
-                LambdaQueryWrapper<TaskDetail> taskDetailLam = Wrappers.lambdaQuery();
-                taskDetailLam.eq(TaskDetail::getWarehouseCode,shipmentContainerDetail.getWarehouseCode())
-                        .eq(TaskDetail::getAllocationId,shipmentContainerDetail.getId())
-                        .eq(TaskDetail::getTaskId,taskHeader.getId())
-                        .eq(TaskDetail::getInternalTaskType,QuantityConstant.TASK_INTENERTYPE_PICKING);
-                TaskDetail taskDetail = taskDetailService.getOne(taskDetailLam);
-                if(taskDetail == null){
-                    throw new ServiceException("找不到对应的任务明细");
-                }
-                taskDetail.setQty(taskDetail.getQty().add(shipmentCombinationModel.getShipQty()));
-                flag=taskDetailService.saveOrUpdate(taskDetail);
-                if(flag == false){
-                    throw new ServiceException("修改任务明细失败,sql错误");
-                }
-            }else {
-                //shipmentContainerDetaill不为空时，说明组盘明细是新建，so新建任务明细
-                TaskDetail taskDetail = new TaskDetail();
-                taskDetail.setTaskId(taskHeader.getId());
-                taskDetail.setInternalTaskType(taskHeader.getInternalTaskType());
-                taskDetail.setWarehouseCode(taskHeader.getWarehouseCode());
-                taskDetail.setCompanyCode(taskHeader.getCompanyCode());
-                taskDetail.setTaskType(taskHeader.getTaskType());
-                taskDetail.setAllocationId(shipmentContainerDetaill.getId());
-                taskDetail.setBillCode(shipmentContainerDetaill.getShipmentCode());
-                taskDetail.setBillDetailId(shipmentContainerDetaill.getShipmentDetailId());
-                taskDetail.setMaterialCode(shipmentContainerDetaill.getMaterialCode());
-                taskDetail.setMaterialName(shipmentContainerDetaill.getMaterialName());
-                taskDetail.setMaterialSpec(shipmentContainerDetaill.getMaterialSpec());
-                taskDetail.setMaterialUnit(shipmentContainerDetaill.getMaterialUnit());
-                taskDetail.setFromInventoryId(shipmentContainerDetaill.getInventoryId());
-                taskDetail.setQty(shipmentContainerDetaill.getQty());
-                taskDetail.setContainerCode(taskHeader.getContainerCode());
-                taskDetail.setFromLocation(taskHeader.getFromLocation());
-                taskDetail.setToLocation(taskHeader.getToLocation());
-                taskDetail.setLot(shipmentContainerDetaill.getLot());
-                taskDetail.setWaveId(shipmentContainerDetaill.getWaveId());
-                taskDetail.setBatch(shipmentContainerDetaill.getBatch());
-                taskDetail.setProjectNo(shipmentContainerDetaill.getProjectNo());
-                if (shipmentContainerHeader.getStatus().equals(QuantityConstant.SHIPMENT_CONTAINER_TASK)) {
-                    taskDetail.setStatus(QuantityConstant.TASK_STATUS_BUILD);
-                } else {
-                    taskDetail.setStatus(QuantityConstant.TASK_STATUS_RELEASE);
-                }
-                taskDetail.setCreatedBy(ShiroUtils.getLoginName());
-                taskDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
-                flag = taskDetailService.save(taskDetail);
-                if(flag == false){
-                    throw new ServiceException("新建任务明细失败,sql错误");
-                }
-            }
         }
         return shipmentContainerDetail;
     }
@@ -102,6 +102,31 @@ public class TaskHeaderController extends BaseController {
     }
  
     /**
+     * 新增立库任务界面
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+
+
+    /**
+     * 新增立库任务
+     */
+    @RequiresPermissions("task:taskHeader:add")
+    @Log(title = "任务-任务管理", operating = "新增立库任务", action = BusinessType.UPDATE)
+    @PostMapping( "/add")
+    @ResponseBody
+    public AjaxResult add(String containerCode)
+    {
+        AjaxResult ajaxResult = taskHeaderService.addTaskHeader(containerCode);
+        return ajaxResult;
+    }
+
+
+    /**
      * 下发任务
      */
     @RequiresPermissions("task:taskHeader:execute")
@@ -57,4 +57,7 @@ public interface TaskHeaderService extends IService&lt;TaskHeader&gt;{
  
     AjaxResult createAutoEmptyOut(String warehouseCode);
  
+
+    AjaxResult addTaskHeader(String containerCode);
+
 }
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huaheng.api.wcs.service.taskAssignService.TaskAssignService;
 import com.huaheng.common.constant.QuantityConstant;
+import com.huaheng.common.exception.service.Asserrt;
 import com.huaheng.common.exception.service.ServiceException;
 import com.huaheng.common.support.Convert;
 import com.huaheng.common.utils.StringUtils;
@@ -158,102 +159,75 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
     }
  
     /**
+     * 1、查看任务状态
+     * 2、修改库位和容器状态
+     * 3、如果是出库任务，减去相应库存的任务数
+     * 4、删除任务头和明细
+     *
      * 取消任务
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult cancelTask(Integer[] taskIds) {
         for (int taskId : taskIds) {
-            TaskHeader taskHeader = taskHeaderService.getById(taskId);
+            TaskHeader
+                    taskHeader
+                    = taskHeaderService.getById(taskId);
             if (taskHeader == null) {
                 return AjaxResult.error("任务" + taskId + "未找到，操作中止");
             }
             if (taskHeader.getStatus() >= QuantityConstant.TASK_STATUS_RELEASE) {
                 return AjaxResult.error("存在任务" + taskHeader.getId() + "已下发或执行，操作中止");
             }
+
+            // 更改库位状态
+                LambdaQueryWrapper<Container> containerLambda = Wrappers.lambdaQuery();
+                containerLambda.eq(Container::getCode, taskHeader.getContainerCode())
+                        .eq(Container::getWarehouseCode, ShiroUtils.getWarehouseCode());
+                Container container = containerService.getOne(containerLambda);
+
+                if (StringUtils.isEmpty(container.getLocationCode())) {
+                    locationService.updateContainerCodeAndStatus(taskHeader.getToLocation(),"","empty");
+                }else {
+                    locationService.updateContainerCodeAndStatus(taskHeader.getToLocation(),container.getCode(),"empty");
+                }
+
+
+
+
             //查出任务明细
-            TaskDetail taskDetail1 = new TaskDetail();
+            TaskDetail
+                    taskDetail1
+                    = new TaskDetail();
             taskDetail1.setTaskId(taskHeader.getId());
             taskDetail1.setWarehouseCode(taskHeader.getWarehouseCode());
             taskDetail1.setCompanyCode(taskHeader.getCompanyCode());
-            LambdaQueryWrapper<TaskDetail> td = Wrappers.lambdaQuery(taskDetail1);
-            List<TaskDetail> taskDetailList = taskDetailService.list(td);
-            TaskDetail taskDetail = taskDetailList.get(0);
-            if (taskDetail == null) {
-                throw new ServiceException("任务明细条目错误");
-            }
-            //删除子任务
-            LambdaQueryWrapper<TaskDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
-            lambdaQueryWrapper.eq(TaskDetail::getTaskId, taskHeader.getId());
-            taskDetailService.remove(lambdaQueryWrapper);
-            //删除主任务
-            taskHeaderService.removeById(taskHeader.getId());
-            // 更改库位状态（整盘入库任务除外）
-            if (taskHeader.getInternalTaskType().equals(QuantityConstant.TASK_INTENERTYPE_SHELF)) {
-                receiptContainerHeaderService.cancelReceipt(taskHeader.getAllocationHeadId());
-            }
-            //根据任务类型来更新货箱状态
-            //修改关联的货箱状态
-            if (taskHeader.getInternalTaskType().equals(QuantityConstant.TASK_INTENERTYPE_PICKING)) {
-                ShipmentContainerHeader shipmentContainerHeader = new ShipmentContainerHeader();
-                shipmentContainerHeader.setId(taskHeader.getAllocationHeadId());
-                shipmentContainerHeader.setStatus(QuantityConstant.SHIPMENT_CONTAINER_BUILD);
-                shipmentContainerHeaderService.updateById(shipmentContainerHeader);
-            }
-            //盘点取消任务，恢复明细状态为1
-            if (taskHeader.getInternalTaskType().equals(QuantityConstant.TASK_INTENERTYPE_CYCLECOUNT)) {
-
-                CycleCountDetail cycleCountDetail = new CycleCountDetail();
-                cycleCountDetail.setCompanyCode(taskDetail.getCompanyCode());
-                cycleCountDetail.setWarehouseCode(taskDetail.getWarehouseCode());
-                cycleCountDetail.setLocationCode(taskDetail.getFromLocation());
-                cycleCountDetail.setContainerCode(taskDetail.getContainerCode());
-                cycleCountDetail.setCycleCountHeadCode(taskDetail.getBillCode());//盘点单Code
-                cycleCountDetail.setId(taskDetail.getBillDetailId());//盘点细单ID
-                LambdaQueryWrapper<CycleCountDetail> lam = Wrappers.lambdaQuery(cycleCountDetail);
-                List<CycleCountDetail> cycleCountDetailList = cycleCountDetailService.list(lam);//
-                for (CycleCountDetail item : cycleCountDetailList) {
-                    item.setTaskHeaderId(null);
-                    item.setTaskHeaderId(null);
-                    item.setLastUpdated(new Date());
-                    item.setLastUpdatedBy(ShiroUtils.getLoginName());
-                    item.setEnableStatus(1);
-                    cycleCountDetailService.saveOrUpdate(item);
-                }
-
-            }
-            if (taskHeader.getInternalTaskType().equals(QuantityConstant.TASK_INTENERTYPE_TRANSFER)) {
-                if (taskHeader.getFromLocation() != null) {
-                    //更新托盘、库位状态
-                    locationService.updateStatus(taskHeader.getFromLocation(), "empty");
-                }
-                if (taskHeader.getToLocation() != null) {
-                    //更新托盘、库位状态
-                    locationService.updateStatus(taskHeader.getToLocation(), "empty");
-                }
-            }
-            if (taskHeader.getInternalTaskType().equals(QuantityConstant.TASK_INTENERTYPE_SHELF) || taskHeader.getInternalTaskType().equals(QuantityConstant.TASK_INTENERTYPE_PICKING)) {
-                if (taskHeader.getToLocation() != null) {
-                    //更新托盘、库位状态
-                    locationService.updateStatus(taskHeader.getToLocation(), "empty");
-                }
-                LambdaQueryWrapper<InventoryHeader> inventoryHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
-                inventoryHeaderLambdaQueryWrapper.eq(InventoryHeader::getContainerCode, taskHeader.getContainerCode());
-                InventoryHeader inventoryHeader = inventoryHeaderService.getOne(inventoryHeaderLambdaQueryWrapper);
-                Container container = new Container();
-                container.setStatus("empty");
-                if(inventoryHeader != null) {
-                    if("some".equals(inventoryHeader.getContainerStatus())) {
-                        container.setStatus("some");
+            LambdaQueryWrapper<TaskDetail>
+                    td
+                    = Wrappers.lambdaQuery(taskDetail1);
+            List<TaskDetail>
+                    taskDetailList
+                    = taskDetailService.list(td);
+            if(!taskDetailList.isEmpty()) {
+                //如果是出库任务，修改库存任务数量
+                if(taskHeader.getInternalTaskType() == QuantityConstant.TASK_INTENERTYPE_PICKING){
+                    for(TaskDetail item: taskDetailList){
+                        InventoryDetail inventoryDetail = inventoryDetailService.getById(item.getBillDetailId());
+                        Asserrt.notNull(inventoryDetail,"出库任务明细id为"+item.getId()+"的库存不存在");
+                        inventoryDetail.setTaskQty(inventoryDetail.getTaskQty().subtract(item.getQty()));
+                        Asserrt.isFalse(inventoryDetailService.updateById(inventoryDetail),"修改出库任务明细id为"+item.getId()+"的库存失败");
                     }
                 }
-                LambdaUpdateWrapper<Container> containerUpdateWrapper = Wrappers.lambdaUpdate();
-                containerUpdateWrapper.eq(Container::getCode, taskHeader.getContainerCode());
-                containerService.update(container, containerUpdateWrapper);
+
+                //删除子任务
+                LambdaQueryWrapper<TaskDetail>
+                        lambdaQueryWrapper
+                        = Wrappers.lambdaQuery();
+                lambdaQueryWrapper.eq(TaskDetail::getTaskId, taskHeader.getId());
+                taskDetailService.remove(lambdaQueryWrapper);
             }
-//            if(task.getType()==900){
-//                //出库查看任务没有关联的货箱，不做处理
-//            }
+            //删除主任务
+            taskHeaderService.removeById(taskHeader.getId());
         }
  
         return AjaxResult.success("取消任务成功！");
@@ -686,6 +660,73 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
     }
  
     /**
+     * 新增入库任务
+     * 1、检查容器是否存在
+     * 2、检查改容器是否有未完成任务
+     * 3、创建任务
+     * 4、整盘定位
+     * 5、修改库位状态
+     * @param containerCode
+     * @return
+     */
+    @Override
+    public AjaxResult addTaskHeader(String containerCode) {
+        if(StringUtils.isEmpty(containerCode)){
+            return AjaxResult.error("容器为空");
+        }
+
+        //1、验证容器
+        LambdaQueryWrapper<Container> containerLambdaQueryWrapper = Wrappers.lambdaQuery();
+        containerLambdaQueryWrapper.eq(Container::getCode,containerCode)
+                .eq(Container::getWarehouseCode,ShiroUtils.getWarehouseCode());
+        Container container = containerService.getOne(containerLambdaQueryWrapper);
+        Asserrt.notNull(container,"容器编码错误，系统没有此编号");
+
+        //2、验证该托盘是否还有任务
+        LambdaQueryWrapper<TaskHeader> taskHeaderLambda = Wrappers.lambdaQuery();
+
+        //3、创建任务
+        TaskHeader taskHeader = new TaskHeader();
+        taskHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
+        if(StringUtils.isEmpty(container.getLocationCode())){
+            taskHeader.setTaskType(QuantityConstant.TASK_TYPE_WHOLERECEIPT);
+        }else {
+            taskHeader.setTaskType(QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT);
+        }
+        taskHeader.setInternalTaskType(QuantityConstant.TASK_INTENERTYPE_SHELF);
+        taskHeader.setContainerCode(containerCode);
+        taskHeader.setFromLocation(container.getLocationCode());
+        taskHeader.setToLocation(container.getLocationCode());
+        taskHeader.setStatus(QuantityConstant.TASK_STATUS_BUILD);
+        taskHeader.setCreated(new Date());
+        taskHeader.setCreatedBy(ShiroUtils.getLoginName());
+        taskHeader.setLastUpdated(new Date());
+        taskHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
+
+
+        //4、整盘定位
+        if(taskHeader.getTaskType() == QuantityConstant.TASK_TYPE_WHOLERECEIPT){
+            LambdaQueryWrapper<Location> locationLambda = Wrappers.lambdaQuery();
+            locationLambda.eq(Location::getWarehouseCode,ShiroUtils.getWarehouseCode())
+                    .last("AND status = 'empty' AND (containerCode IS NULL OR containerCode = '') order by iColumn asc,iLayer asc,iRow asc  LIMIT 1");
+            Location location = locationService.getOne(locationLambda);
+            Asserrt.notNull(location,"现在没有空余库位，请稍后再试");
+            taskHeader.setToLocation(location.getCode());
+            locationService.updateContainerCodeAndStatus(taskHeader.getToLocation(), "", "lock");
+        }else {
+            locationService.updateContainerCodeAndStatus(taskHeader.getToLocation(), taskHeader.getContainerCode(), "lock");
+        }
+
+        Asserrt.isFalse(this.save(taskHeader),"新增任务头失败");
+        return AjaxResult.success("新增任务头成功");
+    }
+
+
+
+
+
+
+    /**
      * 自动分配库位
      * @param taskId  任务号
      * @param high 1是高库位，否则低库位
@@ -2,7 +2,7 @@
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
 # Ö÷¿â
-spring.datasource.druid.master.url=jdbc:mysql://172.16.29.45:3306/wms_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2b8
+spring.datasource.druid.master.url=jdbc:mysql://172.16.29.45:3306/jxwms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2b8
 #spring.datasource.druid.master.url=jdbc:mysql://172.16.29.45:3306/huahengExample?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
 #spring.datasource.druid.master.url=jdbc:mysql://117.62.222.186:3306/wms_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2b8
  
@@ -23,30 +23,24 @@
 					<!--<input id="companyId" name="companyId" class="form-control" type="text">-->
 				<!--</div>-->
 			<!--</div>-->
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">优先级(1-99)：</label>
-				<div class="col-sm-8">
-					<input id="priority" name="priority" class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">任务类型：</label>
-				<div class="col-sm-8">
-					<!--<input id="type" name="type" class="form-control" type="text">-->
-					<select id="type" class="form-control m-b" th:with="taskType=${@dict.getType('taskType')}">
-						<option th:each="dict : ${taskType}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>
-					</select>
-				</div>
-			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">出入库站台：</label>
-				<div class="col-sm-8">
-					<!--<input id="station" name="station" class="form-control" type="text">-->
-					<select id="station" class="form-control m-b" th:with="stations=${@dict.getType('taskType')}">
-						<option th:each="dict : ${stations}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>
-					</select>
-				</div>
-			</div>
+			<!--<div class="form-group">	-->
+				<!--<label class="col-sm-3 control-label">任务类型：</label>-->
+				<!--<div class="col-sm-8">-->
+					<!--&lt;!&ndash;<input id="type" name="type" class="form-control" type="text">&ndash;&gt;-->
+					<!--<select id="type" class="form-control m-b" th:with="taskType=${@dict.getType('taskType')}">-->
+						<!--<option th:each="dict : ${taskType}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>-->
+					<!--</select>-->
+				<!--</div>-->
+			<!--</div>-->
+			<!--<div class="form-group">	-->
+				<!--<label class="col-sm-3 control-label">出入库站台：</label>-->
+				<!--<div class="col-sm-8">-->
+					<!--&lt;!&ndash;<input id="station" name="station" class="form-control" type="text">&ndash;&gt;-->
+					<!--<select id="station" class="form-control m-b" th:with="stations=${@dict.getType('taskType')}">-->
+						<!--<option th:each="dict : ${stations}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>-->
+					<!--</select>-->
+				<!--</div>-->
+			<!--</div>-->
 			<!--<div class="form-group">	-->
 				<!--<label class="col-sm-3 control-label">容器Id：</label>-->
 				<!--<div class="col-sm-8">-->
@@ -59,18 +53,18 @@
 					<input id="containerCode" name="containerCode" class="form-control" type="text">
 				</div>
 			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">来源库位：</label>
-				<div class="col-sm-8">
-					<input id="sourceLocation" name="sourceLocation" class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">目的库位：</label>
-				<div class="col-sm-8">
-					<input id="destinationLocation" name="destinationLocation" class="form-control" type="text">
-				</div>
-			</div>
+			<!--<div class="form-group">	-->
+				<!--<label class="col-sm-3 control-label">来源库位：</label>-->
+				<!--<div class="col-sm-8">-->
+					<!--<input id="sourceLocation" name="sourceLocation" class="form-control" type="text">-->
+				<!--</div>-->
+			<!--</div>-->
+			<!--<div class="form-group">	-->
+				<!--<label class="col-sm-3 control-label">目的库位：</label>-->
+				<!--<div class="col-sm-8">-->
+					<!--<input id="destinationLocation" name="destinationLocation" class="form-control" type="text">-->
+				<!--</div>-->
+			<!--</div>-->
 			<!--<div class="form-group">	-->
 				<!--<label class="col-sm-3 control-label">完成状态：</label>-->
 				<!--<div class="col-sm-8">-->
@@ -141,7 +135,7 @@
 	</div>
     <div th:include="include::footer"></div>
     <script type="text/javascript">
-		var prefix = ctx + "task/task"
+		var prefix = ctx + "task/taskHeader"
 		$("#form-task-add").validate({
 			rules:{
 				xxxx:{
@@ -94,7 +94,10 @@
 					      <!--<a class="btn btn-outline btn-info btn-rounded" onclick="emptyOut()" shiro:hasPermission="task:task:emptyOut">-->
 						     <!--<i class="fa fa-level-up"></i> 空托出库-->
 					      <!--</a>-->
-						  <a class="btn btn-outline btn-success btn-rounded" onclick="print()" shiro:hasPermission="task:task:execute">
+						  <a th:if="${InternalTaskType} eq 100" class="btn btn-outline btn-primary btn-rounded" onclick="$.operate.add()" shiro:hasPermission="task:task:add">
+							  <i class="fa fa-send"></i> 新增
+						  </a>
+						  <a class="btn btn-outline btn-success btn-rounded" onclick="print()" shiro:hasPermission="task:task:print">
 							  <i class="fa fa-print"></i> 打印
 						  </a>
 						  <a class="btn btn-outline btn-primary btn-rounded" onclick="batchExecute()" shiro:hasPermission="task:task:execute">
@@ -168,9 +171,9 @@
 							actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>取消</a> ');
 							actions.push('<a class="btn btn-primary btn-xs ' + completeFlag + '" href="#" onclick="complete(\'' + row.id + '\')"><i class="fa fa-check"></i>完成</a>');
 						}
-						if (row.status >= 10 && row.status < 100)  {
-							actions.push('<a class="btn btn-primary btn-xs ' + completeFlag + '" href="#" onclick="complete(\'' + row.id + '\')"><i class="fa fa-check"></i>完成</a>');
-						}
+						// if (row.status >= 10 && row.status < 100)  {
+						// 	actions.push('<a class="btn btn-primary btn-xs ' + completeFlag + '" href="#" onclick="complete(\'' + row.id + '\')"><i class="fa fa-check"></i>完成</a>');
+						// }
 						return actions.join('');
 					}
 				},