From 09284f08c7a901f684cf26ccb0e51a9204d9cd64 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 30 五月 2024 09:30:27 +0800
Subject: [PATCH] #订单组托
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java | 64 +++++++++++++++++++++++++++++++-
1 files changed, 62 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
index 4d914de..508415c 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
@@ -3,9 +3,12 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.common.wms.entity.LocDetl;
+import com.zy.asrs.common.wms.entity.Mat;
import com.zy.asrs.common.wms.service.LocDetlService;
+import com.zy.asrs.common.wms.service.MatService;
import com.zy.asrs.framework.annotations.ManagerAuth;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
@@ -22,6 +25,18 @@
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private MatService matService;
+
+ @RequestMapping(value = "/locDetl/forLocNoAndBarcode/auth")
+ @ManagerAuth
+ public R forLocNoAndBarcode(@RequestParam String locNo,@RequestParam String barcode) {
+ List<LocDetl> detls = locDetlService.list(new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getLocNo, locNo).eq(LocDetl::getZpallet, barcode).eq(LocDetl::getHostId, getHostId()));
+ if (Cools.isEmpty(detls)){
+ return R.error("鏈煡璇㈠埌搴撳瓨鏁版嵁");
+ }
+ return R.ok(detls);
+ }
@RequestMapping(value = "/locDetl/{id}/auth")
@ManagerAuth
@@ -46,8 +61,8 @@
wrapper.ge(LocDetl::getAppeTime, DateUtils.convert(range[0]));
wrapper.le(LocDetl::getAppeTime, DateUtils.convert(range[1]));
}
- if (!Cools.isEmpty(param.get("loc_no"))) {
- wrapper.eq(LocDetl::getLocNo, param.get("loc_no"));
+ if (!Cools.isEmpty(param.get("locNo"))) {
+ wrapper.eq(LocDetl::getLocNo, param.get("locNo"));
}
return R.ok(locDetlService.page(new Page<>(curr, limit), wrapper));
}
@@ -110,4 +125,49 @@
return R.ok().add(vos);
}
+ @RequestMapping(value = "/locDetl/statis/auth")
+ @ManagerAuth
+ public R statis(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam Map<String, Object> param) {
+ IPage<LocDetl> stockStatis = locDetlService.getStockStatis(curr, limit, param);
+ for (LocDetl locDetl : stockStatis.getRecords()) {
+ Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>()
+ .eq(Mat::getMatnr, locDetl.getMatnr())
+ .eq(Mat::getHostId, getHostId()));
+ if (mat != null) {
+ locDetl.sync(mat);
+ }
+ }
+ return R.ok().add(stockStatis);
+ }
+
+ /**
+ * 鑾峰彇搴撳瓨鎬绘暟
+ * @return
+ */
+ @RequestMapping("/locDetl/count")
+ public R getAllCount(){
+ Integer sum = locDetlService.sum();
+ return R.ok(sum);
+ }
+
+ @RequestMapping(value = "/stock/out/list/auth")
+ @ManagerAuth
+ public R stockOutList(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam Map<String, Object> param){
+ if (!Cools.isEmpty(param.get("modi_time"))){
+ String val = String.valueOf(param.get("modi_time"));
+ if (val.contains(RANGE_TIME_LINK)) {
+ String[] dates = val.split(RANGE_TIME_LINK);
+ param.put("startTime", DateUtils.convert(dates[0]));
+ param.put("endTime", DateUtils.convert(dates[1]));
+ param.remove("modi_time");
+ }
+ }
+ param.put("hostId", getHostId());
+ return R.ok(locDetlService.getStockOut(curr, limit, param));
+ }
+
}
--
Gitblit v1.9.1