From 519f42d527a1dd4917455609855f732b1eb0f7a0 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 20 三月 2026 11:08:11 +0800
Subject: [PATCH] 新增接口： 给mes提供机台及对应机台工位的冻结情况
---
src/main/java/com/zy/api/service/impl/HmesApiServiceImpl.java | 371 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 305 insertions(+), 66 deletions(-)
diff --git a/src/main/java/com/zy/api/service/impl/HmesApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/HmesApiServiceImpl.java
index 61d48a3..045807b 100644
--- a/src/main/java/com/zy/api/service/impl/HmesApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/HmesApiServiceImpl.java
@@ -1,30 +1,38 @@
package com.zy.api.service.impl;
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.api.controller.params.HmesBackLocParams;
+import com.zy.api.entity.dto.HmesDeviceFreezeStatusDto;
+import com.zy.api.entity.dto.HmesStationFreezeStatusDto;
import com.zy.api.controller.params.ReceviceTaskParams;
import com.zy.api.service.HmesApiService;
import com.zy.api.service.WcsApiService;
-import com.zy.asrs.entity.BasDevice;
-import com.zy.asrs.entity.LocAroundBind;
-import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.OpenOrderPakoutParam;
import com.zy.asrs.enums.LocStsType;
-import com.zy.asrs.service.BasDeviceService;
-import com.zy.asrs.service.LocAroundBindService;
-import com.zy.asrs.service.LocMastService;
+import com.zy.asrs.service.*;
+import com.zy.asrs.service.impl.LocDetlServiceImpl;
+import com.zy.asrs.service.impl.OrderDetlPakoutServiceImpl;
+import com.zy.asrs.service.impl.OrderPakoutServiceImpl;
+import com.zy.common.model.DetlDto;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
import java.util.stream.Collectors;
@Service
+@Slf4j
public class HmesApiServiceImpl implements HmesApiService {
+
+ private static final Long HMES_USER_ID = 9995L;
@Autowired
private BasDeviceService basDeviceService;
@@ -37,54 +45,171 @@
@Autowired
private WcsApiService wcsApiService;
+
+ @Autowired
+ private OrderService orderService;
+
+ @Autowired
+ private DocTypeService docTypeService;
+
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
+
+ @Autowired
+ private MatService matService;
+
+ @Autowired
+ private OrderDetlService orderDetlService;
+ @Autowired
+ private OrderPakoutServiceImpl orderPakoutService;
+ @Autowired
+ private OrderDetlPakoutServiceImpl orderDetlPakoutService;
+ @Autowired
+ private LocDetlServiceImpl locDetlService;
+
+ @Autowired
+ private WrkMastService wrkMastService;
+
+ @Autowired
+ private WorkService workService;
+
+
/**
* 鎺ユ敹MES绌跨嚎浠诲姟
* @author Ryan
* @date 2026/1/10 10:54
- * @param params
+ * @param param
* @return com.core.common.R
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public R pubWorkTask(ReceviceTaskParams params) {
- if (Objects.isNull(params) || Objects.isNull(params.getDeviceNo())) {
- return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
- }
- BasDevice basDevice = basDeviceService.selectOne(new EntityWrapper<BasDevice>()
- .eq("status", 1)
- .eq("dev_no", params.getDeviceNo()));
- if (Objects.isNull(basDevice)) {
- throw new CoolException("鏈哄彴淇℃伅涓嶅瓨鍦ㄦ垨宸茬鐢紒锛�");
- }
- List<LocAroundBind> binds = locAroundBindService.selectList(new EntityWrapper<LocAroundBind>().eq("dev_no", basDevice.getDevNo()));
- if (Objects.isNull(binds) || binds.isEmpty()) {
- throw new CoolException("鏈哄彴鏈粦瀹氬伐浣滅珯鍙帮紒锛�");
- }
- Set<String> locs = binds.stream().map(LocAroundBind::getBLocNo).collect(Collectors.toSet());
-
- LocMast locMasts = locMastService.selectOne(new EntityWrapper<LocMast>()
- .in("loc_no", locs)
- .eq("loc_sts", LocStsType.LOC_STS_TYPE_F.type)
- .orderAsc(Arrays.asList("loc_no"))
- .last("OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY"));
-
- if (Objects.isNull(locMasts)) {
- throw new CoolException("鏈煡鍒板彲宸ヤ綔绾胯酱锛侊紒");
- }
-
- //todo 閿佸簱浣嶉渶WCS閿佸畾锛堢浉鍏冲簱浣嶏紝涓嶅彲鎵ц浠诲姟鎿嶄綔锛屼笉鑳藉彧鍦╓MS閿佸畾锛�
- List<LocMast> locMs = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("frozen", 0).eq("deleted", 0)
- .in("loc_no", locs)
- .eq("loc_sts", LocStsType.LOC_STS_TYPE_O.type));
- locMs.forEach(loc -> {
- loc.setLocSts(LocStsType.LOC_STS_TYPE_X.type);
- if (!locMastService.updateById(loc)) {
- throw new CoolException("宸ヤ綔鍙板懆杈瑰簱浣嶇鐢ㄥけ璐ワ紝涓嶅彲鎵ц绌跨嚎鎿嶄綔锛侊紒");
+ public R pubWorkTask(OpenOrderPakoutParam param) {
+ OrderPakout order = orderPakoutService.selectByNo(param.getOrderNo());
+ // 濡傛灉鍗曟嵁涓嶅瓨鍦ㄥ垯娣诲姞锛涘鏋滃崟鎹瓨鍦紝浣滀笟涓棤娉曚慨鏀癸紝鍙嶄箣鍒欎慨鏀瑰崟鎹�
+ if (!Cools.isEmpty(order)) {
+ if (order.getSettle() > 1L) {
+ log.error(param.getOrderNo() + "姝ｅ湪鍑哄簱锛屾棤娉曚慨鏀瑰崟鎹�");
+ throw new CoolException(param.getOrderNo() + "姝ｅ湪鍑哄簱锛屾棤娉曚慨鏀瑰崟鎹�");
}
- });
+ orderPakoutService.remove(order.getId());
+ }
+ DocType docType = docTypeService.selectOrAdd(param.getBillType(), Boolean.FALSE);
+ Date now = new Date();
- return R.ok("鍙墽琛岀┛绾垮姩浣�!!");
+ // 鍗曟嵁鏄庣粏妗�
+ List<DetlDto> list = new ArrayList<>();
+ List<DetlDto> orderDetails = param.getMatList();
+ for (DetlDto detail : orderDetails) {
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(),detail.getBrand(),detail.getDevNo(),detail.getStandby2(),detail.getStandby3(),detail.getLineNumber(),
+ detail.getBoxType1(),detail.getBoxType2(),detail.getBoxType3(), detail.getAnfme());
+ if (DetlDto.hasLineNumber(list, dto)) {
+ DetlDto detlDto = DetlDto.findLineNumber(list, dto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getDevNo(),dto.getStandby2(),dto.getStandby3(),dto.getLineNumber(),
+ dto.getBoxType1(),dto.getBoxType2(),dto.getBoxType3());
+ assert detlDto != null;
+ detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
+ } else {
+ list.add(dto);
+ }
+ }
+
+ //涓嬪彂鐨勮鍗曟槑缁嗭紝鏌ョ湅搴撳瓨鏄惁鏈夎冻澶熺殑搴撳瓨锛屾帓闄ゆ満鍙扮殑搴撲綅
+ for (DetlDto detail : list) {
+ List<LocDetl> matnr = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("matnr", detail.getMatnr()));
+ Double count=0.0;
+ for (LocDetl detl : matnr) {
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", detl.getLocNo()).eq("loc_sts","F"));
+ if (locMast != null) {
+ LocAroundBind bLocNo = locAroundBindService.selectOne(new EntityWrapper<LocAroundBind>().eq("b_loc_no", locMast.getLocNo()));
+ if (Cools.isEmpty(bLocNo)) {
+ count=detl.getAnfme()+count;
+ }
+ }
+ }
+ if (count<detail.getAnfme()) {
+ return R.error("鐗╂枡="+detail.getMatnr()+"搴撳瓨涓嶈冻鏃犳硶鐢熸垚璁㈠崟");
+ }
+ //鏈哄彴鏈夊喕缁撴椂绂佹鍛煎彨鐗╂枡
+ BasDevice basDevice = basDeviceService.selectOne(new EntityWrapper<BasDevice>()
+ .eq("status", 1)
+ .eq("dev_no", detail.getStandby1()));
+ if (Objects.isNull(basDevice)) {
+ return R.error(detail.getStandby1()+"鏈哄彴淇℃伅涓嶅瓨鍦ㄦ垨宸茬鐢紒锛�");
+ }
+ List<LocAroundBind> binds = locAroundBindService.selectList(new EntityWrapper<LocAroundBind>()
+ .eq("dev_no", basDevice.getType())
+ .eq("freeze", 1));
+ if (!Cools.isEmpty(binds)) {
+ return R.error(detail.getStandby1()+"鏈哄彴琚喕缁撴棤娉曞懠鍙墿鏂�");
+ }
+ }
+ // 鍗曟嵁涓绘。
+ order = new OrderPakout(
+ String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
+ param.getOrderNo(), // 璁㈠崟缂栧彿
+ DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
+ docType.getDocId(), // 鍗曟嵁绫诲瀷
+ null, // 椤圭洰缂栧彿
+ null, //
+ null, // 璋冩嫧椤圭洰缂栧彿
+ null, // 鍒濆绁ㄦ嵁鍙�
+ null, // 绁ㄦ嵁鍙�
+ null, // 瀹㈡埛缂栧彿
+ null, // 瀹㈡埛
+ null, // 鑱旂郴鏂瑰紡
+ null, // 鎿嶄綔浜哄憳
+ null, // 鍚堣閲戦
+ null, // 浼樻儬鐜�
+ null, // 浼樻儬閲戦
+ null, // 閿�鍞垨閲囪喘璐圭敤鍚堣
+ null, // 瀹炰粯閲戦
+ null, // 浠樻绫诲瀷
+ null, // 涓氬姟鍛�
+ null, // 缁撶畻澶╂暟
+ null, // 閭垂鏀粯绫诲瀷
+ null, // 閭垂
+ null, // 浠樻鏃堕棿
+ null, // 鍙戣揣鏃堕棿
+ null, // 鐗╂祦鍚嶇О
+ null, // 鐗╂祦鍗曞彿
+ 1L, // 璁㈠崟鐘舵��
+ 1, // 鐘舵��
+ 9995L, // 娣诲姞浜哄憳
+ now, // 娣诲姞鏃堕棿
+ 9995L, // 淇敼浜哄憳
+ now, // 淇敼鏃堕棿
+ null // 澶囨敞
+ );
+ if (!orderPakoutService.insert(order)) {
+ throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ for (DetlDto detlDto : list) {
+ Mat mat = matService.selectByMatnr(detlDto.getMatnr());
+ if (Cools.isEmpty(mat)) {
+ throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
+ }
+ OrderDetlPakout orderDetl = new OrderDetlPakout();
+ orderDetl.sync(mat);
+ orderDetl.setLineNumber(detlDto.getLineNumber());
+ orderDetl.setBatch(detlDto.getBatch());
+ orderDetl.setAnfme(detlDto.getAnfme());
+ orderDetl.setBrand(detlDto.getBrand());
+ orderDetl.setStandby1(detlDto.getStandby1());
+ orderDetl.setStandby2(detlDto.getStandby2());
+ orderDetl.setStandby3(detlDto.getStandby3());
+ orderDetl.setOrderId(order.getId());
+ orderDetl.setOrderNo(order.getOrderNo());
+ orderDetl.setCreateBy(9527L);
+ orderDetl.setCreateTime(now);
+ orderDetl.setUpdateBy(9527L);
+ orderDetl.setUpdateTime(now);
+ orderDetl.setStatus(1);
+ orderDetl.setQty(0.0D);
+ orderDetl.setPakinPakoutStatus(2);
+ if (!orderDetlPakoutService.insert(orderDetl)) {
+ throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+ }
+ return R.ok();
}
/**
@@ -97,37 +222,151 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R releaseLock(ReceviceTaskParams params) {
- if (Objects.isNull(params) || Objects.isNull(params.getDeviceNo())) {
+ if (Objects.isNull(params) || Objects.isNull(params.getDevNo())) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
+
+ Integer frozen = params.getFreeze().equals("Y") ? 1 : 0;
+ String s = params.getFreeze().equals("Y") ? "鍐荤粨" : "瑙ｅ喕";
BasDevice basDevice = basDeviceService.selectOne(new EntityWrapper<BasDevice>()
.eq("status", 1)
- .eq("dev_no", params.getDeviceNo()));
+ .eq("dev_no", params.getDevNo()));
if (Objects.isNull(basDevice)) {
throw new CoolException("鏈哄彴淇℃伅涓嶅瓨鍦ㄦ垨宸茬鐢紒锛�");
}
- List<LocAroundBind> binds = locAroundBindService.selectList(new EntityWrapper<LocAroundBind>().eq("dev_no", basDevice.getDevNo()));
+ List<LocAroundBind> binds = locAroundBindService.selectList(new EntityWrapper<LocAroundBind>()
+ .eq("dev_no", basDevice.getType())
+ .eq("freeze", frozen==1? 0:1));
if (Objects.isNull(binds) || binds.isEmpty()) {
- throw new CoolException("鏈哄彴鏈粦瀹氬伐浣滅珯鍙帮紒锛�");
- }
- Set<String> locs = binds.stream().map(LocAroundBind::getBLocNo).collect(Collectors.toSet());
-
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().in("loc_no", locs)
- .eq("frozen", 0).eq("deleted", 0)
- .eq("loc_sts", LocStsType.LOC_STS_TYPE_X.type));
- if (Objects.isNull(locMasts) || locMasts.isEmpty()) {
- throw new CoolException("娌℃湁绂佺敤搴撲綅锛屼笉闇�瑕侀噴鏀撅紒锛�");
+ throw new CoolException("鏈哄彴涓嶉渶瑕�"+s+"锛侊紒");
}
- locMasts.forEach(loc -> {
- loc.setLocSts(LocStsType.LOC_STS_TYPE_O.type);
- if (!locMastService.updateById(loc)) {
- throw new CoolException("搴撲綅閲婃斁澶辫触锛岃妫�鏌ュ悗鍐嶆搷浣滐紒锛�");
+ binds.forEach(loc -> {
+ loc.setFreeze(frozen);
+ if (!locAroundBindService.updateById(loc)) {
+ throw new CoolException("搴撲綅"+s+"澶辫触锛岃妫�鏌ュ悗鍐嶆搷浣滐紒锛�");
}
});
+ return R.ok(s+"鎴愬姛 锛侊紒");
+ }
-// wcsApiService.reportLockLocs(locs, "lock");
+ @Override
+ public R getDeviceFreezeStatus() {
+ List<BasDevice> devices = basDeviceService.selectList(new EntityWrapper<BasDevice>()
+ .eq("status", 1)
+ .orderBy("dev_no", true));
+ if (Cools.isEmpty(devices)) {
+ return R.ok(Collections.emptyList());
+ }
- return R.ok("閲婃斁鎴愬姛 锛侊紒");
+ List<LocAroundBind> binds = locAroundBindService.selectList(new EntityWrapper<LocAroundBind>()
+ .orderBy("dev_no", true)
+ .orderBy("order_no", true)
+ .orderBy("id", true));
+ Map<String, List<LocAroundBind>> bindMap = new HashMap<>();
+ if (!Cools.isEmpty(binds)) {
+ bindMap = binds.stream()
+ .filter(bind -> !Cools.isEmpty(bind.getDevNo()))
+ .collect(Collectors.groupingBy(LocAroundBind::getDevNo, LinkedHashMap::new, Collectors.toList()));
+ }
+
+ List<HmesDeviceFreezeStatusDto> result = new ArrayList<>();
+ for (BasDevice device : devices) {
+ List<LocAroundBind> deviceBinds = bindMap.getOrDefault(device.getType(), Collections.emptyList());
+ List<HmesStationFreezeStatusDto> stationList = deviceBinds.stream()
+ .sorted(Comparator.comparing(LocAroundBind::getOrderNo, Comparator.nullsLast(Integer::compareTo))
+ .thenComparing(LocAroundBind::getId, Comparator.nullsLast(Long::compareTo)))
+ .map(this::buildStationFreezeStatus)
+ .collect(Collectors.toList());
+ boolean frozen = stationList.stream().anyMatch(station -> "Y".equals(station.getFreeze()));
+ result.add(new HmesDeviceFreezeStatusDto()
+ .setDevNo(device.getDevNo())
+ .setDevType(device.getType())
+ .setFreeze(toFreezeFlag(frozen ? 1 : 0))
+ .setStationList(stationList));
+ }
+ return R.ok(result);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R backLoc(HmesBackLocParams params) {
+ Integer backType = parseBackType(params.getBackType());
+ if (backType == null) {
+ return R.error("鍥炲簱绫诲瀷[backType]浠呮敮鎸� EMPTY/4/绌烘《/绌烘澘 鎴� SURPLUS/5/浣欐枡");
+ }
+
+ WrkMast mast = findBackLocWrkMast(params);
+ if (Objects.isNull(mast)) {
+ return R.error("鏈煡璇㈠埌鍙洖搴撶殑浠诲姟妗�");
+ }
+ if (!Objects.equals(mast.getWrkSts(), 15L)) {
+ return R.error("褰撳墠浠诲姟鐘舵�佷笉鑳芥墽琛屽洖搴擄紒");
+ }
+
+ workService.updateWrkIsSuplus(String.valueOf(mast.getWrkNo()), HMES_USER_ID, backType);
+ return workService.backLocOperation(String.valueOf(mast.getWrkNo()), HMES_USER_ID);
+ }
+
+ private HmesStationFreezeStatusDto buildStationFreezeStatus(LocAroundBind bind) {
+ return new HmesStationFreezeStatusDto()
+ .setLocNo(bind.getBlocNo())
+ .setOrderNo(bind.getOrderNo())
+ .setLocType(bind.getLocType())
+ .setFreeze(toFreezeFlag(bind.getFreeze()));
+ }
+
+ private String toFreezeFlag(Integer freeze) {
+ return Objects.equals(freeze, 1) ? "Y" : "N";
+ }
+
+ private Integer parseBackType(String backType) {
+ if (Cools.isEmpty(backType)) {
+ return null;
+ }
+ String normalized = backType.trim().toUpperCase(Locale.ROOT);
+ if ("4".equals(normalized) || "EMPTY".equals(normalized) || "EMPTY_BUCKET".equals(normalized)
+ || "EMPTY_PLATE".equals(normalized) || "绌烘《".equals(backType.trim())
+ || "绌烘澘".equals(backType.trim())) {
+ return 4;
+ }
+ if ("5".equals(normalized) || "SURPLUS".equals(normalized) || "SUPLUS".equals(normalized)
+ || "LEFTOVER".equals(normalized) || "浣欐枡".equals(backType.trim())) {
+ return 5;
+ }
+ return null;
+ }
+
+ private WrkMast findBackLocWrkMast(HmesBackLocParams params) {
+ if (!Cools.isEmpty(params.getLocNo())) {
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ .eq("loc_no", params.getLocNo())
+ .orderBy("appe_time", false)
+ .orderBy("wrk_no", false));
+ WrkMast matched = pickLatestCompletedWrkMast(wrkMasts);
+ if (matched != null) {
+ return matched;
+ }
+ }
+ if (!Cools.isEmpty(params.getWorkNo())) {
+ return wrkMastService.selectById(params.getWorkNo());
+ }
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ .eq("barcode", params.getBarcode())
+ .orderBy("appe_time", false)
+ .orderBy("wrk_no", false));
+ return pickLatestCompletedWrkMast(wrkMasts);
+ }
+
+ private WrkMast pickLatestCompletedWrkMast(List<WrkMast> wrkMasts) {
+ if (Cools.isEmpty(wrkMasts)) {
+ return null;
+ }
+ for (WrkMast wrkMast : wrkMasts) {
+ if (Objects.equals(wrkMast.getWrkSts(), 15L)) {
+ return wrkMast;
+ }
+ }
+ return wrkMasts.get(0);
}
}
--
Gitblit v1.9.1