From ea1db1a84e8d1412b77060a37bc976a93bbb58dd Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期日, 04 一月 2026 16:33:52 +0800
Subject: [PATCH] #getArmType$
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 169 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 167 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 40251b3..688cdd0 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -3,16 +3,19 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
+import com.core.common.R;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.OpenOrderCompeteResult;
import com.zy.asrs.entity.result.StockVo;
+import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.asrs.mapper.TagMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.MatUtils;
import com.zy.asrs.utils.OrderInAndOutUtil;
+import com.zy.asrs.utils.TimeCalculatorUtils;
import com.zy.common.model.DetlDto;
import com.zy.common.utils.NodeUtils;
import lombok.extern.slf4j.Slf4j;
@@ -20,6 +23,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -49,6 +53,10 @@
private TagService tagService;
@Autowired
private TagMapper tagMapper;
+ @Autowired
+ private LocMastServiceImpl locMastService;
+ @Autowired
+ private ReportQueryMapper reportQueryMapper;
@Override
@Transactional
@@ -564,7 +572,7 @@
} else {
tagId = tagService.getTop().getId();
}
- mat.sync(param);
+ mat.sync(matParam);
// mat.setMatnr(param.getMatnr());
// mat.setMaktx(param.getMaktx());
// mat.setSpecs(param.getSpecs());
@@ -580,7 +588,7 @@
log.info("鍚屾鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
}
} else {
- mat.sync(param);
+ mat.sync(matParam);
if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr",matParam.getMatnr()))) {
throw new CoolException("鏇存柊宸插瓨鍦ㄥ晢鍝佷俊鎭け璐ワ紝璇疯仈绯荤鐞嗗憳");
}
@@ -589,4 +597,161 @@
}
+ @Override
+ @Transactional
+ public ViewStockUseBeanDigitalTwin digitalTwinOverview() {
+ ViewStockUseBeanDigitalTwin viewStockUseBeanDigitalTwin = new ViewStockUseBeanDigitalTwin();
+ int selectCountLocDetl = locDetlService.selectCount(new EntityWrapper<LocDetl>());
+ viewStockUseBeanDigitalTwin.setRemainingStock(Integer.toUnsignedLong(selectCountLocDetl));
+ int selectCountLocMast = locMastService.selectCount(new EntityWrapper<LocMast>());
+ viewStockUseBeanDigitalTwin.setTotalLoc(Integer.toUnsignedLong(selectCountLocMast));
+ int selectCountLocMastNEO = locMastService.selectCount(new EntityWrapper<LocMast>().ne("loc_sts","O").ne("loc_sts","X"));
+ viewStockUseBeanDigitalTwin.setUseLoc(Integer.toUnsignedLong(selectCountLocMastNEO));
+ int selectCountLocMastO = locMastService.selectCount(new EntityWrapper<LocMast>().eq("loc_sts","O"));
+ viewStockUseBeanDigitalTwin.setIdleLoc(Integer.toUnsignedLong(selectCountLocMastO));
+ List<ViewInOutBean> list = reportQueryMapper.getViewInOutAll(new ViewInOutBean());
+ Date date = new Date();
+ String format = new SimpleDateFormat(DateUtils.yyyyMMdd_F).format(date);
+ viewStockUseBeanDigitalTwin.setNowData(format);
+ for (ViewInOutBean view : list) {
+ if (view.getYmd().equals(format)) {
+ viewStockUseBeanDigitalTwin.setTodayOutbound(view.getRet_qty());
+ viewStockUseBeanDigitalTwin.setTodayWarehousing(view.getSto_qty());
+ break;
+ }
+ }
+ return viewStockUseBeanDigitalTwin;
+ }
+
+ @Override
+ @Transactional
+ public DigitalTwinRecentOrderParam digitalTwinRecentOrder(DigitalTwinRecentOrderParam param) {
+ Date date = new Date();
+ if (Cools.isEmpty(param.getStartDate()) || !TimeCalculatorUtils.isValidDateFormat(param.getStartDate(), DateUtils.yyyyMMdd) || TimeCalculatorUtils.isFutureDate(param.getStartDate(), DateUtils.yyyyMMdd)) {
+ param.setMemo("寮�濮嬫棩鏈熷紓甯� 锛�"+param.getStartDate());
+ String timeFrontSevenYesterday = new SimpleDateFormat(DateUtils.yyyyMMdd).format(TimeCalculatorUtils.timeFrontSevenYesterday6(date));//涓冨ぉ鍓�
+ param.setStartDate(timeFrontSevenYesterday);
+ String format = new SimpleDateFormat(DateUtils.yyyyMMdd).format(date);//褰撳ぉ
+ param.setEndDate(format);
+ param.setMemo(param.getMemo()+";鍒濆鍖栨棩鏈熶负 锛�"+param.getStartDate()+"===>" + param.getEndDate());
+ } else if (Cools.isEmpty(param.getEndDate()) || !TimeCalculatorUtils.isValidDateFormat(param.getEndDate(), DateUtils.yyyyMMdd)) {
+ param.setMemo("缁撴潫鏃ユ湡寮傚父 锛�"+param.getEndDate());
+ String format = new SimpleDateFormat(DateUtils.yyyyMMdd).format(date);//褰撳ぉ
+ param.setEndDate(format);
+ param.setMemo(param.getMemo()+";鍒濆鍖栨棩鏈熶负 锛�"+param.getStartDate()+"===>" + param.getEndDate());
+ }
+ List<ViewOrderParam> asrOrderView = reportQueryMapper.getAsrOrderView(param.getStartDate(), param.getEndDate());
+ List<DigitalTwinRecentOrderParam.DataCode> dataCodes = new ArrayList<>();
+ for (ViewOrderParam view : asrOrderView) {
+ DigitalTwinRecentOrderParam.DataCode dataCode = new DigitalTwinRecentOrderParam.DataCode();
+ dataCode.setOrderDate(view.getYmd());
+ dataCode.setOrderNum(view.getQty());
+ dataCodes.add(dataCode);
+ }
+ param.setDataCodeList(dataCodes);
+ return param;
+ }
+
+ @Override
+ @Transactional
+ public DigitalTwinRecentIdleLocParam digitalTwinRecentIdleLoc(DigitalTwinRecentIdleLocParam param) {
+ Date date = new Date();
+ if (Cools.isEmpty(param.getStartDate()) || !TimeCalculatorUtils.isValidDateFormat(param.getStartDate(), DateUtils.yyyyMMdd) || TimeCalculatorUtils.isFutureDate(param.getStartDate(), DateUtils.yyyyMMdd)) {
+ param.setMemo("寮�濮嬫棩鏈熷紓甯� 锛�"+param.getStartDate());
+ String timeFrontSevenYesterday = new SimpleDateFormat(DateUtils.yyyyMMdd).format(TimeCalculatorUtils.timeFrontSevenYesterday6(date));//涓冨ぉ鍓�
+ param.setStartDate(timeFrontSevenYesterday);
+ String format = new SimpleDateFormat(DateUtils.yyyyMMdd).format(date);//褰撳ぉ
+ param.setEndDate(format);
+ param.setMemo(param.getMemo()+";鍒濆鍖栨棩鏈熶负 锛�"+param.getStartDate()+"===>" + param.getEndDate());
+ } else if (Cools.isEmpty(param.getEndDate()) || !TimeCalculatorUtils.isValidDateFormat(param.getEndDate(), DateUtils.yyyyMMdd)) {
+ param.setMemo("缁撴潫鏃ユ湡寮傚父 锛�"+param.getEndDate());
+ String format = new SimpleDateFormat(DateUtils.yyyyMMdd).format(date);//褰撳ぉ
+ param.setEndDate(format);
+ param.setMemo(param.getMemo()+";鍒濆鍖栨棩鏈熶负 锛�"+param.getStartDate()+"===>" + param.getEndDate());
+ }
+// List<ViewLocDailyLogParam> asrLocDailyLogO = reportQueryMapper.getAsrLocDailyLogO(param.getAreaId(), param.getStartDate(), param.getEndDate());
+ List<ViewLocDailyLogParam> asrLocDailyLogO = reportQueryMapper.getAsrLocDailyLog2(param.getAreaId(), param.getStartDate(), param.getEndDate());
+ List<DigitalTwinRecentIdleLocParam.DataCode> dataCodes = new ArrayList<>();
+ for (ViewLocDailyLogParam view : asrLocDailyLogO) {
+ DigitalTwinRecentIdleLocParam.DataCode dataCode = new DigitalTwinRecentIdleLocParam.DataCode();
+ dataCode.setLocDate(view.getYmd());
+ dataCode.setIdleNum(view.getQty());
+ dataCode.setAreaId(view.getArea());
+ dataCodes.add(dataCode);
+ }
+ param.setDataCodeList(dataCodes);
+ return param;
+ }
+
+ @Override
+ @Transactional
+ public DigitalTwinRecentInAndOutBoundParam digitalTwinRecentInAndOutBound(DigitalTwinRecentInAndOutBoundParam param) {
+ Date date = new Date();
+ if (Cools.isEmpty(param.getStartDate()) || !TimeCalculatorUtils.isValidDateFormat(param.getStartDate(), DateUtils.yyyyMMdd) || TimeCalculatorUtils.isFutureDate(param.getStartDate(), DateUtils.yyyyMMdd)) {
+ param.setMemo("寮�濮嬫棩鏈熷紓甯� 锛�"+param.getStartDate());
+ String timeFrontSevenYesterday = new SimpleDateFormat(DateUtils.yyyyMMdd).format(TimeCalculatorUtils.timeFrontSevenYesterday6(date));//涓冨ぉ鍓�
+ param.setStartDate(timeFrontSevenYesterday);
+ String format = new SimpleDateFormat(DateUtils.yyyyMMdd).format(date);//褰撳ぉ
+ param.setEndDate(format);
+ param.setMemo(param.getMemo()+";鍒濆鍖栨棩鏈熶负 锛�"+param.getStartDate()+"===>" + param.getEndDate());
+ } else if (Cools.isEmpty(param.getEndDate()) || !TimeCalculatorUtils.isValidDateFormat(param.getEndDate(), DateUtils.yyyyMMdd)) {
+ param.setMemo("缁撴潫鏃ユ湡寮傚父 锛�"+param.getEndDate());
+ String format = new SimpleDateFormat(DateUtils.yyyyMMdd).format(date);//褰撳ぉ
+ param.setEndDate(format);
+ param.setMemo(param.getMemo()+";鍒濆鍖栨棩鏈熶负 锛�"+param.getStartDate()+"===>" + param.getEndDate());
+ }
+ ViewInOutBean viewInOutBean = new ViewInOutBean();
+ viewInOutBean.setBegin_date(param.getStartDate());
+ viewInOutBean.setEnd_date(param.getEndDate());
+ List<ViewInOutBean> list = reportQueryMapper.getViewInOutAll(viewInOutBean);
+ List<DigitalTwinRecentInAndOutBoundParam.DataCode> dataCodes = new ArrayList<>();
+ for (ViewInOutBean view : list) {
+ DigitalTwinRecentInAndOutBoundParam.DataCode dataCode = new DigitalTwinRecentInAndOutBoundParam.DataCode();
+ dataCode.setBoundDate(view.getYmd());
+ dataCode.setOutBoundNum(view.getRet_qty());
+ dataCode.setInBoundNum(view.getSto_qty());
+ dataCodes.add(dataCode);
+ }
+ param.setDataCodeList(dataCodes);
+ return param;
+ }
+
+ @Override
+ @Transactional
+ public DigitalTwinRecentDetainMatParam digitalTwinRecentDetainMat(DigitalTwinRecentDetainMatParam param) {
+ List<VwLocDetlSummaryParam> vwLocDetlSummaryParam = reportQueryMapper.getVwLocDetlSummaryParam(param.getAreaId(), param.getOverDayNum(), param.getPageIndex(), param.getPageSize());
+
+ List<DigitalTwinRecentDetainMatParam.DataCode> dataCodes = new ArrayList<>();
+ for (VwLocDetlSummaryParam view : vwLocDetlSummaryParam) {
+ DigitalTwinRecentDetainMatParam.DataCode dataCode = new DigitalTwinRecentDetainMatParam.DataCode(view);
+ dataCodes.add(dataCode);
+ }
+ param.setDataCodeList(dataCodes);
+ return param;
+ }
+
+ @Override
+ @Transactional
+ public DigitalTwinEquipmentParam digitalTwinEquipment(DigitalTwinEquipmentParam param) {
+ DigitalTwinEquipmentParam.DataCode dataCode = new DigitalTwinEquipmentParam.DataCode();
+ dataCode.setEquipmentId(""+param.getAreaId());
+ dataCode.setEquipmentName(param.getAreaId()+dataCode.getEquipmentName());
+ dataCode.setBelongAreaId(""+param.getAreaId());
+ dataCode.setBelongAreaName(""+param.getAreaId());
+ param.getDataCodeList().add(dataCode);
+ return param;
+ }
+
+ @Override
+ @Transactional
+ public DigitalTwinWarehouseDetailParam digitalTwinWarehouseDetail(DigitalTwinWarehouseDetailParam param) {
+ List<LocMast> locMastList = locMastService.selectList(new EntityWrapper<>());
+ for (LocMast locMast : locMastList) {
+ List<LocDetl> locDetlList = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
+ DigitalTwinWarehouseDetailParam.DataCode dataCode = new DigitalTwinWarehouseDetailParam.DataCode(locMast,locDetlList);
+ param.getDataCodeList().add(dataCode);
+ }
+ return param;
+ }
+
}
--
Gitblit v1.9.1