rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: rakor:78ed6670e2b8e44b4ab5eed4631277605227004d
Branches Tags
rakor:develop
rakor:qms/develop
rakor:qms/yf
rakor:qms/zhangke
rakor:dev_zhangke
rakor:demo
rakor:feature/rustfs
rakor:sit
rakor:feature/bug-884
rakor:feature/bug-883
rakor:feature/bug-890
rakor:feature/bug-776
rakor:feature/bug-784
rakor:feature/bug-788
rakor:feature/bug-787
rakor:rakor
rakor:template
..
compare: rakor:6da7af6218ce2828c0b72f21f034b8a58a716ffd
Branches Tags
rakor:qms/develop
rakor:qms/yf
rakor:develop
rakor:qms/zhangke
rakor:dev_zhangke
rakor:demo
rakor:feature/rustfs
rakor:sit
rakor:feature/bug-884
rakor:feature/bug-883
rakor:feature/bug-890
rakor:feature/bug-776
rakor:feature/bug-784
rakor:feature/bug-788
rakor:feature/bug-787
rakor:rakor
rakor:template

No commits in common. "78ed6670e2b8e44b4ab5eed4631277605227004d" and "6da7af6218ce2828c0b72f21f034b8a58a716ffd" have entirely different histories.
78ed6670e2 ... 6da7af6218

10 changed files with 18 additions and 65 deletions
Show Stats Expand all files Collapse all files

7
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutAssistanceController.java
View File

@ -16,7 +16,6 @@ import com.nflg.wms.admin.util.QRCodeUtil;
import com.nflg.wms.admin.util.ThymeleafUtil; import com.nflg.wms.admin.util.ThymeleafUtil;
import com.nflg.wms.common.constant.BarCodeProcessStage; import com.nflg.wms.common.constant.BarCodeProcessStage;
import com.nflg.wms.common.constant.STATE; import com.nflg.wms.common.constant.STATE;
import com.nflg.wms.common.exception.DataAlertException;
import com.nflg.wms.common.exception.NflgException; import com.nflg.wms.common.exception.NflgException;
import com.nflg.wms.common.pojo.ApiResult; import com.nflg.wms.common.pojo.ApiResult;
import com.nflg.wms.common.pojo.PageData; import com.nflg.wms.common.pojo.PageData;
@ -345,9 +344,7 @@ public class OutAssistanceController extends BaseController {
// 等待5秒获取锁，10秒后自动释放 // 等待5秒获取锁，10秒后自动释放
if (lock.tryLock(5, 10, TimeUnit.SECONDS)) { if (lock.tryLock(5, 10, TimeUnit.SECONDS)) {
if (inventoryService.getNumOne(info.getFactoryNo(), info.getWarehouseNo(), info.getMaterialNo()).compareTo(lockNum) < 0) { if (inventoryService.getNumOne(info.getFactoryNo(), info.getWarehouseNo(), info.getMaterialNo()).compareTo(lockNum) < 0) {
List<InventoryLockVO> itemLocks = inventoryService.getLockList(info.getFactoryNo(), info.getWarehouseNo(), info.getMaterialNo()); lockVOS.addAll(inventoryService.getLockList(info.getFactoryNo(), info.getWarehouseNo(), info.getMaterialNo()));
VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(itemLocks)).throwMessage("库存不足:" + info.getMaterialNo());
lockVOS.addAll(itemLocks);
} }
} else { } else {
throw new NflgException(STATE.BusinessError, "获取锁失败"); throw new NflgException(STATE.BusinessError, "获取锁失败");
@ -362,7 +359,7 @@ public class OutAssistanceController extends BaseController {
} }
}); });
if (CollectionUtil.isNotEmpty(lockVOS)) { if (CollectionUtil.isNotEmpty(lockVOS)) {
throw new DataAlertException(STATE.OutOfStock, lockVOS); return ApiResult.errorWithExtras(STATE.OutOfStock, lockVOS);
} }
outAssistanceItemService.updateBatchById(datas); outAssistanceItemService.updateBatchById(datas);
outAssistanceTicketItemService.saveBatch(ticketItems); outAssistanceTicketItemService.saveBatch(ticketItems);

7
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java
View File

