From 64c424ba723f97ae3f002b1bc5e88e718ba52781 Mon Sep 17 00:00:00 2001 From: pang.jiabao <pang_jiabao@163.com> Date: 星期一, 25 十一月 2024 11:15:19 +0800 Subject: [PATCH] agv站点修改 --- src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java | 29 ++++++++++++++++++++--------- 1 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java b/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java index 7afaeab..f60d972 100644 --- a/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java +++ b/src/main/java/com/zy/asrs/controller/InventoryCheckOrderController.java @@ -1,19 +1,16 @@ package com.zy.asrs.controller; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.plugins.Page; -import com.core.common.DateUtils; -import com.zy.asrs.entity.DocType; -import com.zy.asrs.entity.InventoryCheckOrder; -import com.zy.asrs.entity.Order; -import com.zy.asrs.service.InventoryCheckOrderService; import com.core.annotations.ManagerAuth; import com.core.common.BaseRes; import com.core.common.Cools; +import com.core.common.DateUtils; import com.core.common.R; +import com.zy.asrs.entity.InventoryCheckOrder; +import com.zy.asrs.service.InventoryCheckOrderService; import com.zy.common.web.BaseController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -82,11 +79,25 @@ } } - @RequestMapping(value = "/inventoryCheckOrder/add/auth") + @PostMapping (value = "/inventoryCheckOrder/add/auth") @ManagerAuth - public R add(InventoryCheckOrder inventoryCheckOrder) { + public R add(@RequestBody InventoryCheckOrder inventoryCheckOrder) { + String orderNo = inventoryCheckOrder.getOrderNo(); + if (Cools.isEmpty(orderNo)) { + return R.parse("鍗曟嵁缂栧彿涓嶈兘涓虹┖锛�" + orderNo); + } + + int count = inventoryCheckOrderService.selectCount(new EntityWrapper<InventoryCheckOrder>().eq("order_no", orderNo)); + if (count > 0) { + return R.parse("鍗曟嵁缂栧彿宸茬粡瀛樺湪锛�" + orderNo); + } + + inventoryCheckOrder.setCreateBy(getUserId().toString()); + inventoryCheckOrder.setCreateTime(new Date()); + inventoryCheckOrder.setStatus("1"); + inventoryCheckOrderService.insert(inventoryCheckOrder); - return R.ok(); + return R.ok(orderNo + "鏂板鎴愬姛"); } @RequestMapping(value = "/inventoryCheckOrder/update/auth") -- Gitblit v1.9.1