From a85a8d0c33d4a821a98a0ff6789298a23a180006 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 28 四月 2025 14:39:45 +0800
Subject: [PATCH] 拣货单出库完成，但是库存没减，日志埋点
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 323 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 278 insertions(+), 45 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 5a46d16..080b2f9 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1,5 +1,6 @@
package com.zy.asrs.service.impl;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -11,33 +12,48 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.InOutCountDto;
-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.Utils;
import com.zy.common.model.DetlDto;
+import com.zy.common.utils.HttpHandler;
import com.zy.common.utils.NodeUtils;
-import com.zy.common.utils.Synchro;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.text.ParseException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
/**
* Created by vincent on 2022/4/9
*/
@Slf4j
-@Service
+@Service("OpenService")
public class OpenServiceImpl implements OpenService {
+
+ @Value("${u8.url}")
+ private String url;
+
+ @Value("${u8.path}")
+ private String orderReportPath;
+
@Autowired
private OrderService orderService;
+ @Autowired
+ private OrderLogService orderLogService;
@Autowired
private OrderDetlService orderDetlService;
@Autowired
@@ -64,6 +80,14 @@
private ManPakOutService manPakOutService;
@Autowired
private LocOwnerService locOwnerService;
+ @Autowired
+ private ReportQueryMapper reportQueryMapper;
+ @Autowired
+ private UserService userService;
+ @Autowired
+ private PlaService plaService;
+ @Autowired
+ private ApiLogService apiLogService;
@Override
@Transactional
@@ -73,14 +97,15 @@
throw new CoolException(param.getOrderNo() + "鍗曟嵁宸插瓨鍦紝璇峰嬁閲嶅鎻愪氦");
}
- for (DetlDto detlDto : param.getOrderDetails()){
- if (Cools.isEmpty(detlDto) || Cools.isEmpty(detlDto.getOwnerName(),detlDto.getPayment())){
+ for (DetlDto detlDto : param.getOrderDetails()) {
+ if (Cools.isEmpty(detlDto) || Cools.isEmpty(detlDto.getOwnerName(), detlDto.getPayment())) {
throw new CoolException(param.getOrderNo() + "缂哄皯璐т富鎴栬揣鐗╁舰鎬�");
- }else {
+ } else {
LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().eq("owner", detlDto.getOwnerName()));
- if (Cools.isEmpty(locOwner)){
+ if (Cools.isEmpty(locOwner)) {
LocOwner locOwner1 = new LocOwner();
locOwner1.setOwner(detlDto.getOwnerName());
+ locOwnerService.insert(locOwner1);
}
}
}
@@ -130,7 +155,7 @@
List<DetlDto> list = new ArrayList<>();
List<DetlDto> orderDetails = param.getOrderDetails();
for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme());
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(), detail.getOwnerName(), detail.getPayment());
if (DetlDto.has(list, dto)) {
DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
assert detlDto != null;
@@ -163,9 +188,9 @@
orderDetl.setUpdateBy(9527L);
orderDetl.setUpdateTime(now);
LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().eq("owner", detlDto.getOwnerName()));
- if (Cools.isEmpty(locOwner)){
+ if (Cools.isEmpty(locOwner)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }else {
+ } else {
orderDetl.setOwner(locOwner.getId().intValue());
}
orderDetl.setPayment(detlDto.getPayment());
@@ -181,31 +206,43 @@
@Override
@Transactional
public void pakoutOrderCreate(OpenOrderPakoutParam param) {
- Order order = orderService.selectByNo(param.getOrderNo());
+ Order order = orderService.selectByNo(param.getCCode());
// 濡傛灉鍗曟嵁涓嶅瓨鍦ㄥ垯娣诲姞锛涘鏋滃崟鎹瓨鍦紝浣滀笟涓棤娉曚慨鏀癸紝鍙嶄箣鍒欎慨鏀瑰崟鎹�
if (!Cools.isEmpty(order)) {
if (order.getSettle() > 1L) {
- throw new CoolException(param.getOrderNo() + "姝ｅ湪鍑哄簱锛屾棤娉曚慨鏀瑰崟鎹�");
+ throw new CoolException(param.getCCode() + "姝ｅ湪鍑哄簱锛屾棤娉曚慨鏀瑰崟鎹�");
}
orderService.remove(order.getId());
}
- DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.FALSE);
+ OrderLog orderLog = orderLogService.selectByNo(param.getCCode());
+ if (!Cools.isEmpty(orderLog)) {
+ throw new CoolException(param.getCCode() + "鍗曟嵁宸茬粡瀹屾垚锛屼笉闇�瑕佸啀浼犻��");
+ }
+
+ DocType docType = docTypeService.selectOrAdd(param.getType(), Boolean.FALSE);
Date now = new Date();
+
+ //鏌ユ壘鍋氬崟鐢ㄦ埛
+ User user = userService.selectOne(new EntityWrapper<User>().eq("username", param.getCMaker()));
+ if (Cools.isEmpty(user)) {
+ throw new CoolException("鏈煡璇㈠埌璇ョ敤鎴�");
+ }
+
// 鍗曟嵁涓绘。
order = new Order(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
- param.getOrderNo(), // 璁㈠崟缂栧彿
+ param.getCCode(), // 璁㈠崟缂栧彿
DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
docType.getDocId(), // 鍗曟嵁绫诲瀷
- null, // 椤圭洰缂栧彿
+ 1L, // 椤圭洰缂栧彿
null, //
null, // 璋冩嫧椤圭洰缂栧彿
null, // 鍒濆绁ㄦ嵁鍙�
- null, // 绁ㄦ嵁鍙�
+ param.getCAccount(), // 涓讳綋
null, // 瀹㈡埛缂栧彿
- null, // 瀹㈡埛
+ param.getCCusName(), // 瀹㈡埛
null, // 鑱旂郴鏂瑰紡
- null, // 鎿嶄綔浜哄憳
+ param.getCMaker(), // 鎿嶄綔浜哄憳
null, // 鍚堣閲戦
null, // 浼樻儬鐜�
null, // 浼樻儬閲戦
@@ -222,7 +259,7 @@
null, // 鐗╂祦鍗曞彿
1L, // 璁㈠崟鐘舵��
1, // 鐘舵��
- 9527L, // 娣诲姞浜哄憳
+ user.getId(), // 娣诲姞浜哄憳
now, // 娣诲姞鏃堕棿
9527L, // 淇敼浜哄憳
now, // 淇敼鏃堕棿
@@ -232,37 +269,24 @@
throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
// 鍗曟嵁鏄庣粏妗�
- List<DetlDto> list = new ArrayList<>();
- List<DetlDto> orderDetails = param.getOrderDetails();
- for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme());
- if (DetlDto.has(list, dto)) {
- DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
- assert detlDto != null;
- detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
- } else {
- list.add(dto);
- }
- dto.setWeight(detail.getWeight());
- }
- for (DetlDto detlDto : list) {
- Mat mat = matService.selectByMatnr(detlDto.getMatnr());
+ for (OpenOrderPakoutParam.Body body : param.getADDBody()) {
+ Mat mat = matService.selectByMatnr(body.getCInvCode());
if (Cools.isEmpty(mat)) {
- throw new CoolException(detlDto.getMatnr() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
+ throw new CoolException(body.getCInvCode() + "缂栧彿鍟嗗搧妫�绱㈠け璐ワ紝璇峰厛娣诲姞鍟嗗搧");
}
OrderDetl orderDetl = new OrderDetl();
orderDetl.sync(mat);
- orderDetl.setBatch(detlDto.getBatch() == null ? "" : detlDto.getBatch());
- orderDetl.setAnfme(detlDto.getAnfme());
+ orderDetl.setAnfme(body.getIQuantity());
+ orderDetl.setQty(0.0D);
+ orderDetl.setWorkQty(0.0D);
+ orderDetl.setStatus(1);
orderDetl.setOrderId(order.getId());
orderDetl.setOrderNo(order.getOrderNo());
- orderDetl.setCreateBy(9527L);
+ orderDetl.setCreateBy(user.getId());
orderDetl.setCreateTime(now);
- orderDetl.setUpdateBy(9527L);
+ orderDetl.setUpdateBy(user.getId());
orderDetl.setUpdateTime(now);
- orderDetl.setStatus(1);
- orderDetl.setQty(0.0D);
- orderDetl.setWeight(detlDto.getWeight());
+ orderDetl.setUuid(String.valueOf(System.currentTimeMillis()));
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
@@ -393,8 +417,18 @@
@Override
@Transactional
public void syncMat(MatSyncParam param) {
+
if (Cools.isEmpty(param.getMatDetails()) || param.getMatDetails().size() <= 0) {
throw new CoolException("鍟嗗搧鏁版嵁涓虹┖");
+ }
+
+ //鍒犻櫎瀛樿揣妗ｆ
+ if (param.deleteFlag == 1) {
+ for (MatSyncParam.MatParam matParam : param.getMatDetails()) {
+ matService.delete(new EntityWrapper<Mat>().eq("matnr", matParam.getMatnr()));
+ }
+
+ return;
}
for (MatSyncParam.MatParam matParam : param.getMatDetails()) {
@@ -489,14 +523,15 @@
}
if (!matService.insert(mat)) {
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- } else {
- log.info("鍚屾鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
}
+ log.info("鍚屾鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
} else {
- mat.sync(param);
+ //mat.sync(param);
+ mat.setMaktx(matParam.getMaktx());
if (!matService.update(mat, new EntityWrapper<Mat>().eq("matnr", matParam.getMatnr()))) {
throw new CoolException("鏇存柊宸插瓨鍦ㄥ晢鍝佷俊鎭け璐ワ紝璇疯仈绯荤鐞嗗憳");
}
+ log.info("鍚屾鏇存柊鐗╂枡[鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
}
}
@@ -508,4 +543,202 @@
return R.ok().add(top100);
}
+ /*
+ * 閫熻吘鏁板瓧瀛敓璋冪敤鎺ュ彛
+ * */
+ @Override
+ public DigitalTwin inventoryQuantity() {
+ DigitalTwin digitalTwin = new DigitalTwin();
+ LocChartPie locUseRate = reportQueryMapper.getLocUseRate();
+ LocChartPie locUseRateL = reportQueryMapper.getLocUseRateL();
+ LocChartPie locUseRateP = reportQueryMapper.getLocUseRateP();
+ if (locUseRate != null) {
+ digitalTwin.setCount(locUseRate.getOqty() + locUseRate.getFqty() + locUseRate.getUqty() + locUseRate.getXqty());
+ digitalTwin.setOqty(locUseRate.getOqty());
+ digitalTwin.setFqty(locUseRate.getFqty());
+ digitalTwin.setUqty(locUseRate.getUqty());
+ digitalTwin.setXqty(locUseRate.getXqty());
+ }
+ if (locUseRateL != null) {
+ digitalTwin.setCountL(locUseRateL.getOqty() + locUseRateL.getFqty() + locUseRateL.getUqty() + locUseRateL.getXqty());
+ digitalTwin.setOqtyL(locUseRateL.getOqty());
+ digitalTwin.setFqtyL(locUseRateL.getFqty());
+ digitalTwin.setUqtyL(locUseRateL.getUqty());
+ digitalTwin.setXqtyL(locUseRateL.getXqty());
+ }
+ if (locUseRateP != null) {
+ digitalTwin.setCountP(locUseRateP.getOqty() + locUseRateP.getFqty() + locUseRateP.getUqty() + locUseRateP.getXqty());
+ digitalTwin.setOqtyP(locUseRateP.getOqty());
+ digitalTwin.setFqtyP(locUseRateP.getFqty());
+ digitalTwin.setUqtyP(locUseRateP.getUqty());
+ digitalTwin.setXqtyP(locUseRateP.getXqty());
+ }
+ return digitalTwin;
+ }
+
+ @Override
+ public int pakinReportErp(JSONObject json) throws ParseException {
+ JSONArray jsonArray = JSONArray.parseArray(json.getJSONArray("pla").toJSONString());
+
+ List<OpenOrderPakoutParam> list = new ArrayList<>();
+
+ for (Object o : jsonArray) {
+ JSONObject jsonObject = (JSONObject) o;
+ String brand = jsonObject.get("brand").toString();
+ String batch = jsonObject.get("batch").toString();
+ Integer packageNo = Integer.parseInt(jsonObject.get("packageNo").toString());
+
+ Pla pla = plaService.selectByBatchAndPackageNo(batch, packageNo, brand);
+ Mat mat = matService.selectByMaktx(pla.getBrand());
+ //褰撶敓浜у崟鍙蜂笉涓�鑷存椂锛岄渶瑕佹柊寤轰竴涓猵aram
+ if (list.isEmpty() || (!Cools.isEmpty(pla.getProOrderNo()) && checkOrder(list, pla.getProOrderNo()) == null)) {
+ OpenOrderPakoutParam param = new OpenOrderPakoutParam();
+ param.setcMaker(json.get("user").toString());
+ String type = Cools.isEmpty(pla.getProOrderNo()) ? "璋冩嫧鍏ュ簱鍗�" : "浜ф垚鍝佸叆搴�";
+ param.setcCode(Cools.isEmpty(pla.getProOrderNo()) ? (new Date().getTime()) + "" : pla.getProOrderNo());
+ param.setcAccount(pla.getWorkshop());
+ param.setdDate(Utils.getDateStr(new Date()));
+ param.setType(type);
+
+ List<OpenOrderPakoutParam.Body> bodyList = new ArrayList<>();
+ OpenOrderPakoutParam.Body body = new OpenOrderPakoutParam.Body();
+ body.setcInvCode(mat.getMatnr());
+ body.setiQuantity(pla.getWeightAnfme());
+ body.setcBatch(pla.getBatch());
+ body.setCPackage(pla.getPackageNo()+"");
+ body.setCbMemo(pla.getMemo());
+ bodyList.add(body);
+
+ param.setaDDBody(bodyList);
+
+ list.add(param);
+ } else {
+ OpenOrderPakoutParam param = checkOrder(list, pla.getProOrderNo());
+ List<OpenOrderPakoutParam.Body> bodyList = param.getADDBody();
+ OpenOrderPakoutParam.Body body = checkOrderDetl(bodyList, mat.getMatnr());
+ //鏈夋柊鐨勭墝鍙峰垯娣诲姞鏂扮殑orderDetl锛屽惁鍒欑疮鍔�
+ if (body == null) {
+ body = new OpenOrderPakoutParam.Body();
+ body.setcInvCode(mat.getMatnr());
+ body.setiQuantity(pla.getWeightAnfme());
+ body.setcBatch(pla.getBatch());
+ body.setCPackage(pla.getPackageNo()+"");
+ body.setCbMemo(pla.getMemo());
+ bodyList.add(body);
+ } else {
+ body.setiQuantity(body.getIQuantity() + pla.getWeightAnfme());
+ body.setcBatch(pla.getBatch());
+ body.setCPackage(pla.getPackageNo()+"");
+ }
+ }
+ }
+
+ for (OpenOrderPakoutParam param : list) {
+ doHttpRequest(param, "鍏ュ簱鍗曚笂鎶�", url, orderReportPath, null, "127.0.0.1");
+
+ }
+ return 200;
+ //return doHttpRequest(list, "鍏ュ簱鍗曚笂鎶�", url, orderReportPath, null, "127.0.0.1");
+ }
+
+
+
+ @Override
+ public List<Order> selectOrderInformation(Map<String, String> param) {
+ List<Order> list = new ArrayList<>();
+ String name = param.get("name");
+ User user = userService.selectOne(new EntityWrapper<User>().eq("username", name));
+ if (Cools.isEmpty(user)) {
+ return list;
+ }
+ List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("create_by", user.getId()));
+ if (Cools.isEmpty(orderList)) {
+ return list;
+ }
+ for (Order order : orderList) {
+ if (order.getSettle() == 1 || order.getSettle() == 2) {
+ List<OrderDetl> detlList = orderDetlService.selectByOrderId(order.getId());
+ order.setOrderDetls(detlList);
+ list.add(order);
+ }
+ }
+
+ return list;
+ }
+
+ private OpenOrderPakoutParam checkOrder(List<OpenOrderPakoutParam> list, String orderNo) {
+
+ for (OpenOrderPakoutParam param : list) {
+
+ if (Cools.eq("璋冩嫧鍏ュ簱鍗�", param.getType()) && Cools.isEmpty(orderNo)) {
+ return param;
+ }
+
+ //鍒ゆ柇鏄惁鍖呭惈閲嶅鐨勮鍗曞彿
+ if (Cools.eq(param.getCCode(), orderNo)) {
+ return param;
+ }
+ }
+
+ return null;
+
+ }
+
+ private OpenOrderPakoutParam.Body checkOrderDetl(List<OpenOrderPakoutParam.Body> bodyList, String matnr) {
+
+ for (OpenOrderPakoutParam.Body param : bodyList) {
+ //鍒ゆ柇鏄惁鍖呭惈閲嶅鐨勮鍗曞彿
+ if (Cools.eq(param.getCInvCode(), matnr)) {
+ return param;
+ }
+ }
+
+ return null;
+
+ }
+
+ private int doHttpRequest(Object requestParam, String namespace, String url, String path, String appkey, String ip) {
+ String response = "";
+ boolean success = false;
+
+ try {
+ log.info("璇锋眰鍙傛暟锛歿}", requestParam);
+ response = new HttpHandler.Builder()
+ .setUri(url)
+ .setTimeout(30, TimeUnit.SECONDS)
+ .setPath(path)
+ .setJson(JSONObject.toJSONString(requestParam))
+ .build()
+ .doPost();
+ log.info("鍏ュ簱鍗曚笂鎶ヨ姹傝繑鍥炴姤鏂囷細{}", response);
+
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (Cools.isEmpty(jsonObject.get("ErrorCode"))) {
+ throw new CoolException(jsonObject.get("ErrorMsg").toString());
+ }
+
+ int code = Integer.parseInt(jsonObject.get("ErrorCode").toString());
+ if (code == 0) {
+ throw new CoolException(jsonObject.get("ErrorMsg").toString());
+ }
+ success = true;
+ return code;
+ } catch (Exception e) {
+ log.error(e.getMessage());
+ throw new CoolException(e.getMessage());
+ } finally {
+ apiLogService.save(
+ namespace,
+ url + path,
+ appkey,
+ ip,
+ JSON.toJSONString(JSONObject.toJSONString(requestParam)),
+ response,
+ success
+ );
+ }
+
+ }
+
+
}
--
Gitblit v1.9.1