@ -16,7 +16,6 @@ import com.nflg.wms.admin.util.QRCodeUtil;
import com.nflg.wms.admin.util.ThymeleafUtil; import com.nflg.wms.admin.util.ThymeleafUtil;
import com.nflg.wms.common.constant.BarCodeProcessStage; import com.nflg.wms.common.constant.BarCodeProcessStage;
import com.nflg.wms.common.constant.STATE; import com.nflg.wms.common.constant.STATE;
import com.nflg.wms.common.exception.DataAlertException;
import com.nflg.wms.common.exception.NflgException; import com.nflg.wms.common.exception.NflgException;
import com.nflg.wms.common.pojo.ApiResult; import com.nflg.wms.common.pojo.ApiResult;
import com.nflg.wms.common.pojo.PageData; import com.nflg.wms.common.pojo.PageData;
@ -339,9 +338,7 @@ public class OutCostCenterController extends BaseController {
// 等待5秒获取锁，10秒后自动释放 // 等待5秒获取锁，10秒后自动释放
if (lock.tryLock(5, 10, TimeUnit.SECONDS)) { if (lock.tryLock(5, 10, TimeUnit.SECONDS)) {
if (inventoryService.getNumOne(info.getFactoryNo(), info.getWarehouseNo(), info.getMaterialNo()).compareTo(lockNum) < 0) { if (inventoryService.getNumOne(info.getFactoryNo(), info.getWarehouseNo(), info.getMaterialNo()).compareTo(lockNum) < 0) {
List<InventoryLockVO> itemLocks = inventoryService.getLockList(info.getFactoryNo(), info.getWarehouseNo(), info.getMaterialNo()); lockVOS.addAll(inventoryService.getLockList(info.getFactoryNo(), info.getWarehouseNo(), info.getMaterialNo()));
VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(itemLocks)).throwMessage("库存不足:" + info.getMaterialNo());
lockVOS.addAll(itemLocks);
} }
} else { } else {
throw new NflgException(STATE.BusinessError, "获取锁失败"); throw new NflgException(STATE.BusinessError, "获取锁失败");
@ -356,7 +353,7 @@ public class OutCostCenterController extends BaseController {
} }
}); });
if (CollectionUtil.isNotEmpty(lockVOS)) { if (CollectionUtil.isNotEmpty(lockVOS)) {
throw new DataAlertException(STATE.OutOfStock, lockVOS); return ApiResult.errorWithExtras(STATE.OutOfStock, lockVOS);
} }
outCostcenterItemService.updateBatchById(datas); outCostcenterItemService.updateBatchById(datas);
outCostcenterTicketItemService.saveBatch(ticketItems); outCostcenterTicketItemService.saveBatch(ticketItems);

13
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java
View File

