From ebdfa825c07189b5f8e89f147d96d1bc612589db Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 15 七月 2025 08:32:17 +0800
Subject: [PATCH] 代码优化
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java | 170 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 112 insertions(+), 58 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
index d97176c..3a06b70 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java
@@ -2,7 +2,6 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
@@ -22,12 +21,14 @@
import com.vincent.rsf.server.manager.mapper.*;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.system.constant.CodeRes;
+import com.vincent.rsf.server.system.constant.GlobalConfigCode;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.controller.param.LoginParam;
import com.vincent.rsf.server.system.controller.result.LoginResult;
import com.vincent.rsf.server.system.entity.*;
import com.vincent.rsf.server.system.mapper.FieldsMapper;
import com.vincent.rsf.server.system.mapper.TenantMapper;
+import com.vincent.rsf.server.system.service.ConfigService;
import com.vincent.rsf.server.system.service.FieldsItemService;
import com.vincent.rsf.server.system.service.UserLoginService;
import com.vincent.rsf.server.system.service.UserService;
@@ -41,6 +42,8 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -121,6 +124,10 @@
private LocAreaMapper locAreaMapper;
@Autowired
private DeviceSiteMapper deviceSiteMapper;
+ @Autowired
+ private ConfigService configService;
+ @Autowired
+ private CompanysService companysService;
/**
* @return
@@ -169,14 +176,14 @@
if (StringUtils.isBlank(barcode)) {
return R.error("鏍囩鐮佷笉鑳戒负绌猴紒锛�");
}
- List<AsnOrderItem> asnOrderItem = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>()
- .eq(AsnOrderItem::getTrackCode, barcode));
+ List<WkOrderItem> wkOrderItem = asnOrderItemMapper.selectList(new LambdaQueryWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getTrackCode, barcode));
- if (Objects.isNull(asnOrderItem)) {
+ if (Objects.isNull(wkOrderItem)) {
throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
}
- List<AsnOrderItem> items = new ArrayList<>();
- for (AsnOrderItem record : asnOrderItem) {
+ List<WkOrderItem> items = new ArrayList<>();
+ for (WkOrderItem record : wkOrderItem) {
if (!Objects.isNull(record.getFieldsIndex())) {
Map<String, String> fields = FieldsUtils.getFields(record.getFieldsIndex());
record.setExtendFields(fields);
@@ -224,18 +231,22 @@
String asnCode = receipts.stream().findFirst().get().getAsnCode();
- AsnOrder asnOrder = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>()
- .eq(AsnOrder::getCode, asnCode));
- if (Objects.isNull(asnOrder)) {
+ WkOrder wkOrder = asnOrderMapper.getOne(new LambdaQueryWrapper<WkOrder>()
+ .eq(WkOrder::getCode, asnCode));
+ if (Objects.isNull(wkOrder)) {
throw new CoolException("鏁版嵁閿欒锛氫富鍗曚笉瀛樺湪锛侊紒");
}
//TODO /**鏀惰揣鏁伴噺绱姞锛�1. 浼氬嚭瓒呮敹鎯呭喌 2. 浼氭湁鏀惰揣涓嶈冻鎯呭喌*/
- Double rcptedQty = asnOrder.getQty() + receiptQty;
- asnOrder.setQty(rcptedQty).setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_EXCE_ING.val);
+ Double rcptedQty = Math.round((wkOrder.getQty() + receiptQty) * 10000) / 10000.0;
- if (!asnOrderMapper.updateById(asnOrder)) {
+ wkOrder.setQty(rcptedQty).setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_EXCE_ING.val);
+ if (!asnOrderMapper.updateById(wkOrder)) {
throw new CoolException("宸叉敹璐ф暟閲忎慨鏀瑰け璐ワ紒锛�");
}
+
+ Config config = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.ALLOW_OVER_CHANGE));
+
+
List<Map<String, Object>> receipts1 = (List<Map<String, Object>>) params.get("receipts");
for (Map<String, Object> rcpt : receipts1) {
if (null == rcpt || Objects.isNull(rcpt)) {
@@ -258,7 +269,7 @@
// .eq(AsnOrderItem::getTrackCode, dto.getBarcode())
// .eq(AsnOrderItem::getSplrBatch, dto.getSplrBatch()));
- AsnOrderItem orderItem = asnOrderItemMapper.selectOne(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getId, dto.getId()));
+ WkOrderItem orderItem = asnOrderItemMapper.selectOne(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getId, dto.getId()));
//asnOrderItemMapper.resultById(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getId, dto.getId()));
if (Objects.isNull(orderItem)) {
@@ -267,7 +278,27 @@
if (Objects.isNull(dto.getReceiptQty()) || Double.compare(dto.getReceiptQty(), 0.0) == 0) {
throw new CoolException("鐗╂枡:" + dto.getMaktx() + "鏀惰揣鏁伴噺涓嶈兘涓洪浂锛侊紒");
}
- Double itemRcptQty = dto.getReceiptQty() + orderItem.getQty();
+
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ try {
+ if (!Objects.isNull(dto.getProdTime())) {
+ sdf.parse(dto.getProdTime());
+ }
+ } catch (ParseException e) {
+ throw new CoolException("璇疯緭鍏ユ纭殑鏃堕棿鏍煎紡锛侊紒");
+ }
+
+ Double itemRcptQty = Math.round((dto.getReceiptQty() + orderItem.getQty()) * 10000) / 10000.0;
+ Boolean allowOver = false;
+ if (!Objects.isNull(config)) {
+ if (Boolean.parseBoolean(config.getVal())) {
+ allowOver = true;
+ }
+ }
+ if (itemRcptQty.compareTo(orderItem.getAnfme()) > 0 && !allowOver) {
+ throw new CoolException("鏀惰揣鏁伴噺涓嶈兘澶т簬璁″垝鏁伴噺锛侊紒");
+ }
+
orderItem.setQty(itemRcptQty)
// .setSplrBatch(dto.getSplrBatch())
.setUpdateBy(loginUserId)
@@ -302,11 +333,11 @@
throw new CoolException("閫氱煡鍗曟槑缁嗘暟閲忎慨鏀瑰け璐ワ紒锛�");
}
/**淇濆瓨鏄庣粏鑷虫敹璐у尯**/
- extracted(loginUserId, dto, areasItem, orderItem, asnOrder, matnr);
+ extracted(loginUserId, dto, areasItem, orderItem, wkOrder, matnr);
}
- AsnOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, asnCode));
+ WkOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, asnCode));
if (order.getQty().compareTo(order.getAnfme()) >= 0.00) {
order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_RECEIPT_DONE.val).setRleStatus(Short.valueOf("1"));
if (!asnOrderMapper.updateById(order)) {
@@ -317,16 +348,26 @@
return R.ok("鏀惰揣鎴愬姛锛侊紒");
}
- private void extracted(Long loginUserId, ReceiptDetlsDto dto, WarehouseAreas areasItem, AsnOrderItem orderItem, AsnOrder asnOrder, Matnr matnr) {
+ private void extracted(Long loginUserId, ReceiptDetlsDto dto, WarehouseAreas areasItem, WkOrderItem orderItem, WkOrder wkOrder, Matnr matnr) {
+
+ Companys companys = new Companys();
+ if (StringUtils.isNoneBlank(orderItem.getSplrCode())) {
+ companys = companysService.getOne(new LambdaQueryWrapper<Companys>().eq(Companys::getCode, orderItem.getSplrCode()));
+ }
+
WarehouseAreasItem item = new WarehouseAreasItem();
item.setTrackCode(dto.getBarcode())
.setAreaName(areasItem.getName())
.setAreaId(areasItem.getId())
.setAsnItemId(orderItem.getId())
- .setAsnCode(asnOrder.getCode())
- .setAsnId(asnOrder.getId())
+ .setAsnCode(wkOrder.getCode())
+ .setAsnId(wkOrder.getId())
.setProdTime(dto.getProdTime())
+ .setSplrId(companys.getId())
.setWeight(dto.getWeigth())
+ .setPlatOrderCode(orderItem.getPlatOrderCode())
+ .setPlatWorkCode(orderItem.getPlatWorkCode())
+ .setProjectCode(orderItem.getProjectCode())
//搴撳瓨鍗曚綅涓烘渶灏忓崟浣�
.setUnit(orderItem.getStockUnit())
.setStockUnit(orderItem.getStockUnit())
@@ -343,16 +384,25 @@
.setFieldsIndex(orderItem.getFieldsIndex())
.setShipperId(matnr.getShipperId());
//TODO 渚涘簲鍟嗘爣璇嗘湭璁剧疆锛屾爣璇嗙敱PO鍗曚緵搴斿晢缂栫爜杞崲
- WarehouseAreasItem serviceOne = warehouseAreasItemService.getOne(new LambdaQueryWrapper<WarehouseAreasItem>()
+
+ LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new LambdaQueryWrapper<WarehouseAreasItem>()
// .eq(WarehouseAreasItem::getAsnItemId, item.getAsnItemId())
.eq(WarehouseAreasItem::getMatnrCode, item.getMatnrCode())
.eq(!Cools.isEmpty(item.getFieldsIndex()), WarehouseAreasItem::getFieldsIndex, item.getFieldsIndex())
.eq(WarehouseAreasItem::getAsnCode, item.getAsnCode())
- .eq(!Cools.isEmpty(item.getIsptResult()), WarehouseAreasItem::getIsptResult, item.getIsptResult())
- .eq(StringUtils.isNotBlank(item.getSplrBatch()), WarehouseAreasItem::getSplrBatch, item.getSplrBatch()));
+ .eq(StringUtils.isNotBlank(item.getSplrBatch()), WarehouseAreasItem::getSplrBatch, item.getSplrBatch());
+ if (Objects.isNull(orderItem.getIsptResult())) {
+ queryWrapper.isNull(WarehouseAreasItem::getIsptResult);
+ } else {
+ queryWrapper.eq(WarehouseAreasItem::getIsptResult, orderItem.getIsptResult());
+ }
+
+ WarehouseAreasItem serviceOne = warehouseAreasItemService.getOne(queryWrapper);
+
if (!Objects.isNull(serviceOne)) {
item.setId(serviceOne.getId());
- item.setAnfme(item.getAnfme() + serviceOne.getAnfme());
+ Double anfme = Math.round((item.getAnfme() + serviceOne.getAnfme()) * 10000) / 10000.0;
+ item.setAnfme(anfme);
}
//鏈川妫�
@@ -395,25 +445,25 @@
List<Short> shorts = Arrays.asList(AsnExceStatus.ASN_EXCE_STATUS_TASK_CANCEL.val, AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE
.val, AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val);
- AsnOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>()
- .notIn(AsnOrder::getExceStatus, shorts)
- .eq(AsnOrder::getCode, params.getAsnCode()));
+ WkOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<WkOrder>()
+ .notIn(WkOrder::getExceStatus, shorts)
+ .eq(WkOrder::getCode, params.getAsnCode()));
if (Objects.isNull(order)) {
throw new CoolException("璇锋鏌ヨ鍗曠姸鎬佹槸鍚﹀凡瀹屾垚鎴栧凡鍙栨秷锛侊紒");
}
- List<AsnOrderItem> asnOrderItem = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>()
- .eq(AsnOrderItem::getAsnCode, params.getAsnCode())
- .eq(!Objects.isNull(params.getTrackCode()), AsnOrderItem::getTrackCode, params.getTrackCode())
- .eq(!Cools.isEmpty(params.getMatnrCode()), AsnOrderItem::getMatnrCode, params.getMatnrCode())
+ List<WkOrderItem> wkOrderItem = asnOrderItemMapper.selectList(new LambdaQueryWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getAsnCode, params.getAsnCode())
+ .eq(!Objects.isNull(params.getTrackCode()), WkOrderItem::getTrackCode, params.getTrackCode())
+ .eq(!Cools.isEmpty(params.getMatnrCode()), WkOrderItem::getMatnrCode, params.getMatnrCode())
);
- if (Objects.isNull(asnOrderItem)) {
+ if (Objects.isNull(wkOrderItem)) {
throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
}
- List<AsnOrderItem> items = new ArrayList<>();
- for (AsnOrderItem record : asnOrderItem) {
+ List<WkOrderItem> items = new ArrayList<>();
+ for (WkOrderItem record : wkOrderItem) {
if (!Objects.isNull(record.getFieldsIndex())) {
Map<String, String> fields = FieldsUtils.getFields(record.getFieldsIndex());
record.setExtendFields(fields);
@@ -431,9 +481,9 @@
* @description 鑾峰彇鎵�鏈夐�氱煡鍗�
*/
@Override
- public List<AsnOrder> getAllAsnOrders() {
- List<AsnOrder> asnOrders = asnOrderMapper.list(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getWkType, OrderWorkType.ORDER_WORK_TYPE_PURCHASE.type));
- return asnOrders;
+ public List<WkOrder> getAllAsnOrders() {
+ List<WkOrder> wkOrders = asnOrderMapper.list(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getWkType, OrderWorkType.ORDER_WORK_TYPE_PURCHASE.type));
+ return wkOrders;
}
/**
@@ -522,13 +572,13 @@
*/
@Override
public R inspect(String code, Long loginUserId) {
- AsnOrder asnOrders = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, code));
- if (Objects.isNull(asnOrders)) {
+ WkOrder wkOrders = asnOrderMapper.getOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, code));
+ if (Objects.isNull(wkOrders)) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
}
InspectDetlDto detlDto = new InspectDetlDto();
- detlDto.setCode(asnOrders.getCode()).setId(asnOrders.getId()).setPoCode(asnOrders.getPoCode());
- List<AsnOrderItem> orderItems = asnOrderItemMapper.selectList(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnCode, code));
+ detlDto.setCode(wkOrders.getCode()).setId(wkOrders.getId()).setPoCode(wkOrders.getPoCode());
+ List<WkOrderItem> orderItems = asnOrderItemMapper.selectList(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getAsnCode, code));
if (orderItems.isEmpty()) {
detlDto.setItems(new ArrayList<>());
} else {
@@ -550,7 +600,7 @@
detlDto.setItems(itemDtos);
}
- List<IsptHistories> histories = isptHistoriesMapper.selectList(new LambdaQueryWrapper<IsptHistories>().eq(IsptHistories::getAsnId, asnOrders.getId()));
+ List<IsptHistories> histories = isptHistoriesMapper.selectList(new LambdaQueryWrapper<IsptHistories>().eq(IsptHistories::getAsnId, wkOrders.getId()));
detlDto.setHistories(histories);
return R.ok(detlDto);
}
@@ -567,12 +617,12 @@
if (org.apache.commons.lang3.StringUtils.isBlank(id)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- AsnOrder asnOrder = asnOrderMapper.getById(id);
- if (Objects.isNull(asnOrder)) {
+ WkOrder wkOrder = asnOrderMapper.getById(id);
+ if (Objects.isNull(wkOrder)) {
throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�");
}
- List<AsnOrder> orders = new ArrayList<>();
- orders.add(asnOrder);
+ List<WkOrder> orders = new ArrayList<>();
+ orders.add(wkOrder);
if (asnOrderMapper.notifyInspect(orders)) {
return R.ok("涓婃姤鎴愬姛锛侊紒");
} else {
@@ -630,16 +680,17 @@
* 蹇�熻川妫�
*
* @param params
+ * @param loginUserId
* @return
*/
@Override
- public R checkUpdate(List<QlyIsptItem> params) {
+ public R checkUpdate(List<QlyIsptItem> params, Long loginUserId) {
if (Objects.isNull(params) || params.isEmpty()) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
IsptItemsParams itemsParams = new IsptItemsParams();
itemsParams.setIsptItem(params).setType("0");
- if (qlyIsptItemService.batchUpdate(itemsParams)) {
+ if (qlyIsptItemService.batchUpdate(itemsParams, loginUserId)) {
return R.ok();
} else {
return R.error("淇濆瓨澶辫触锛侊紒");
@@ -692,9 +743,10 @@
}
Long OrderId = params.getItemList().stream().findFirst().get().getAsnId();
/**鑾峰彇骞冲簱璁㈠崟*/
- AsnOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>()
- .eq(AsnOrder::getId, OrderId)
- .eq(AsnOrder::getType, OrderType.ORDER_PLAT_IN.type));
+ WkOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<WkOrder>()
+ .eq(WkOrder::getId, OrderId)
+ .eq(WkOrder::getWkType, OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.type)
+ .eq(WkOrder::getType, OrderType.ORDER_IN.type));
if (Objects.isNull(order)) {
throw new CoolException("闈炲钩搴撳崟鎹笉鍙墽琛屼汉宸ヤ笂鏋讹紒锛�");
}
@@ -709,8 +761,8 @@
if (StringUtils.isBlank(ruleCode)) {
throw new CoolException("褰撳墠涓氬姟锛�" + SerialRuleCode.SYS_STOCK_CODE + "锛岀紪鐮佽鍒欎笉瀛樺湪锛侊紒");
}
- List<AsnOrderItem> itemList = params.getItemList();
- double sum = itemList.stream().mapToDouble(AsnOrderItem::getAnfme).sum();
+ List<WkOrderItem> itemList = params.getItemList();
+ double sum = itemList.stream().mapToDouble(WkOrderItem::getAnfme).sum();
stock.setAnfme(sum)
.setSourceId(order.getId())
.setType(order.getType())
@@ -885,14 +937,15 @@
*/
@Override
public R getUnItemByContainer(Map<String, Object> params) {
- if (Objects.isNull(params.get("barcode"))) {
- throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ if (Cools.isEmpty(params.get("barcode")) && Cools.isEmpty(params.get("code"))){
+ throw new CoolException("瀹瑰櫒鍙蜂笌缁勬墭妗ｇ紪鐮佷笉鑳藉叏涓虹┖");
}
//鑾峰彇缁勬嫋鏈敓鎴愪换鍔＄殑缁勬嫋妗�
// List<Short> asList = Arrays.asList(Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val), Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val));
WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
- .eq(WaitPakin::getBarcode, params.get("barcode").toString())
+ .eq(!Cools.isEmpty(params.get("barcode")),WaitPakin::getBarcode, params.get("barcode"))
+ .eq(!Cools.isEmpty(params.get("code")),WaitPakin::getCode, params.get("code"))
.eq(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_DONE.val));
if (Objects.isNull(waitPakin)) {
return R.error("鏈壘鍒拌瀹瑰櫒鐮佺殑缁勬墭鏄庣粏锛岃妫�鏌ョ粍鎵樼姸鎬�");
@@ -925,7 +978,7 @@
*/
@Override
public R defectProducts(String trackCode) {
- AsnOrderItem orderItem = asnOrderItemMapper.selectOne(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getTrackCode, trackCode));
+ WkOrderItem orderItem = asnOrderItemMapper.selectOne(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getTrackCode, trackCode));
return R.ok(orderItem);
}
@@ -997,7 +1050,7 @@
/**
* 鑾峰彇ReceiptDetlsDtos
*/
- private R getAsnOrderItem(List<AsnOrderItem> items) {
+ private R getAsnOrderItem(List<WkOrderItem> items) {
List<ReceiptDetlsDto> detlsDtos = new ArrayList<>();
items.forEach(asnOrderItem -> {
ReceiptDetlsDto detlsDto = new ReceiptDetlsDto();
@@ -1042,7 +1095,8 @@
if (Objects.isNull(stockItem)) {
detlsDto.setStockQty(0.0);
} else {
- detlsDto.setStockQty(stockItem.getAnfme() + stockItem.getWorkQty());
+ Double anfme = Math.round((stockItem.getAnfme() + stockItem.getWorkQty()) * 10000) / 10000.0;
+ detlsDto.setStockQty(anfme);
}
if (!Objects.isNull(asnOrderItem.getPoDetlId())) {
--
Gitblit v1.9.1