diff --git a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
index a19ea23..6c480ef 100644
--- a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
@@ -132,7 +132,7 @@
<!-- <a v-else-if="record.status == 0" @click="selectContainerStatus(record)" v-has="'receiptContainerHeader:createTask'"><a-button type="primary">生成任务</a-button><a-divider type="vertical"/></a>-->
<a v-if="record.status == 0 && record.taskType == 200" @click="selectPort(record)" v-has="'receiptContainerHeader:createTask'"><a-button type="primary">生成任务</a-button><a-divider type="vertical"/></a>
<a v-else-if="record.status == 0" @click="createTask(record)" v-has="'receiptContainerHeader:createTask'"><a-button type="primary">生成任务</a-button><a-divider type="vertical"/></a>
- <a-popconfirm v-if="record.status == 0" v-has="'receipatContainerHeader:delete'" title="确定取消配盘吗?" @confirm="() => handleDelete(record.id)">
+ <a-popconfirm v-if="record.status == 0" v-has="'receiptContainerHeader:delete'" title="确定取消配盘吗?" @confirm="() => handleDelete(record.id)">
<a><a-button type="danger">取消配盘</a-button> <a-divider type="vertical"/></a>
</a-popconfirm>
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/material/controller/MaterialController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/material/controller/MaterialController.java
index f5843e7..3303d0c 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/material/controller/MaterialController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/material/controller/MaterialController.java
@@ -16,7 +16,6 @@ import org.jeecg.modules.wms.config.material.entity.Material;
import org.jeecg.modules.wms.config.material.entity.SearchDomain;
import org.jeecg.modules.wms.config.material.service.IMaterialService;
import org.jeecg.utils.HuahengJwtUtil;
-import org.jeecg.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/job/AutoDeleteTask.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/job/AutoDeleteTask.java
index 2f4f120..d32c9b0 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/job/AutoDeleteTask.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/job/AutoDeleteTask.java
@@ -73,7 +73,8 @@ public class AutoDeleteTask implements Job {
shipmentHeaderService.delMain(String.valueOf(shipmentHeader.getId()), QuantityConstant.WMS_COMPLETE_DELETE_RECEIPT);
}
LambdaQueryWrapper<TaskHeader> taskHeaderLambdaQueryWrapper = Wrappers.lambdaQuery();
- taskHeaderLambdaQueryWrapper.eq(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED);
+ taskHeaderLambdaQueryWrapper.eq(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED).ne(TaskHeader::getExceptionState,
+ QuantityConstant.EXCEPTION_TASK_ERROR);
List<TaskHeader> taskHeaderList = taskHeaderService.list(taskHeaderLambdaQueryWrapper);
log.info(String.format(" AutoDeleteTask 执行任务! taskHeaderList :" + taskHeaderList + "时间" + DateUtils.getTimestamp()));
for (TaskHeader taskHeader : taskHeaderList) {
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java
index 1429c51..27ba515 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java
@@ -130,7 +130,15 @@ public class ReceiptHeaderController extends JeecgController<ReceiptHeader, IRec
@RequiresPermissions("receiptHeader:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody ReceiptHeader receiptHeader) {
+ String companyCode = receiptHeader.getCompanyCode();
receiptHeaderService.updateById(receiptHeader);
+ if (StringUtils.isNotEmpty(companyCode)) {
+ List<ReceiptDetail> receiptDetailList = receiptDetailService.selectByMainId(String.valueOf(receiptHeader.getId()));
+ for (ReceiptDetail receiptDetail : receiptDetailList) {
+ receiptDetail.setCompanyCode(companyCode);
+ receiptDetailService.updateById(receiptDetail);
+ }
+ }
return Result.OK("编辑成功!");
}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/controller/ShipmentHeaderController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/controller/ShipmentHeaderController.java
index cd83864..a98d772 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/controller/ShipmentHeaderController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/controller/ShipmentHeaderController.java
@@ -3,7 +3,6 @@ package org.jeecg.modules.wms.shipment.shipmentHeader.controller;
import java.io.IOException;
import java.math.BigDecimal;
import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -16,7 +15,6 @@ import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
@@ -33,6 +31,7 @@ import org.jeecg.modules.wms.shipment.shipmentHeader.service.IShipmentDetailServ
import org.jeecg.modules.wms.shipment.shipmentHeader.service.IShipmentHeaderService;
import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader;
import org.jeecg.utils.HuahengJwtUtil;
+import org.jeecg.utils.StringUtils;
import org.jeecg.utils.constant.QuantityConstant;
import org.jeecg.utils.support.ApiLogger;
import org.jeecgframework.poi.excel.ExcelImportUtil;
@@ -46,15 +45,11 @@ import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.monitor4all.logRecord.annotation.OperationLog;
-import cn.monitor4all.logRecord.context.LogRecordContext;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -143,7 +138,15 @@ public class ShipmentHeaderController extends JeecgController<ShipmentHeader, IS
@RequiresPermissions("shipmentHeader:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody ShipmentHeader shipmentHeader) {
+ String companyCode = shipmentHeader.getCompanyCode();
shipmentHeaderService.updateById(shipmentHeader);
+ if (StringUtils.isNotEmpty(companyCode)) {
+ List<ShipmentDetail> shipmentDetailList = shipmentDetailService.selectByMainId(String.valueOf(shipmentHeader.getId()));
+ for (ShipmentDetail shipmentDetail : shipmentDetailList) {
+ shipmentDetail.setCompanyCode(companyCode);
+ shipmentDetailService.updateById(shipmentDetail);
+ }
+ }
return Result.OK("编辑成功!");
}
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/service/impl/CycleCountDetailServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/service/impl/CycleCountDetailServiceImpl.java
index c8557fa..0a27be1 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/service/impl/CycleCountDetailServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/service/impl/CycleCountDetailServiceImpl.java
@@ -8,7 +8,6 @@ import java.util.stream.Collectors;
import javax.annotation.Resource;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.modules.wms.config.container.entity.Container;
@@ -43,6 +42,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -85,6 +85,8 @@ public class CycleCountDetailServiceImpl extends ServiceImpl<CycleCountDetailMap
private IShipmentContainerHeaderService shipmentContainerHeaderService;
@Resource
private IInventoryHeaderService inventoryHeaderService;
+ @Resource
+ private ContainerServiceImpl containerService;
@Override
@Transactional
@@ -206,7 +208,7 @@ public class CycleCountDetailServiceImpl extends ServiceImpl<CycleCountDetailMap
cycleCountDetailChildServiceImpl.save(cycleCountDetailChild);
}
}
- LambdaQueryWrapper <CycleCountDetail> cycleCountDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
+ LambdaQueryWrapper<CycleCountDetail> cycleCountDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
cycleCountDetailLambdaQueryWrapper.eq(CycleCountDetail::getCycleCountHeadCode, code);
List<CycleCountDetail> cycleCountDetailList = cycleCountDetailService.list(cycleCountDetailLambdaQueryWrapper);
if (CollectionUtils.isEmpty(cycleCountDetailList)) {
@@ -251,7 +253,11 @@ public class CycleCountDetailServiceImpl extends ServiceImpl<CycleCountDetailMap
return Result.error("盘点明细没有子单");
}
String containerCode = cycleCountDetail.getContainerCode();
- String fromLocationCode = cycleCountDetail.getLocationCode();
+ Container container = containerService.getContainerByCode(containerCode, warehouseCode);
+ if (container == null) {
+ return Result.error("容器：" + containerCode + "不存在");
+ }
+ String fromLocationCode = container.getLocationCode();
String toLocationCode = QuantityConstant.EMPTY_STRING;
String value = parameterConfigurationService.getValueByCode(QuantityConstant.RULE_TASK_LOCATION);
int taskLocationRule = Integer.parseInt(value);
@@ -281,9 +287,9 @@ public class CycleCountDetailServiceImpl extends ServiceImpl<CycleCountDetailMap
task.setZoneCode(zoneCode);
task.setInnernalTaskType(QuantityConstant.TASK_INTENERTYPE_CYCLECOUNT);
task.setTaskType(QuantityConstant.TASK_TYPE_CYCLECOUNT);
- task.setContainerCode(cycleCountDetail.getContainerCode());
+ task.setContainerCode(containerCode);
task.setStatus(QuantityConstant.TASK_STATUS_BUILD);
- task.setFromLocationCode(cycleCountDetail.getLocationCode());
+ task.setFromLocationCode(fromLocationCode);
task.setToPortCode(toPort);
task.setSequenceNumber(1);
task.setShipmentContainerHeaderId(cycleCoutDetailId);
@@ -297,7 +303,6 @@ public class CycleCountDetailServiceImpl extends ServiceImpl<CycleCountDetailMap
throw new JeecgBootException("盘点任务主表生成失败！");
}
-
for (CycleCountDetailChild item : childList) {
// 写入任务细表
TaskDetail taskDetail = new TaskDetail();
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
index 9022615..f6c470e 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/task/taskHeader/service/impl/TaskHeaderServiceImpl.java
@@ -792,7 +792,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHea
// 9 更新单据
ShipmentContainerHeader shipmentContainerHeader = shipmentContainerHeaderService.getById(taskHeader.getShipmentContainerHeaderId());
if (shipmentContainerHeader != null) {
- shipmentContainerHeader.setStatus(QuantityConstant.SHIPMENT_CONTAINER_FINISHED);
success = shipmentContainerHeaderService.updateStatusById(QuantityConstant.SHIPMENT_CONTAINER_FINISHED, shipmentContainerHeader.getId());
if (!success) {
throw new JeecgBootException("处理空出失败，更新出库组盘头失败");