@ -15,7 +15,6 @@ import com.nflg.wms.admin.util.QRCodeUtil;
import com.nflg.wms.admin.util.ThymeleafUtil; import com.nflg.wms.admin.util.ThymeleafUtil;
import com.nflg.wms.common.constant.BarCodeProcessStage; import com.nflg.wms.common.constant.BarCodeProcessStage;
import com.nflg.wms.common.constant.STATE; import com.nflg.wms.common.constant.STATE;
import com.nflg.wms.common.exception.DataAlertException;
import com.nflg.wms.common.exception.NflgException; import com.nflg.wms.common.exception.NflgException;
import com.nflg.wms.common.pojo.ApiResult; import com.nflg.wms.common.pojo.ApiResult;
import com.nflg.wms.common.pojo.PageData; import com.nflg.wms.common.pojo.PageData;
@ -168,9 +167,7 @@ public class OutProduceController extends BaseController {
if (inventoryService.getNumOne(item.getDwerk(), item.getLgort2(), item.getMatnr()) if (inventoryService.getNumOne(item.getDwerk(), item.getLgort2(), item.getMatnr())
.compareTo(item.getSqsl()) < 0 .compareTo(item.getSqsl()) < 0
) { ) {
List<InventoryLockVO> itemLocks = inventoryService.getLockList(item.getDwerk(), item.getLgort2(), item.getMatnr()); lockVOS.addAll(inventoryService.getLockList(item.getDwerk(), item.getLgort2(), item.getMatnr()));
VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(itemLocks)).throwMessage("库存不足:" + item.getMatnr());
lockVOS.addAll(itemLocks);
} else { } else {
WmsOutProduceItem data = Convert.convert(WmsOutProduceItem.class, item); WmsOutProduceItem data = Convert.convert(WmsOutProduceItem.class, item);
data.setLockNum(item.getSqsl()); data.setLockNum(item.getSqsl());
@ -193,7 +190,7 @@ public class OutProduceController extends BaseController {
if (CollectionUtil.isEmpty(lockVOS)) { if (CollectionUtil.isEmpty(lockVOS)) {
return ApiResult.success(); return ApiResult.success();
} else { } else {
throw new DataAlertException(STATE.OutOfStock, lockVOS); return ApiResult.errorWithExtras(STATE.OutOfStock, lockVOS);
} }
} }
@ -229,9 +226,7 @@ public class OutProduceController extends BaseController {
if (inventoryService.getNumOne(item.getDwerk(), item.getLgort2(), item.getMatnr()) if (inventoryService.getNumOne(item.getDwerk(), item.getLgort2(), item.getMatnr())
.compareTo(item.getSqsl()) < 0 .compareTo(item.getSqsl()) < 0
) { ) {
List<InventoryLockVO> itemLocks = inventoryService.getLockList(item.getDwerk(), item.getLgort2(), item.getMatnr()); lockVOS.addAll(inventoryService.getLockList(item.getDwerk(), item.getLgort2(), item.getMatnr()));
VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(itemLocks)).throwMessage("库存不足:" + item.getMatnr());
lockVOS.addAll(itemLocks);
} else { } else {
WmsOutProduceItem data = Convert.convert(WmsOutProduceItem.class, item); WmsOutProduceItem data = Convert.convert(WmsOutProduceItem.class, item);
data.setLockNum(data.getSqsl()); data.setLockNum(data.getSqsl());
@ -255,7 +250,7 @@ public class OutProduceController extends BaseController {
if (CollectionUtil.isEmpty(lockVOS)) { if (CollectionUtil.isEmpty(lockVOS)) {
return ApiResult.success(); return ApiResult.success();
} else { } else {
throw new DataAlertException(STATE.OutOfStock, lockVOS); return ApiResult.errorWithExtras(STATE.OutOfStock, lockVOS);
} }
} }

5
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/PurchaseReturnController.java
View File

@ -16,7 +16,6 @@ import com.nflg.wms.admin.util.ThymeleafUtil;
import com.nflg.wms.common.constant.BarCodeProcessStage; import com.nflg.wms.common.constant.BarCodeProcessStage;
import com.nflg.wms.common.constant.STATE; import com.nflg.wms.common.constant.STATE;
import com.nflg.wms.common.constant.UserType; import com.nflg.wms.common.constant.UserType;
import com.nflg.wms.common.exception.DataAlertException;
import com.nflg.wms.common.pojo.ApiResult; import com.nflg.wms.common.pojo.ApiResult;
import com.nflg.wms.common.pojo.PageData; import com.nflg.wms.common.pojo.PageData;
import com.nflg.wms.common.pojo.dto.*; import com.nflg.wms.common.pojo.dto.*;
@ -133,7 +132,7 @@ public class PurchaseReturnController extends BaseController {
if (CollectionUtil.isEmpty(inventoryLockVOS)) { if (CollectionUtil.isEmpty(inventoryLockVOS)) {
return ApiResult.success(); return ApiResult.success();
} else { } else {
throw new DataAlertException(STATE.OutOfStock, inventoryLockVOS); return ApiResult.errorWithExtras(STATE.OutOfStock, inventoryLockVOS);
} }
} }
@ -443,7 +442,7 @@ public class PurchaseReturnController extends BaseController {
if (CollectionUtil.isEmpty(inventoryLockVOS)) { if (CollectionUtil.isEmpty(inventoryLockVOS)) {
return ApiResult.success(); return ApiResult.success();
} else { } else {
throw new DataAlertException(STATE.OutOfStock, inventoryLockVOS); return ApiResult.errorWithExtras(STATE.OutOfStock, inventoryLockVOS);
} }
} }

7
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java
View File

