From a85a8d0c33d4a821a98a0ff6789298a23a180006 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 28 四月 2025 14:39:45 +0800
Subject: [PATCH] 拣货单出库完成，但是库存没减，日志埋点
---
src/main/java/com/zy/asrs/controller/OpenController.java | 241 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 217 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 8002f80..a86e91d 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,18 +1,33 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
-import com.core.common.BaseRes;
-import com.core.common.Cools;
-import com.core.common.R;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.annotations.AppAuth;
+import com.core.common.*;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.param.OpenOrderCompleteParam;
-import com.zy.asrs.entity.param.OpenOrderPakinParam;
+import com.zy.asrs.entity.LocOwner;
+import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.param.*;
+import com.zy.asrs.entity.result.StockVo;
+import com.zy.asrs.service.LocOwnerService;
import com.zy.asrs.service.OpenService;
+import com.zy.asrs.service.OrderDetlService;
+import com.zy.asrs.service.OrderService;
+import com.zy.common.model.DetlDto;
+import com.zy.common.web.BaseController;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
+import java.security.acl.Owner;
import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
/**
* Created by vincent on 2022/4/8
@@ -20,23 +35,92 @@
@Slf4j
@RestController
@RequestMapping("open/asrs")
-public class OpenController {
+public class OpenController extends BaseController {
- private static final boolean auth = false;
+ private static final boolean auth = true;
public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
add("ea1f0459efc02a79f046f982767939ae");
}};
@Autowired
private OpenService openService;
+ @Autowired
+ private OrderService orderService;
+ @Autowired
+ private OrderDetlService orderDetlService;
+ @Autowired
+ private LocOwnerService locOwnerService;
+ @Autowired
+ private UserService userService;
+
+
+ @PostMapping("/order/getInformation/notFinished")
+ @AppAuth(memo = "璁㈠崟鏈畬鎴愪俊鎭煡璇�")
+ public synchronized R orderInformationSelect(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) Map<String,String> param,
+ HttpServletRequest request)
+ {
+ auth(appkey, param, request);
+ String name = param.get("name");
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ User user = userService.selectOne(new EntityWrapper<User>().eq("username", name));
+ if (Cools.isEmpty(user)){
+ return R.error("鏈壘鍒扮敤鎴�");
+ }
+ List<Order> stringList = openService.selectOrderInformation(param);
+ return R.ok(stringList);
+ }
+
+ @PostMapping("/order/matSync/default/v1")
+ @AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
+ public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) MatSyncParam param,
+ HttpServletRequest request){
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ openService.syncMat(param);
+ return R.ok();
+ }
+
+ @PostMapping("/order/ownerSync/default/v1")
+ @AppAuth(memo = "渚涘簲鍟嗘。妗堝悓姝ユ帴鍙�")
+ public synchronized R syncOwnerInfo(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) Map<String,String> param,
+ HttpServletRequest request){
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+
+ Integer deleteFlag = Integer.parseInt(param.get("deleteFlag"));
+
+ if (deleteFlag == 1){
+ locOwnerService.delete(new EntityWrapper<LocOwner>().eq("owner",param.get("owner")));
+ }else {
+ LocOwner locOwner = new LocOwner();
+ locOwner.setOwner(param.get("owner"));
+ locOwner.setPhone(param.get("phone"));
+ locOwner.setAddr(param.get("addr"));
+ locOwnerService.insert(locOwner);
+ }
+
+
+ return R.ok();
+ }
/**
* 娣诲姞鍏ュ簱鍗�
*/
- @PostMapping("/order/pakin/new/default/v1")
+ @PostMapping("/order/pakin/default/v1")
+ @AppAuth(memo = "娣诲姞璁㈠崟鍏ュ簱")
public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderPakinParam param) {
- auth(appkey, param);
+ @RequestBody OpenOrderPakinParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
@@ -53,28 +137,90 @@
return R.ok();
}
- /**
- * 鍏ュ簱鍗曞洖鍐�
- */
- @PostMapping("/order/pakin/complete/default/v1")
- public synchronized R orderComplete(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderCompleteParam param) {
- auth(appkey, param);
- return R.ok().add(openService.pakinOrderComplete(param));
+ /*
+ * 閫熻吘鏁板瓧瀛敓璋冪敤鎺ュ彛
+ * */
+ @PostMapping("/digital/twin/inventory/quantity")
+ public synchronized R inventoryQuantity(@RequestHeader(required = false) String appkey,
+ HttpServletRequest request) {
+ auth(appkey, null, request);
+ return R.ok(openService.inventoryQuantity());
}
+
+
+ /**
+ * 娣诲姞鍑哄簱鍗�
+ */
+ @PostMapping("/order/pakout/default/v1")
+ @AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱")
+ public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
+ @RequestBody OpenOrderPakoutParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getCCode())) {
+ return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getType())) {
+ return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getADDBody())) {
+ return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
+ }
+ openService.pakoutOrderCreate(param);
+ return R.ok();
+ }
+
+ /**
+ * 璁㈠崟鍒犻櫎鎺ュ彛
+ */
+ @PostMapping("/order/delete/default/v1")
+ @AppAuth(memo = "鍗曟嵁鍒犻櫎")
+ public synchronized R deleteOrder(@RequestHeader(required = false) String appkey,
+ @RequestBody OpenOrderPakoutParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getCCode())) {
+ return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
+ }
+
+ String orderNo = param.getCCode();
+
+ Order order = orderService.selectByNo(orderNo);
+ if(Cools.isEmpty(order)){
+ return R.error("鍗曟嵁涓嶅瓨鍦�");
+ }
+ if (order.getSettle()>1){
+ return R.error("鍗曟嵁姝ｅ湪浣滀笟锛屾棤娉曞垹闄よ鍗曟嵁銆�");
+ }
+
+ orderService.delete(new EntityWrapper<Order>().eq("id", order.getId()));
+ orderDetlService.delete(new EntityWrapper<OrderDetl>().eq("order_id", order.getId()));
+
+ return R.ok("鍗曟嵁鍒犻櫎鎴愬姛");
+ }
+
+
/**
* 搴撳瓨缁熻
*/
@RequestMapping("/stock/default/v1")
- public R queryStock(@RequestHeader(required = false) String appkey) {
- auth(appkey, null);
- return R.ok().add(openService.queryStock());
+ public R queryStock(@RequestHeader(required = false) String appkey,
+ @RequestBody StockVo stockVo,
+ HttpServletRequest request) {
+ auth(appkey, stockVo, request);
+ return R.ok().add(openService.queryStock(stockVo));
}
-
- private void auth(String appkey, Object obj) {
- log.info("{}鎺ュ彛琚闂紒appkey:{},璇锋眰鏁版嵁锛歿}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
+ private void auth(String appkey, Object obj, HttpServletRequest request) {
+ log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
+ request.setAttribute("cache", obj);
if (!auth) {
return;
}
@@ -86,4 +232,51 @@
}
}
+ /******************************************************* 鏁板瓧瀛敓 *******************************************************/
+
+ @PostMapping("/wrkdetl")
+ public R getInOutDetl(){
+ return openService.getInOutDetl();
+ }
+
+ public static void main(String[] args) {
+ // 1
+ System.out.println("======================================");
+ OpenOrderPakinParam param = new OpenOrderPakinParam();
+ param.setOrderNo(String.valueOf(new SnowflakeIdWorker().nextId()));
+ param.setOrderType("鎵撳寘涓婄嚎鍗�");
+ param.setOrderTime(DateUtils.convert(new Date()));
+ List<DetlDto> orderDetails = new ArrayList<>();
+ param.setOrderDetails(orderDetails);
+ for (int i = 0; i < 3; i++) {
+ DetlDto detlDto = new DetlDto();
+ switch (i) {
+ case 0:
+ detlDto.setMatnr("MDH020030530");
+ detlDto.setBatch("500");
+ detlDto.setAnfme(18.0);
+ break;
+ case 1:
+ detlDto.setMatnr("MDH020016416");
+ detlDto.setBatch("500");
+ detlDto.setAnfme(32.0);
+ break;
+ case 2:
+ detlDto.setMatnr("LSH90152025");
+ detlDto.setAnfme(50.0);
+ break;
+ default:
+ break;
+ }
+ orderDetails.add(detlDto);
+ }
+ System.out.println(JSON.toJSONString(param));
+ // 2
+ System.out.println("======================================");
+ OpenOrderCompleteParam param1 = new OpenOrderCompleteParam();
+ param1.setOrderNo("963001846497017856");
+ System.out.println(JSON.toJSONString(param1));
+ }
+
+
}
--
Gitblit v1.9.1