licq/heli-mes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

补充日志

Browse Source
This commit is contained in:
zxy 2026-01-16 15:16:42 +08:00
parent c6f77f05ce
commit d01d2d0bae
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/storage/StorageController.java
View File

@ -160,10 +160,24 @@ public class StorageController {
storageService.updateStorage(updateReqVO); storageService.updateStorage(updateReqVO);
int status = targetDo.getStatus(); int status = targetDo.getStatus();
StorageSaveReqVO saveReqVO;
saveReqVO = BeanUtils.toBean(targetDo, StorageSaveReqVO.class);
List<StorageMatDO> matList = storageMatMapper.selectMatByStorckID(targetDo.getId()); List<StorageMatDO> matList = storageMatMapper.selectMatByStorckID(targetDo.getId());
if (updateReqVO.getStockType()==1){ if (updateReqVO.getStockType()==1){
if (status==2){ if (status==2){
if (updateReqVO.getInOutFlag()) {
// 入库已经根据原有入库记录生成 此处是出库记录
saveReqVO.setStockType(2);
saveReqVO.setStockInType(5);
saveReqVO.setStatus(4);
saveReqVO.setMaterialReceiver(String.valueOf(updateReqVO.getKeeper()));
saveReqVO.setId(0L);
saveReqVO.setOutbound(updateReqVO.getKeeper());
saveReqVO.setOutboundTime(currTime);
List<StorageMatDO> storageMatDOList = storageMatService.getStorageMatListByStockId(updateReqVO.getId());
Long storageId = storageService.createStorage(saveReqVO);
storageMatService.createStorageMat(storageMatDOList, storageId);
}
for (StorageMatDO storageMatDO : matList) { for (StorageMatDO storageMatDO : matList) {
LambdaQueryWrapper<StorageInventoryDO> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<StorageInventoryDO> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(StorageInventoryDO::getWhId,storageMatDO.getWhId()); wrapper.eq(StorageInventoryDO::getWhId,storageMatDO.getWhId());
@ -201,19 +215,6 @@ public class StorageController {
// 如果不是即入即出，不需要入库，但是需要出库记录，根据入库记录生成出库记录 // 如果不是即入即出，不需要入库，但是需要出库记录，根据入库记录生成出库记录
if (!updateReqVO.getInOutFlag()) { if (!updateReqVO.getInOutFlag()) {
storageInventoryMapper.insertOrUpdate(storageInventoryDO); storageInventoryMapper.insertOrUpdate(storageInventoryDO);
} else {
// 入库已经根据原有入库记录生成 此处是出库记录
StorageSaveReqVO saveReqVO;
saveReqVO = BeanUtils.toBean(targetDo, StorageSaveReqVO.class);
saveReqVO.setStockType(2);
saveReqVO.setStockInType(5);
saveReqVO.setMaterialReceiver(String.valueOf(updateReqVO.getKeeper()));
saveReqVO.setId(0L);
saveReqVO.setOutbound(updateReqVO.getKeeper());
saveReqVO.setOutboundTime(currTime);
List<StorageMatDO> storageMatDOList = storageMatService.getStorageMatListByStockId(updateReqVO.getId());
Long storageId = storageService.createStorage(saveReqVO);
storageMatService.createStorageMat(storageMatDOList, storageId);
} }
PurchaseOrderNoDetailDO purchaseOrderNoDetailDO = purchaseOrderNoDetailMapper.selectById(storageMatDO.getPurchaseOrderNoDetailId()); PurchaseOrderNoDetailDO purchaseOrderNoDetailDO = purchaseOrderNoDetailMapper.selectById(storageMatDO.getPurchaseOrderNoDetailId());
if (ObjectUtil.isNotEmpty(purchaseOrderNoDetailDO)){ if (ObjectUtil.isNotEmpty(purchaseOrderNoDetailDO)){
@ -264,6 +265,10 @@ public class StorageController {
} }
} }
storageService.updateLogList(targetDo.getId(),status,targetDo.getStockType(),targetDo.getStockNo()); storageService.updateLogList(targetDo.getId(),status,targetDo.getStockType(),targetDo.getStockNo());
if (saveReqVO.getInOutFlag()){
//增加出库日志
storageService.updateLogList(targetDo.getId(), saveReqVO.getStatus(), saveReqVO.getStockType(), saveReqVO.getStockNo());
}
return success(true); return success(true);
} }
@PutMapping("/update-update-statusok") @PutMapping("/update-update-statusok")

6
mes-ui/mes-ui-admin-vue3/.env.pro
View File

@ -4,14 +4,14 @@ NODE_ENV=production
VITE_DEV=false VITE_DEV=false
# 请求路径https://nxhs.cjyx.cc/admin-api http://192.168.1.87:8080 https://star.hz-hl.com # 请求路径https://nxhs.cjyx.cc/admin-api http://192.168.1.87:8080 https://star.hz-hl.com
VITE_BASE_URL='http://192.168.1.87:8080' VITE_BASE_URL='https://nxhs.cjyx.cc'
# 上传路径 http://218.75.46.166:8080 # 上传路径 http://218.75.46.166:8080
VITE_UPLOAD_URL='http://192.168.1.87:8080/admin-api/infra/file/upload' VITE_UPLOAD_URL='https://nxhs.cjyx.cc/admin-api/infra/file/upload'
# 上传路径 # 上传路径
VITE_UPLOAD_BATCH_URL='http://192.168.1.87:8080/admin-api/infra/file/uploadBatch' VITE_UPLOAD_BATCH_URL='https://nxhs.cjyx.cc/admin-api/infra/file/uploadBatch'
# 接口前缀 # 接口前缀
VITE_API_BASEPATH= VITE_API_BASEPATH=