From e235d483194ab95bf62d1cfd343a172ff12781e8 Mon Sep 17 00:00:00 2001 From: pang.jiabao <pang_jiabao@163.com> Date: 星期六, 13 四月 2024 14:58:24 +0800 Subject: [PATCH] 聚乳酸库存明细 1.批号与包号排序需同步,增加水分,挥发段,分解段搜索,按照最大最小范围,包装类型跟托盘类型增加删选功能。 2.已经出库的物料,在明细表里面隐藏掉,但是数据保留。 3.增加二个跟聚乳酸一样的明细表,分改性树脂,纯树脂库存明细表,所有功能跟总的聚乳酸库存明细表一样 4.明细表整体框架调整一下,相对压缩一下,搜索功能框看看能否弄成二行 5.表里面的包装类型与托盘类型这些不主要的信息放到指标后面 6.关于分包再处理,举例原有系统里面销售选定的10包物料,再二次重新弄后,车间打印新标签,使用新的包号,在明细表里面体现原有所有指标信息及批号,包号,牌号跟新的关联 7.出库时候时间可选历史,不要就只能出现4天 8.提取库存里面需要有最大包号跟最小包号选择 --- src/main/java/com/zy/asrs/controller/OpenController.java | 33 +++++++++++++++------------------ 1 files changed, 15 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java index c03764f..3b86a9c 100644 --- a/src/main/java/com/zy/asrs/controller/OpenController.java +++ b/src/main/java/com/zy/asrs/controller/OpenController.java @@ -1,15 +1,11 @@ package com.zy.asrs.controller; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.JSONPObject; import com.core.annotations.AppAuth; import com.core.common.*; import com.core.exception.CoolException; -import com.zy.asrs.entity.ManLocDetl; -import com.zy.asrs.entity.OrderDetl; import com.zy.asrs.entity.param.*; +import com.zy.asrs.entity.result.StockVo; import com.zy.asrs.service.OpenService; import com.zy.common.model.DetlDto; import com.zy.common.web.BaseController; @@ -55,6 +51,7 @@ * 娣诲姞鍏ュ簱鍗� */ @PostMapping("/order/pakin/default/v1") + @AppAuth(memo = "娣诲姞璁㈠崟鍏ュ簱") public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey, @RequestBody OpenOrderPakinParam param, HttpServletRequest request) { @@ -73,6 +70,16 @@ } openService.pakinOrderCreate(param); return R.ok(); + } + + /* + * 閫熻吘鏁板瓧瀛敓璋冪敤鎺ュ彛 + * */ + @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()); } @@ -108,9 +115,10 @@ */ @RequestMapping("/stock/default/v1") public R queryStock(@RequestHeader(required = false) String appkey, + @RequestBody StockVo stockVo, HttpServletRequest request) { - auth(appkey, null, request); - return R.ok().add(openService.queryStock()); + auth(appkey, stockVo, request); + return R.ok().add(openService.queryStock(stockVo)); } private void auth(String appkey, Object obj, HttpServletRequest request) { @@ -172,16 +180,5 @@ param1.setOrderNo("963001846497017856"); System.out.println(JSON.toJSONString(param1)); } - - - @RequestMapping("/manDetl/add") - public R manDetlAdd(@RequestBody JSONObject json){ - String locNo = (String)json.get("locNo"); - String orderNo = (String)json.get("orderNo"); - - return R.ok(); - } - - } -- Gitblit v1.9.1