@ -18,7 +18,6 @@ import com.nflg.wms.admin.service.SapService;
import com.nflg.wms.admin.util.*; import com.nflg.wms.admin.util.*;
import com.nflg.wms.common.constant.BarCodeProcessStage; import com.nflg.wms.common.constant.BarCodeProcessStage;
import com.nflg.wms.common.constant.STATE; import com.nflg.wms.common.constant.STATE;
import com.nflg.wms.common.exception.DataAlertException;
import com.nflg.wms.common.exception.NflgException; import com.nflg.wms.common.exception.NflgException;
import com.nflg.wms.common.pojo.ApiResult; import com.nflg.wms.common.pojo.ApiResult;
import com.nflg.wms.common.pojo.PageData; import com.nflg.wms.common.pojo.PageData;
@ -145,9 +144,7 @@ public class TransferCompanyController extends BaseController {
if (inventoryService.getNumOne(item.getReswk(), item.getLgfsb1(), item.getMatnr()) if (inventoryService.getNumOne(item.getReswk(), item.getLgfsb1(), item.getMatnr())
.compareTo(item.getNum()) < 0 .compareTo(item.getNum()) < 0
) { ) {
List<InventoryLockVO> itemLocks = inventoryService.getLockList(item.getReswk(), item.getLgfsb1(), item.getMatnr()); lockVOS.addAll(inventoryService.getLockList(item.getReswk(), item.getLgfsb1(), item.getMatnr()));
VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(itemLocks)).throwMessage("库存不足:" + item.getMatnr());
lockVOS.addAll(itemLocks);
} else { } else {
WmsTransferCompanyItem data = Convert.convert(WmsTransferCompanyItem.class, item); WmsTransferCompanyItem data = Convert.convert(WmsTransferCompanyItem.class, item);
data.setOrderId(order.getId()); data.setOrderId(order.getId());
@ -170,7 +167,7 @@ public class TransferCompanyController extends BaseController {
if (CollectionUtil.isEmpty(lockVOS)) { if (CollectionUtil.isEmpty(lockVOS)) {
return ApiResult.success(); return ApiResult.success();
} else { } else {
throw new DataAlertException(STATE.OutOfStock, lockVOS); return ApiResult.errorWithExtras(STATE.OutOfStock, lockVOS);
} }
} }

7
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferFactoryController.java
View File

@ -16,7 +16,6 @@ import com.nflg.wms.admin.util.QRCodeUtil;
import com.nflg.wms.admin.util.ThymeleafUtil; import com.nflg.wms.admin.util.ThymeleafUtil;
import com.nflg.wms.common.constant.BarCodeProcessStage; import com.nflg.wms.common.constant.BarCodeProcessStage;
import com.nflg.wms.common.constant.STATE; import com.nflg.wms.common.constant.STATE;
import com.nflg.wms.common.exception.DataAlertException;
import com.nflg.wms.common.exception.NflgException; import com.nflg.wms.common.exception.NflgException;
import com.nflg.wms.common.pojo.ApiResult; import com.nflg.wms.common.pojo.ApiResult;
import com.nflg.wms.common.pojo.PageData; import com.nflg.wms.common.pojo.PageData;
@ -143,9 +142,7 @@ public class TransferFactoryController extends BaseController {
if (inventoryService.getNumOne(item.getWerks(), item.getLgort(), item.getMatnr()) if (inventoryService.getNumOne(item.getWerks(), item.getLgort(), item.getMatnr())
.compareTo(item.getNum()) < 0 .compareTo(item.getNum()) < 0
) { ) {
List<InventoryLockVO> itemLocks = inventoryService.getLockList(item.getWerks(), item.getLgort(), item.getMatnr()); lockVOS.addAll(inventoryService.getLockList(item.getWerks(), item.getLgort(), item.getMatnr()));
VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(itemLocks)).throwMessage("库存不足:" + item.getMatnr());
lockVOS.addAll(itemLocks);
} else { } else {
WmsTransferFactoryItem data = Convert.convert(WmsTransferFactoryItem.class, item); WmsTransferFactoryItem data = Convert.convert(WmsTransferFactoryItem.class, item);
data.setOrderId(order.getId()); data.setOrderId(order.getId());
@ -168,7 +165,7 @@ public class TransferFactoryController extends BaseController {
if (CollectionUtil.isEmpty(lockVOS)) { if (CollectionUtil.isEmpty(lockVOS)) {
return ApiResult.success(); return ApiResult.success();
} else { } else {
throw new DataAlertException(STATE.OutOfStock, lockVOS); return ApiResult.errorWithExtras(STATE.OutOfStock, lockVOS);
} }
} }

18
nflg-wms-common/src/main/java/com/nflg/wms/common/exception/DataAlertException.java
View File

@ -1,18 +0,0 @@
package com.nflg.wms.common.exception;
import com.nflg.wms.common.constant.STATE;
import lombok.Data;
@Data
public class DataAlertException extends RuntimeException {
private final STATE state;
private final Object obj;
public DataAlertException(STATE state, Object obj) {
super(state.getType());
this.state = state;
this.obj = obj;
}
}

5
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsReturnRequestServiceImpl.java
View File

@ -17,7 +17,6 @@ import com.nflg.wms.common.pojo.qo.GoodsReceiptSearchQO;
import com.nflg.wms.common.pojo.vo.ApplyReturnRequestVO; import com.nflg.wms.common.pojo.vo.ApplyReturnRequestVO;
import com.nflg.wms.common.pojo.vo.GoodsReceiptVO; import com.nflg.wms.common.pojo.vo.GoodsReceiptVO;
import com.nflg.wms.common.pojo.vo.InventoryLockVO; import com.nflg.wms.common.pojo.vo.InventoryLockVO;
import com.nflg.wms.common.util.VUtil;
import com.nflg.wms.repository.entity.WmsOutProduceItem; import com.nflg.wms.repository.entity.WmsOutProduceItem;
import com.nflg.wms.repository.entity.WmsReturnRequest; import com.nflg.wms.repository.entity.WmsReturnRequest;
import com.nflg.wms.repository.entity.WmsReturnRequestItem; import com.nflg.wms.repository.entity.WmsReturnRequestItem;
@ -72,9 +71,7 @@ public class WmsReturnRequestServiceImpl extends ServiceImpl<WmsReturnRequestMap
if (inventoryService.getNumOne(item.getFactoryCode(), item.getStorageLocation(), item.getMaterialCode()) if (inventoryService.getNumOne(item.getFactoryCode(), item.getStorageLocation(), item.getMaterialCode())
.compareTo(item.getLeft()) < 0 .compareTo(item.getLeft()) < 0
) { ) {
List<InventoryLockVO> itemLocks = inventoryService.getLockList(item.getFactoryCode(), item.getStorageLocation(), item.getMaterialCode()); lockVOS.addAll(inventoryService.getLockList(item.getFactoryCode(), item.getStorageLocation(), item.getMaterialCode()));
VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(itemLocks)).throwMessage("库存不足:" + item.getMaterialCode());
lockVOS.addAll(itemLocks);
} else { } else {
itemService.save(item); itemService.save(item);
} }

7
nflg-wms-repository/src/main/resources/mapper/WmsWarehouseMapper.xml
View File

@ -86,10 +86,9 @@
</select> </select>
<select id="getWname" resultType="java.lang.String"> <select id="getWname" resultType="java.lang.String">
SELECT wh.name SELECT name
FROM wms_warehouse wh FROM wms_inventory a,dictonary_item b
LEFT JOIN dictionary_item di ON wh.factory_id=di.id WHERE a.factory_no=b.id AND a.warehouse_no=#{warehouseNo} AND a.no=#{factoryNo}
WHERE di.code=#{factoryNo} AND wh.no=#{warehouseNo}
</select> </select>
</mapper> </mapper>

7
nflg-wms-starter/src/main/java/com/nflg/wms/starter/advice/GlobalRestControllerAdvice.java
View File

@ -4,7 +4,6 @@ import cn.dev33.satoken.exception.NotLoginException;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.nflg.wms.common.constant.Constant; import com.nflg.wms.common.constant.Constant;
import com.nflg.wms.common.constant.STATE; import com.nflg.wms.common.constant.STATE;
import com.nflg.wms.common.exception.DataAlertException;
import com.nflg.wms.common.exception.NflgException; import com.nflg.wms.common.exception.NflgException;
import com.nflg.wms.common.exception.SAPException; import com.nflg.wms.common.exception.SAPException;
import com.nflg.wms.common.pojo.ApiResult; import com.nflg.wms.common.pojo.ApiResult;
@ -82,10 +81,4 @@ public class GlobalRestControllerAdvice {
log.error("SAP错误: ", ex); log.error("SAP错误: ", ex);
return ApiResult.error(ex.getState(), "SAP错误:" + ex.getMessage()); return ApiResult.error(ex.getState(), "SAP错误:" + ex.getMessage());
} }
@ExceptionHandler(DataAlertException.class)
public ApiResult<Void> handleDataAlertException(DataAlertException ex) {
log.error("返回数据的错误: ", ex);
return ApiResult.errorWithExtras(ex.getState(), ex.getObj());
}
} }