From dda2e4a84cbf54262fd465718b769eb50676977a Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期二, 18 十一月 2025 12:39:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 665 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 645 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 9a28eec..5c53a63 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -8,6 +8,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
+import com.zy.asrs.entity.vo.AgvSiteListVo;
import com.zy.asrs.mapper.BasDevpMapper;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
@@ -83,23 +84,180 @@
@Resource
private BasDevpMapper basDevpMapper;
+ @Autowired
+ private AgvSiteService agvSiteService;
+
+
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void AgvStaBind(CombParam param,Long userId) {
+ AgvSite agvSite = agvSiteService.selectOne(new EntityWrapper<AgvSite>().eq("name", param.getBarcode()));
+ if (Cools.isEmpty(agvSite)){
+ throw new CoolException("鏈壘鍒癆GV鏆傚瓨浣嶄俊鎭�");
+ }
+ if (agvSite.getStatus() != 0){
+ throw new CoolException("AGV鏆傚瓨浣嶇姸鎬佷笉涓虹┖闂�");
+ }
+
+ int workNo = commonService.getWorkNo(1);
+ Date now = new Date();
+ WrkMast wrkMast1 = new WrkMast();
+ wrkMast1.setWrkNo(workNo);
+ wrkMast1.setWrkSts(2L);
+ wrkMast1.setIoType(300);
+ wrkMast1.setIoTime(now);
+ wrkMast1.setIoPri(13D); // 浼樺厛绾э細13
+ wrkMast1.setFullPlt("Y"); // 婊℃澘锛歒
+ wrkMast1.setPicking("N"); // 鎷ｆ枡
+ wrkMast1.setExitMk("N"); // 閫�鍑�
+ wrkMast1.setEmptyMk("N"); // 绌烘澘
+ wrkMast1.setLinkMis("N");
+ wrkMast1.setAppeUser(userId); // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast1.setAppeTime(now);
+ wrkMast1.setModiUser(userId);
+ wrkMast1.setModiTime(now);
+ wrkMast1.setBarcode(param.getBarcode());
+ if (!wrkMastService.insert(wrkMast1)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ }
+ // 鐢熸垚宸ヤ綔妗ｆ槑缁�
+ param.getCombMats().forEach(waitPakin -> {
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(waitPakin);
+ wrkDetl.setWrkNo(workNo);
+ wrkDetl.setIoTime(now);
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setModiTime(now);
+ if (!wrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+ }
+ });
+
+ agvSite.setWorkNo(workNo);
+ agvSite.setStatus(1);
+ agvSiteService.updateById(agvSite);
+
+ }
+
+ @Override
+ public R FinishedCall(Map<String, Object> map) {
+ String orgSite = map.get("orgSite").toString();
+ String tarSite = map.get("tarSite").toString();
+ if (Cools.isEmpty(orgSite) || Cools.isEmpty(tarSite)) {
+ return R.error("鏁版嵁涓虹┖");
+ }
+ if (orgSite.charAt(0) != 'd'){
+ throw new CoolException("绔欑偣寮傚父锛屽彧鍏佽d寮�澶寸珯鐐�");
+ }
+// 鍛煎彨agv
+ boolean success = sendAgvTask2(orgSite, tarSite,"GT6");
+ if (!success){
+ throw new CoolException("鍛煎彨agv澶辫触");
+ }
+
+ return R.ok();
+ }
+
+ @Override
+ public R agv2fPack(Map<String, Object> map) {
+ String orgSite = map.get("orgSite").toString();
+ String tarSite = map.get("tarSite").toString();
+ if (Cools.isEmpty(orgSite) || Cools.isEmpty(tarSite)) {
+ return R.error("鏁版嵁涓虹┖");
+ }
+ if (orgSite.charAt(0) != 'd'){
+ throw new CoolException("绔欑偣寮傚父锛屽彧鍏佽d寮�澶寸珯鐐�");
+ }
+// 鍛煎彨agv
+ boolean success = sendAgvTask2(orgSite, tarSite,"GT5");
+ if (!success){
+ throw new CoolException("鍛煎彨agv澶辫触");
+ }
+
+ return R.ok();
+ }
+
+ @Override
+ public List<ManLocDetl> pingKuGetList(PKInventoryAdjustment combParam) {
+ Node node = nodeService.selectOne(new EntityWrapper<Node>().eq("name", combParam.getLocno()).eq("type", 3));
+ if (Cools.isEmpty(node)){
+ throw new CoolException("鏈壘鍒板钩搴撳簱浣嶄俊鎭�");
+ }
+ EntityWrapper<ManLocDetl> manLocDetlEntityWrapper = new EntityWrapper<>();
+ manLocDetlEntityWrapper.eq("loc_no", node.getName());
+ manLocDetlEntityWrapper.eq(!Cools.isEmpty(combParam.getMatnr()),"matnr", combParam.getMatnr());
+ List<ManLocDetl> manLocDetls = manLocDetlService.selectList(manLocDetlEntityWrapper);
+ if (Cools.isEmpty(manLocDetls)){
+ throw new CoolException("鏈壘鍒板簱瀛樹俊鎭�");
+ }
+ return manLocDetls;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void pingKuInventoryAdjustment(PKInventoryAdjustment combParam) {
+ Node node = nodeService.selectOne(new EntityWrapper<Node>().eq("name", combParam.getLocno()).eq("type", 3));
+ if (Cools.isEmpty(node)){
+ throw new CoolException("鏈壘鍒板钩搴撳簱浣嶄俊鎭�");
+ }
+ for (ManLocDetl manLocDetl :combParam.getManLocDetls()){
+ EntityWrapper<ManLocDetl> manLocDetlEntityWrapper = new EntityWrapper<>();
+ manLocDetlEntityWrapper.eq("loc_no", manLocDetl.getLocNo());
+ manLocDetlEntityWrapper.eq("matnr", manLocDetl.getMatnr());
+ manLocDetlEntityWrapper.eq("batch", manLocDetl.getBatch());
+ List<ManLocDetl> manLocDetls = manLocDetlService.selectList(manLocDetlEntityWrapper);
+ if (Cools.isEmpty(manLocDetls) || manLocDetls.size() > 1){
+ throw new CoolException("鏁版嵁閿欒");
+ }
+
+ ManLocDetl manLocDetl1 = manLocDetls.get(0);
+ BigDecimal adjustBigDecimal = new BigDecimal(manLocDetl.getAnfme().toString());
+ BigDecimal orgBigDecimal = new BigDecimal(manLocDetl1.getAnfme().toString());
+ if (orgBigDecimal.compareTo(adjustBigDecimal) == 0){
+ continue;
+ }
+ manLocDetl1.setAnfme(adjustBigDecimal.doubleValue());
+ if (!manLocDetlService.update(manLocDetl1,manLocDetlEntityWrapper)){
+ throw new CoolException("鏇存柊鏁版嵁澶辫触");
+ }
+
+
+
+ }
+ }
@Override
public R inLocCallAgv(String sta, String inSta) {
BasDevp basDevp = basDevpMapper.selectById(inSta);
- // 0.鍑哄簱妯″紡锛�1.agv鍏ュ簱涓紝2.鐢熸垚鍏ュ簱浠诲姟
- if (basDevp.getDevMk().equals("0")) { // 鏄嚭搴�
- // 鍒ゆ柇鏄惁鏈夊嚭搴撲换鍔�
- int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>()
- .eq("sta_no", inSta).lt("wrk_sts",14).in("io_type",101,103,107,110));
- if (count == 0) {
- // 娌℃湁鍑哄簱浠诲姟锛屾洿鏀逛负鍏ュ簱妯″紡
- basDevp.setDevMk("1");
- basDevpMapper.updateById(basDevp);
- } else {
- return R.parse(inSta + "绔欑偣瀛樺湪鍑哄簱浠诲姟");
- }
+
+ // 鍒ゆ柇鏄惁鏈夊嚭搴撲换鍔�
+ Wrapper<WrkMast> wrapper = new EntityWrapper<WrkMast>().lt("wrk_sts", 14).in("io_type", 101, 103, 107, 110);
+
+ switch (inSta) {
+ case "1040":
+ wrapper.in("source_sta_no", "1043", "1044");
+ break;
+ case "2010":
+ wrapper.in("source_sta_no", "2013", "2014");
+ break;
+ case "2000":
+ wrapper.in("source_sta_no", "2003", "2004");
+ break;
+ case "3010":
+ wrapper.in("source_sta_no", "3013", "3014");
+ break;
+ case "1000":
+ case "1035":
+ wrapper.in("source_sta_no", "1024", "1028");
+ break;
+ default:
+ }
+ int count = wrkMastService.selectCount(wrapper);
+ log.info("鍏ュ簱鍛煎彨agv鍛煎彨绔欑偣锛歿}锛岀洰鏍囩珯鐐癸細{},鍑哄簱浠诲姟鏁帮細{}",sta,inSta,count);
+ if (count != 0) {
+ return R.parse(inSta + "绔欑偣瀛樺湪鍑哄簱浠诲姟");
}
// 鍏堢粦瀹�
@@ -131,10 +289,17 @@
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
- jsonObject.getString("message");
if (jsonObject.getInteger("code").equals(0)) {
success = true;
+ // 鍏ュ簱鏆傚瓨+1
+ if (!inSta.equals("1000") && !inSta.equals("1035")){
+ basDevp.setInQty(basDevp.getInQty() + 1);
+ basDevpMapper.updateById(basDevp);
+ log.info("鍏ュ簱鍛煎彨锛�"+basDevp.getDevNo()+"+1");
+ }
+
} else {
+ message = jsonObject.getString("message");
log.error("鍏ュ簱鍛煎彨agv澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", ApiInterfaceConstant.AGV_IP + ApiInterfaceConstant.AGV_CALL_IN_PATH, body, response);
}
} catch (Exception e) {
@@ -160,14 +325,14 @@
}
@Override
- public R unbind(String site) {
+ public R unbind2(String site) {
String staMap = AgvSiteConstant.SiteMap.get(site);
if (staMap == null) {
return R.parse("娌℃湁鎵惧埌璇ョ珯鐐圭殑鍏ュ簱鏄犲皠锛�" + site);
}
JSONObject jsonObject = new JSONObject();
jsonObject.put("reqCode",UUID.randomUUID().toString().replace("-", "")); // 璇锋眰鍞竴鍊�
- jsonObject.put("ctnrTyp","2"); // 瀹瑰櫒绫诲瀷2
+ jsonObject.put("ctnrTyp","3"); // 瀹瑰櫒绫诲瀷2
jsonObject.put("stgBinCode",staMap); // 浠撲綅缂栧彿锛屾牴鎹浠撶紪鍙疯浆鎹�
jsonObject.put("indBind","0"); // 1缁戝畾锛�0瑙ｇ粦
@@ -183,7 +348,7 @@
.build()
.doPost();
JSONObject res = JSON.parseObject(response);
- message = jsonObject.getString("message");
+ message = res.getString("message");
if (res.getInteger("code").equals(0)) {
success = true;
} else {
@@ -210,7 +375,162 @@
return success ? R.ok("瑙ｇ粦鎴愬姛") : R.parse(message);
}
- private boolean bindPodAndBerth(String sta) {
+ @Override
+ public R unbind(String site) {
+ String staMap = AgvSiteConstant.SiteMap.get(site);
+ if (staMap == null) {
+ return R.parse("娌℃湁鎵惧埌璇ョ珯鐐圭殑鍏ュ簱鏄犲皠锛�" + site);
+ }
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("reqCode",UUID.randomUUID().toString().replace("-", "")); // 璇锋眰鍞竴鍊�
+ jsonObject.put("ctnrTyp","2"); // 瀹瑰櫒绫诲瀷2
+ jsonObject.put("stgBinCode",staMap); // 浠撲綅缂栧彿锛屾牴鎹浠撶紪鍙疯浆鎹�
+ jsonObject.put("indBind","0"); // 1缁戝畾锛�0瑙ｇ粦
+
+ String body = jsonObject.toJSONString();
+ String response = "";
+ String message = "";
+ boolean success = false;
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(ApiInterfaceConstant.AGV_IP)
+ .setPath(ApiInterfaceConstant.AGV_BIND_PATH)
+ .setJson(body)
+ .build()
+ .doPost();
+ JSONObject res = JSON.parseObject(response);
+ message = res.getString("message");
+ if (res.getInteger("code").equals(0)) {
+ success = true;
+ } else {
+ log.error("璋冪敤agv瑙ｇ粦鏆傚瓨浣嶅け璐ワ紒锛侊紒url锛歿}锛況equest锛歿}锛況esponse锛歿}", ApiInterfaceConstant.AGV_IP + ApiInterfaceConstant.AGV_BIND_PATH, body, response);
+ }
+ } catch (Exception e) {
+ log.error("璋冪敤agv瑙ｇ粦鏆傚瓨浣嶅紓甯�", e);
+ } finally {
+ try {
+ // 淇濆瓨鎺ュ彛鏃ュ織
+ apiLogService.save(
+ "璋冪敤agv瑙ｇ粦鏆傚瓨浣�",
+ ApiInterfaceConstant.AGV_IP + ApiInterfaceConstant.AGV_BIND_PATH,
+ null,
+ "127.0.0.1",
+ body,
+ response,
+ success
+ );
+ } catch (Exception e) {
+ log.error("", e);
+ }
+ }
+ return success ? R.ok("瑙ｇ粦鎴愬姛") : R.parse(message);
+ }
+
+ public boolean sendAgvTask2(String org,String tar,String type){
+
+ ForwardAGVTaskParam forwardAGVTaskParam = new ForwardAGVTaskParam();
+ forwardAGVTaskParam.setReqCode(UUID.randomUUID().toString().replace("-", ""));
+ forwardAGVTaskParam.setClientCode("IWMS");
+ forwardAGVTaskParam.setTaskTyp(type);
+ forwardAGVTaskParam.setCtnrTyp("2");
+ forwardAGVTaskParam.setPriority("1");
+ List<ForwardAGVTaskParam.PositionCodePaths> positionCodePathsList = new ArrayList<>();
+ positionCodePathsList.add(new ForwardAGVTaskParam.PositionCodePaths(org, "05"));
+ positionCodePathsList.add(new ForwardAGVTaskParam.PositionCodePaths(tar, "04"));
+ forwardAGVTaskParam.setPositionCodePath(positionCodePathsList);
+
+ String body = JSON.toJSONString(forwardAGVTaskParam);
+ String response = "";
+ String message = "";
+ boolean success = false;
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(ApiInterfaceConstant.AGV_IP)
+ .setPath(ApiInterfaceConstant.AGV_CALL_IN_PATH)
+ .setJson(body)
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject.getInteger("code").equals(0)) {
+ success = true;
+ } else {
+
+ log.error("鍛煎彨agv澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", ApiInterfaceConstant.AGV_IP + ApiInterfaceConstant.AGV_CALL_IN_PATH, body, response);
+ }
+ } catch (Exception e) {
+ log.error("鍏ュ簱鍛煎彨agv寮傚父", e);
+ } finally {
+ try {
+ // 淇濆瓨鎺ュ彛鏃ュ織
+ apiLogService.save(
+ "鍏ュ簱鍛煎彨agv",
+ ApiInterfaceConstant.AGV_IP + ApiInterfaceConstant.AGV_CALL_IN_PATH,
+ null,
+ "127.0.0.1",
+ body,
+ response,
+ success
+ );
+ } catch (Exception e) {
+ log.error("", e);
+ }
+ }
+ return success;
+ }
+
+ public boolean sendAgvTask(String org,String tar,String type){
+
+ ForwardAGVTaskParam forwardAGVTaskParam = new ForwardAGVTaskParam();
+ forwardAGVTaskParam.setReqCode(UUID.randomUUID().toString().replace("-", ""));
+ forwardAGVTaskParam.setClientCode("IWMS");
+ forwardAGVTaskParam.setTaskTyp(type);
+ forwardAGVTaskParam.setCtnrTyp("2");
+ forwardAGVTaskParam.setPriority("1");
+ List<ForwardAGVTaskParam.PositionCodePaths> positionCodePathsList = new ArrayList<>();
+ positionCodePathsList.add(new ForwardAGVTaskParam.PositionCodePaths(org, "05"));
+ positionCodePathsList.add(new ForwardAGVTaskParam.PositionCodePaths(tar, "05"));
+ forwardAGVTaskParam.setPositionCodePath(positionCodePathsList);
+
+ String body = JSON.toJSONString(forwardAGVTaskParam);
+ String response = "";
+ String message = "";
+ boolean success = false;
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(ApiInterfaceConstant.AGV_IP)
+ .setPath(ApiInterfaceConstant.AGV_CALL_IN_PATH)
+ .setJson(body)
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject.getInteger("code").equals(0)) {
+ success = true;
+ } else {
+
+ log.error("鍛煎彨agv澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", ApiInterfaceConstant.AGV_IP + ApiInterfaceConstant.AGV_CALL_IN_PATH, body, response);
+ }
+ } catch (Exception e) {
+ log.error("鍏ュ簱鍛煎彨agv寮傚父", e);
+ } finally {
+ try {
+ // 淇濆瓨鎺ュ彛鏃ュ織
+ apiLogService.save(
+ "鍏ュ簱鍛煎彨agv",
+ ApiInterfaceConstant.AGV_IP + ApiInterfaceConstant.AGV_CALL_IN_PATH,
+ null,
+ "127.0.0.1",
+ body,
+ response,
+ success
+ );
+ } catch (Exception e) {
+ log.error("", e);
+ }
+ }
+ return success;
+ }
+ @Override
+ public boolean bindPodAndBerth(String sta) {
String staMap = AgvSiteConstant.SiteMap.get(sta);
if (staMap == null) {
log.error("娌℃湁鎵惧埌璇ョ珯鐐圭殑鍏ュ簱鏄犲皠:{}",sta);
@@ -218,7 +538,7 @@
}
JSONObject jsonObject = new JSONObject();
jsonObject.put("reqCode",UUID.randomUUID().toString().replace("-", "")); // 璇锋眰鍞竴鍊�
- jsonObject.put("ctnrTyp","2"); // 瀹瑰櫒绫诲瀷2
+ jsonObject.put("ctnrTyp","3"); // 瀹瑰櫒绫诲瀷2
jsonObject.put("stgBinCode",staMap); // 浠撲綅缂栧彿锛屾牴鎹浠撶紪鍙疯浆鎹�
jsonObject.put("indBind","1"); // 1缁戝畾锛�0瑙ｇ粦
@@ -364,7 +684,9 @@
throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
}
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getManu());
+// DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getManu());
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getSuppCode()
+ , orderDetl.getManu(),orderDetl.getSku(),orderDetl.getSupp(),orderDetl.getTemp1(),orderDetl.getTemp2(),orderDetl.getTemp3(),orderDetl.getTemp4());
if (DetlDto.has(detlDtos, detlDto)) {
DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
assert one != null;
@@ -393,6 +715,18 @@
waitPakin.setModiTime(now);
waitPakin.setManu(detlDto.getMark()); //鏍囪
waitPakin.setOrigin(order.getItemName());//浠撳簱
+ waitPakin.setSupp(detlDto.getSuppName()); //渚涘簲鍟�
+ waitPakin.setSku(detlDto.getCustomer()); //瀹㈡埛鍚嶇О
+ waitPakin.setThreeCode(detlDto.getOrderNo()); //u8鍙戣繃鏉ョ殑璁㈠崟鍙�
+ waitPakin.setSuppCode(detlDto.getFromOrderNo()); //鏉ユ簮鍗曞彿
+ waitPakin.setTemp1(detlDto.getTemp1());
+ waitPakin.setTemp2(detlDto.getTemp2());
+ waitPakin.setTemp3(detlDto.getTemp3());
+ waitPakin.setTemp4(detlDto.getTemp4());
+ int countWrk2 = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
+ if (countWrk2 > 0) {
+ throw new CoolException("宸ヤ綔妗ｆ潯鐮佹暟鎹凡瀛樺湪===>>" + param.getBarcode());
+ }
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
@@ -464,6 +798,11 @@
wrkDetl.setModiTime(now);
wrkDetl.setModiUser(userId);
wrkDetl.setManu(orderDetl.getManu());
+ wrkDetl.setSupp(orderDetl.getSupp());
+ wrkDetl.setTemp1(orderDetl.getTemp1());
+ wrkDetl.setTemp2(orderDetl.getTemp2());
+ wrkDetl.setTemp3(orderDetl.getTemp3());
+ wrkDetl.setTemp4(orderDetl.getTemp4());
wrkDetlService.insert(wrkDetl);
}
@@ -781,7 +1120,7 @@
Date now = new Date();
for(OrderDetl orderDetl : orderDetls){
//鏌ヨ鎵�鏈夊簱浣嶇姸鎬佷负F鐨勫簱浣嶄俊鎭�
- List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(),orderDetl.getBatch(),null,null);
+ List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(),orderDetl.getBatch(),null,null,orderDetl.getSupp(),orderDetl.getTemp1(),orderDetl.getTemp2());
if (locDetls.size() == 0) {
throw new CoolException("搴撳瓨涓病鏈夎鐗╂枡");
}
@@ -971,6 +1310,292 @@
}
+ @Override
+ @Transactional
+ public void pingKuShelves(CombParam combParam,Long userId) {
+ Node node = nodeService.selectOne(new EntityWrapper<Node>().eq("name", combParam.getLocno()).eq("type", 3));
+ if (Cools.isEmpty(node)){
+ throw new CoolException("鏈壘鍒板簱浣嶄俊鎭�");
+ }
+
+ Order order = orderService.selectByNo(combParam.getOrderNo());
+ if (Cools.isEmpty(order) || order.getSettle() > 2) {
+ throw new CoolException("鍗曟嵁缂栧彿宸茶繃鏈�");
+ }
+ // 鐢熸垚鍏ュ簱閫氱煡妗�
+ List<DetlDto> detlDtos = new ArrayList<>();
+
+ for (CombParam.CombMat elem : combParam.getCombMats()) {
+
+
+// param.getCombMats().forEach(elem -> {
+
+ // 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
+ OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch());
+ if (Cools.isEmpty(orderDetl)) {
+ throw new CoolException("璇ュ崟鎹腑鏈壘鍒板搴旂墿鏂欐槑缁�");
+ }
+ if (elem.getAnfme() > orderDetl.getEnableQty()) {
+ throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
+ }
+ // 淇敼璁㈠崟浣滀笟鏁伴噺
+ if (!orderDetlService.increaseWorkQty(order.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme())) {
+ throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
+ }
+
+// DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getManu());
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getSuppCode()
+ , orderDetl.getManu(),orderDetl.getSku(),orderDetl.getSupp(),orderDetl.getTemp1(),orderDetl.getTemp2(),orderDetl.getTemp3(),orderDetl.getTemp4());
+ if (DetlDto.has(detlDtos, detlDto)) {
+ DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
+ assert one != null;
+ one.setAnfme(one.getAnfme() + detlDto.getAnfme());
+ } else {
+ detlDtos.add(detlDto);
+ }
+// });
+ }
+ int workNo = commonService.getWorkNo(4);
+ Date now = new Date();
+ // 鐢熸垚宸ヤ綔妗�
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(workNo);
+ wrkMast.setIoTime(new Date());
+ wrkMast.setWrkSts(4L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
+ wrkMast.setIoType(300); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
+ wrkMast.setIoPri(12D); // 浼樺厛绾�
+ wrkMast.setLocNo(node.getName());
+ wrkMast.setBarcode(""); // 鎵樼洏鐮�
+ wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("N"); // 绌烘澘
+ wrkMast.setLinkMis("Y");
+ wrkMast.setSheetNo(order.getOrderNo());
+ // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiTime(now);
+ boolean res = wrkMastService.insert(wrkMast);
+ if (!res) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ }
+ for (DetlDto detlDto : detlDtos) {
+ Mat mat = matService.selectByMatnr(detlDto.getMatnr());
+ if (Cools.isEmpty(mat)) {
+ throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
+ }
+ WrkDetl wrkDetl = new WrkDetl();
+
+ wrkDetl.sync(detlDto);
+ wrkDetl.sync(mat);
+
+ wrkDetl.setOrderNo(order.getOrderNo());
+ wrkDetl.setWrkNo(wrkMast.getWrkNo());
+ wrkDetl.setIoTime(wrkMast.getIoTime());
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setModiTime(now);
+ wrkDetl.setManu(detlDto.getMark()); //鏍囪
+ wrkDetl.setOrigin(order.getItemName());//浠撳簱
+ wrkDetl.setSupp(detlDto.getSuppName()); //渚涘簲鍟�
+ wrkDetl.setSku(detlDto.getCustomer()); //瀹㈡埛鍚嶇О
+ wrkDetl.setThreeCode(detlDto.getOrderNo()); //u8鍙戣繃鏉ョ殑璁㈠崟鍙�
+ wrkDetl.setSuppCode(detlDto.getFromOrderNo()); //鏉ユ簮鍗曞彿
+ wrkDetl.setTemp1(detlDto.getTemp1());
+ wrkDetl.setTemp2(detlDto.getTemp2());
+ wrkDetl.setTemp3(detlDto.getSuppName());
+ wrkDetl.setTemp4(detlDto.getTemp4());
+ if (!wrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+ }
+ }
+ orderService.updateSettle(order.getId(), 2L, userId);
+
+
+ }
+
+ @Override
+ @Transactional
+ public void pingKuUnShelves(CombParam combParam, Long userId) {
+ String orderNo = combParam.getOrderNo();
+
+ Node node = nodeService.selectOne(new EntityWrapper<Node>().eq("name", combParam.getLocno()).eq("type", 3));
+ if (Cools.isEmpty(node)){
+ throw new CoolException("鏈壘鍒板簱浣嶄俊鎭�");
+ }
+ //鏍规嵁璁㈠崟鍙风敓鎴愬嚭搴撲换鍔″伐浣滄。
+ Order order = orderService.selectOne(new EntityWrapper<Order>().eq("order_no", orderNo));
+ if (order.getSettle() != 1 && order.getSettle() != 2){
+ throw new CoolException("璇ヨ鍗曞凡澶勭悊");
+ }
+ List<DetlDto> detlDtos = new ArrayList<>();
+ for (CombParam.CombMat elem : combParam.getCombMats()) {
+ Wrapper<ManLocDetl> manLocDetlWrapper = new EntityWrapper<ManLocDetl>().eq("loc_no", combParam.getLocno())
+ .eq("matnr", elem.getMatnr()).eq("batch", elem.getBatch())
+ .eq("temp3", elem.getSupp()).eq("temp1", elem.getTemp1()).eq("temp2", elem.getTemp2());
+ ManLocDetl manLocDetl = manLocDetlService.selectOne(manLocDetlWrapper);
+
+ if (Cools.isEmpty(manLocDetl)){
+ throw new CoolException("璇ュ簱浣嶆湭鏌ヨ鍒拌揣鐗╀俊鎭�");
+ }
+ if (elem.getAnfme()> manLocDetl.getAnfme()){
+ throw new CoolException("鍑哄簱鏁伴噺澶т簬搴撲綅鍓╀綑鏁伴噺");
+ }
+
+ OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch());
+ if (Cools.isEmpty(orderDetl)) {
+ throw new CoolException("璇ュ崟鎹腑鏈壘鍒板搴旂墿鏂欐槑缁�");
+ }
+ if (elem.getAnfme() > orderDetl.getEnableQty()) {
+ throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
+ }
+ // 淇敼璁㈠崟浣滀笟鏁伴噺
+ if (!orderDetlService.increaseWorkQty(order.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme())) {
+ throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
+ }
+
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getSuppCode()
+ , orderDetl.getManu(),orderDetl.getSku(),orderDetl.getSupp(),orderDetl.getTemp1(),orderDetl.getTemp2(),orderDetl.getTemp3(),orderDetl.getTemp4());
+
+
+ int workNo = commonService.getWorkNo(4);
+ Date now = new Date();
+ // 鐢熸垚宸ヤ綔妗�
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(workNo);
+ wrkMast.setIoTime(new Date());
+ wrkMast.setWrkSts(14L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
+ wrkMast.setIoType(301); // 鍏ュ嚭搴撶姸鎬侊細301.骞冲簱鍑哄簱
+ wrkMast.setIoPri(12D); // 浼樺厛绾�
+ wrkMast.setSourceLocNo(node.getName());
+ wrkMast.setBarcode(""); // 鎵樼洏鐮�
+ wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("N"); // 绌烘澘
+ wrkMast.setLinkMis("Y");
+ wrkMast.setSheetNo(order.getOrderNo());
+ // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiTime(now);
+ boolean res = wrkMastService.insert(wrkMast);
+ if (!res) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ }
+
+ Mat mat = matService.selectByMatnr(detlDto.getMatnr());
+ if (Cools.isEmpty(mat)) {
+ throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
+ }
+ WrkDetl wrkDetl = new WrkDetl();
+
+ wrkDetl.sync(detlDto);
+ wrkDetl.sync(mat);
+
+ wrkDetl.setOrderNo(order.getOrderNo());
+ wrkDetl.setWrkNo(wrkMast.getWrkNo());
+ wrkDetl.setIoTime(wrkMast.getIoTime());
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setModiTime(now);
+ wrkDetl.setManu(detlDto.getMark()); //鏍囪
+ wrkDetl.setOrigin(order.getItemName());//浠撳簱
+ wrkDetl.setSupp(detlDto.getSuppName()); //渚涘簲鍟�
+ wrkDetl.setSku(detlDto.getCustomer()); //瀹㈡埛鍚嶇О
+ wrkDetl.setThreeCode(detlDto.getOrderNo()); //u8鍙戣繃鏉ョ殑璁㈠崟鍙�
+ wrkDetl.setSuppCode(detlDto.getFromOrderNo()); //鏉ユ簮鍗曞彿
+ wrkDetl.setTemp1(detlDto.getTemp1());
+ wrkDetl.setTemp2(detlDto.getTemp2());
+ wrkDetl.setTemp3(detlDto.getTemp3());
+ wrkDetl.setTemp4(detlDto.getTemp4());
+ if (!wrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+ }
+
+ if (new BigDecimal(manLocDetl.getAnfme()).subtract(new BigDecimal(elem.getAnfme())).doubleValue() == 0){
+ manLocDetlService.delete(manLocDetlWrapper);
+ }else {
+ manLocDetl.setAnfme(new BigDecimal(manLocDetl.getAnfme()).subtract(new BigDecimal(elem.getAnfme())).doubleValue());
+ if (!manLocDetlService.update(manLocDetl,manLocDetlWrapper)) {
+ throw new CoolException("鏇存柊鏄庣粏澶辫触");
+ }
+ }
+
+
+
+
+
+ }
+ orderService.updateSettle(order.getId(), 2L, userId);
+
+
+ }
+
+ @Override
+ public R siteList() {
+ List<AgvSite> agvSites = agvSiteService.selectList(new EntityWrapper<AgvSite>());
+ ArrayList<AgvSiteListVo> agvSiteListVos = new ArrayList<>();
+ for (AgvSite agvSite : agvSites) {
+ AgvSiteListVo agvSiteListVo = new AgvSiteListVo();
+ agvSiteListVo.setAgvSite(agvSite);
+ if (Cools.isEmpty(agvSite.getWorkNo())){
+ continue;
+ }
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", agvSite.getWorkNo()));
+ if (null == wrkMast){
+ continue;
+ }
+ List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", agvSite.getWorkNo()));
+ agvSiteListVo.setWrkDetls(wrkDetls);
+ agvSiteListVos.add(agvSiteListVo);
+ }
+ return R.ok(agvSiteListVos);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R lineCall(Map<String, Object> map) {
+ String orgSite = map.get("orgSite").toString();
+ String tarSite = map.get("tarSite").toString();
+ if (Cools.isEmpty(orgSite) || Cools.isEmpty(tarSite)) {
+ return R.error("鏁版嵁涓虹┖");
+ }
+ AgvSite orgAgvSite = agvSiteService.selectOne(new EntityWrapper<AgvSite>().eq("name", orgSite));
+
+// AgvSite tarAgvSite = agvSiteService.selectOne(new EntityWrapper<AgvSite>().eq("name", tarSite));
+ if (Cools.isEmpty(orgAgvSite)) {
+ return R.error("绔欑偣鏁版嵁閿欒");
+ }
+
+ //鏇存柊tar绔欑偣鐘舵��
+// tarAgvSite.setWorkNo(orgAgvSite.getWorkNo());
+// tarAgvSite.setStatus(2);
+// if (!agvSiteService.updateById(tarAgvSite)){
+// throw new CoolException("鍙枡绔欐洿鏂板け璐�");
+// }
+ WrkMast wrkMast = wrkMastService.selectById(orgAgvSite.getWorkNo());
+ if (!Cools.isEmpty(wrkMast)){
+ wrkMast.setWrkSts(5L);
+ wrkMastService.updateById(wrkMast);
+ }
+
+ //鏇存柊org绔欑偣鐘舵��
+ orgAgvSite.setStatus(0);
+ orgAgvSite.setWorkNo(null);
+ if (!agvSiteService.updateById(orgAgvSite)){
+ throw new CoolException("婧愮珯鏇存柊澶辫触");
+ }
+
+
+
+// 鍛煎彨agv
+ boolean success = sendAgvTask(orgSite, tarSite,"GT6");
+ if (!success){
+ throw new CoolException("鍛煎彨agv澶辫触");
+ }
+
+ return R.ok();
+ }
+
+
public void uploadErp(InventoryErpParam param){
String response = "";
boolean success = false;
--
Gitblit v1.9.1