优化定时任务

易文鹏
1 parent 66fba61d
Showing 4 changed files with 15 additions and 13 deletions
src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java
src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java
src/main/java/com/huaheng/pc/system/user/controller/IndexController.java
src/main/java/com/huaheng/pc/task/taskHeader/service/WorkTaskService.java
@@ -85,7 +85,10 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
     @Override
     public AjaxResult createCheckCountTask(List<Integer> ids) {
         //生成出库查看任务
-        return  workTaskService.createCheckCountTask(ids);
+        if(ShiroUtils.getUser()!=null&& Arrays.asList(QuantityConstant.USERID_AGV).contains(ShiroUtils.getUserId().toString())) {
+            return  workTaskService.createCheckCountTask(ids);
+        }
+       return AjaxResult.error("AGV库才能盘点！");
     }
     @Override
     public int getUncompleteReceiptContainer(String locationCode) {
@@ -169,7 +169,7 @@ public class RyTask extends BaseController {
      * 定时清除日志
      */
     public void truncateTable(String params) {
-        //删除上个月
+        //删除上个月数据
         apiLogService.deleteMonth();
         operLogService.truncateTable();
         jobLogService.truncateTable();
@@ -429,8 +429,9 @@ public class RyTask extends BaseController {
                 .eq(ReceiptContainerDetail::getToMes, 0)//未回传
                 .lt(ReceiptContainerDetail::getToMesErrorCount, 3)//错误次数小于3
                 .eq(ReceiptContainerDetail::getMaterialIsBattery, 1)//是电池类
+                .isNotNull(ReceiptContainerDetail::getBatteryPackTwoCode)
                 .last("limit 1"));
-        if (list.size() < 1) {
+        if (list.isEmpty()) {
             return;
         }
@@ -438,9 +439,9 @@ public class RyTask extends BaseController {
         for (ReceiptContainerDetail detail : list) {
             ToMes.ContentDTO.BarcodedataDTO barcodedataDTO = new ToMes.ContentDTO.BarcodedataDTO();
             //获取供应商
-            Supplier supplier = supplierService.list(new LambdaQueryWrapper<Supplier>().eq(Supplier::getCode, detail.getSupplierCode())).get(0);
-            if (supplier == null) {
-                supplier = new Supplier();
+            Supplier supplier = new Supplier();
+            List<Supplier> list1 = supplierService.list(new LambdaQueryWrapper<Supplier>().eq(Supplier::getCode, detail.getSupplierCode()));
+            if (list1.isEmpty()) {
                 supplier.setName("没有供应商");
             }
             barcodedataDTO.setBatterybarcode(detail.getBatteryPackTwoCode());
@@ -107,12 +107,12 @@ public class IndexController extends BaseController
         //        ") t";
         //String receiptTotal = "SELECT IFNULL(SUM(d.qty),0) 'total' FROM receipt_container_detail d join receipt_container_header h on d.receiptContainerId = h.id WHERE DATEDIFF(NOW(), h.created) = 0 AND d.status > 19 AND h.warehouseCode = '"+ShiroUtils.getWarehouseCode()+"' ;";
         //String shipmentTotal = "SELECT IFNULL(SUM(d.qty),0) 'total' from shipment_container_detail d JOIN shipment_container_header h on d.shippingContainerId = h.id WHERE DATEDIFF(NOW(), h.created) = 0 AND h.status > 19 AND h.warehouseCode = '"+ShiroUtils.getWarehouseCode()+"' ;";
-        String bllCount = "select sum(d.qty) 'total' FROM task_header h join task_detail d on h.id =d.taskId WHERE DATEDIFF(NOW(), h.completeTime) = 0 and (h.taskType=100 or h.taskType=200 or h.taskType=300 or h.taskType=400) and h.status=100";
-        String receiptTotal= "select sum(d.qty) 'total' FROM task_header h join task_detail d on h.id =d.taskId WHERE DATEDIFF(NOW(), h.completeTime) = 0 and (h.taskType=100 or h.taskType=200) and h.status=100";
-        String shipmentTotal = "select sum(d.qty) 'total' FROM task_header h join task_detail d on h.id =d.taskId WHERE DATEDIFF(NOW(), h.completeTime) = 0 and (h.taskType=300 or h.taskType=400) and h.status=100";
+        String bllCount = "select ifnull(sum( d.qty ),0) 'total' FROM task_header h join task_detail d on h.id =d.taskId WHERE DATEDIFF(NOW(), h.completeTime) = 0 and (h.taskType=100 or h.taskType=200 or h.taskType=300 or h.taskType=400) and h.status=100";
+        String receiptTotal= "select ifnull(sum( d.qty ),0) 'total' FROM task_header h join task_detail d on h.id =d.taskId WHERE DATEDIFF(NOW(), h.completeTime) = 0 and (h.taskType=100 or h.taskType=200) and h.status=100";
+        String shipmentTotal = "select ifnull(sum( d.qty ),0) 'total' FROM task_header h join task_detail d on h.id =d.taskId WHERE DATEDIFF(NOW(), h.completeTime) = 0 and (h.taskType=300 or h.taskType=400) and h.status=100";
         String inventoryTotal = "SELECT IFNULL(SUM(totalQty),0) 'total' from inventory_header where 1=1 " + condition;
-        String materialCount = "SELECT count(DISTINCT materialSkuQty) 'total' from inventory_header WHERE 1=1" + condition;
-        String taskUncompletedTotal = "SELECT COUNT(*) 'total' from task_header WHERE status < 100 " + condition;
+        String materialCount = "SELECT ifnull(count(DISTINCT materialCode),0) 'total' from inventory_detail WHERE 1=1" + condition;
+        String taskUncompletedTotal = "SELECT ifnull(COUNT(*),0) 'total' from task_header WHERE status < 100 " + condition;
         Map<String, Object> map = new HashMap<>();
         List<LinkedHashMap<String, Object>> temp1 = mapper.selectCommon(bllCount);
@@ -1016,9 +1016,7 @@ public class WorkTaskService {
                 taskHeader.setAgv(QuantityConstant.AGV_TASK_ALREADY_CREATE);
                 taskHeaderService.updateById(taskHeader);
             }
-            return AjaxResult.error("不是agv账户不能用agv盘点");
         }
-
         return AjaxResult.success();
     }