diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wms/service/WmsServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wms/service/WmsServiceImpl.java
index 02806bb..b961b56 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wms/service/WmsServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wms/service/WmsServiceImpl.java
@@ -246,8 +246,8 @@ public class WmsServiceImpl implements WmsService {
@Transactional(rollbackFor = Exception.class)
public Result createEmptyIn(WmsEntity wmsEntity) {
String warehouseCode = wmsEntity.getWarehouseCode();
- String toPort = wmsEntity.getToPort();
- String referCode = wmsEntity.getTaskNo();
+// String toPort = wmsEntity.getToPort();
+// String referCode = wmsEntity.getTaskNo();
String contaienrCode = wmsEntity.getContainerCode();
Result result = taskHeaderService.createEmptyIn(contaienrCode, QuantityConstant.EMPTY_STRING, warehouseCode);
@@ -259,7 +259,7 @@ public class WmsServiceImpl implements WmsService {
public Result createEmptyOut(WmsEntity wmsEntity) {
String warehouseCode = wmsEntity.getWarehouseCode();
String toPort = wmsEntity.getToPort();
- String referCode = wmsEntity.getTaskNo();
+// String referCode = wmsEntity.getTaskNo();
String contaienrCode = wmsEntity.getContainerCode();
Result result = taskHeaderService.createEmptyOut(contaienrCode, toPort, warehouseCode);
@@ -271,7 +271,7 @@ public class WmsServiceImpl implements WmsService {
public Result createCheckOut(WmsEntity wmsEntity) {
String warehouseCode = wmsEntity.getWarehouseCode();
String toPort = wmsEntity.getToPort();
- String referCode = wmsEntity.getTaskNo();
+// String referCode = wmsEntity.getTaskNo();
String contaienrCode = wmsEntity.getContainerCode();
Result result = taskHeaderService.createCheckOutTask(contaienrCode, toPort, warehouseCode);
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/service/impl/ContainerServiceImpl.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/service/impl/ContainerServiceImpl.java
index 6a54168..420ed48 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/service/impl/ContainerServiceImpl.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/container/service/impl/ContainerServiceImpl.java
@@ -37,7 +37,7 @@ public class ContainerServiceImpl extends ServiceImpl<ContainerMapper, Container
ContainerMapper containerMapper;
@Override
- public Result batchAddContainers(Container container, int number) {
+ public Result<?> batchAddContainers(Container container, int number) {
String containerTypeCode = container.getContainerTypeCode();
String warehouseCode = container.getWarehouseCode();
int startNumber = getStartNumber(containerTypeCode, container.getWarehouseCode());
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/controller/CycleCountDetailController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/controller/CycleCountDetailController.java
index c188598..3af7088 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/controller/CycleCountDetailController.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/controller/CycleCountDetailController.java
@@ -123,7 +123,7 @@ public class CycleCountDetailController extends HuahengBaseController {
@AutoLog(value = "盘点盘盈-增加明细")
@ApiOperation(value = "盘点盘盈-增加明细", notes = "盘点盘盈-增加明细")
@RequestMapping(value = "/increaseInInventoryGain", method = {RequestMethod.PUT, RequestMethod.POST})
- public Result<String> increaseInInventoryGain(@RequestBody CycleCountDetailChild cycleCountDetailChild) {
+ public Result<?> increaseInInventoryGain(@RequestBody CycleCountDetailChild cycleCountDetailChild) {
return cycleCountDetailService.increaseInInventoryGain(cycleCountDetailChild);
}
@@ -225,25 +225,17 @@ public class CycleCountDetailController extends HuahengBaseController {
@AutoLog(value = "盘点添加")
@ApiOperation(value = "盘点添加", notes = "盘点添加")
@PostMapping(value = "/stockTakeTask")
- public Result<String> stockTakeTask(@RequestParam(name = "ids") String ids, @RequestParam(name = "headerId") int headerId,
- @RequestParam(name = "code") String code) {
+ public Result<?> stockTakeTask(@RequestParam(name = "ids") String ids, @RequestParam(name = "headerId") int headerId, @RequestParam(name = "code") String code) {
if (StringUtils.isEmpty(ids)) {
return Result.error("taskId不能为空");
}
- Result result = null;
- Integer[] idList = ConvertUtils.toIntArray(ids);
- for (int taskId : idList) {
- result = handleMultiProcess("cancelTask", new HuahengBaseController.MultiProcessListener() {
- @Override
- public Result doProcess() {
- Result result = cycleCountDetailService.stockDetailAdd(taskId, headerId, code);
- return result;
- }
- });
- }
- result.setResult(headerId);
+ Result<?> result = handleMultiProcess("stockTakeTask", new HuahengBaseController.MultiProcessListener() {
+ @Override
+ public Result<?> doProcess() {
+ return cycleCountDetailService.stockDetailAdd(ConvertUtils.toIntArray(ids), headerId, code);
+ }
+ });
return result;
-
}
/**
@@ -297,7 +289,7 @@ public class CycleCountDetailController extends HuahengBaseController {
cycleCountDetailList = queryList;
} else {
List<String> selectionList = Arrays.asList(selections.split(","));
- cycleCountDetailList = queryList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
+ cycleCountDetailList = queryList.stream().filter(item -> selectionList.contains(item.getId() + "")).collect(Collectors.toList());
}
// Step.3 组装pageList
diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/service/ICycleCountDetailService.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/service/ICycleCountDetailService.java
index 180fc1c..7065cb7 100644
--- a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/service/ICycleCountDetailService.java
+++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/stocktaking/cycleCountDetail/service/ICycleCountDetailService.java
@@ -10,37 +10,35 @@ import java.util.List;
/**
* @Description: 盘点明细表
- * @Author: jeecg-boot
- * @Date: 2023-01-30
- * @Version: V1.0
+ * @Author: jeecg-boot
+ * @Date: 2023-01-30
+ * @Version: V1.0
*/
public interface ICycleCountDetailService extends IService<CycleCountDetail> {
- /**
- * 添加一对多
- *
- */
- public void saveMain(CycleCountDetail cycleCountDetail,List<CycleCountDetailChild> cycleCountDetailChildList) ;
+ /**
+ * 添加一对多
+ */
+ public void saveMain(CycleCountDetail cycleCountDetail, List<CycleCountDetailChild> cycleCountDetailChildList);
- /**
- * 修改一对多
- *
- */
- public void updateMain(CycleCountDetail cycleCountDetail,List<CycleCountDetailChild> cycleCountDetailChildList);
+ /**
+ * 修改一对多
+ */
+ public void updateMain(CycleCountDetail cycleCountDetail, List<CycleCountDetailChild> cycleCountDetailChildList);
- /**
- * 删除一对多
- */
- public void delMain (String id);
+ /**
+ * 删除一对多
+ */
+ public void delMain(String id);
- /**
- * 批量删除一对多
- */
- public void delBatchMain (Collection<? extends Serializable> idList);
+ /**
+ * 批量删除一对多
+ */
+ public void delBatchMain(Collection<? extends Serializable> idList);
- Result stockDetailAdd(int taskId,int headerId,String code);
+ Result stockDetailAdd(Integer[] taskIdList, Integer headerId, String code);
- Result createCycleCoutTaskByDetailId(Integer cycleCoutdetailId,String toPort,String warehouseCode);
+ Result createCycleCoutTaskByDetailId(Integer cycleCoutdetailId, String toPort, String warehouseCode);
Result increaseInInventoryGain(CycleCountDetailChild cycleCountDetailChild);
}
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 2b9ef67..225a78e 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
@@ -128,68 +128,68 @@ public class CycleCountDetailServiceImpl extends ServiceImpl<CycleCountDetailMap
@Override
@Transactional
- public Result stockDetailAdd(int taskId, int headerId, String code) {
- LambdaQueryWrapper<InventoryDetail> inventoryDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
- inventoryDetailLambdaQueryWrapper.eq(InventoryDetail::getInventoryHeaderId, taskId);
- List<InventoryDetail> inventoryDetails = inventoryDetailService.list(inventoryDetailLambdaQueryWrapper);
-
- LambdaQueryWrapper<CycleCountDetail> cycleCountDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
- cycleCountDetailLambdaQueryWrapper.eq(CycleCountDetail::getContainerCode, inventoryDetails.get(0).getContainerCode()).ne(CycleCountDetail::getEnableStatus,
- QuantityConstant.CYCLECOUNT_STATUS_COMPLETED);
- List<CycleCountDetail> cycleCountDetails = this.list(cycleCountDetailLambdaQueryWrapper);
- if (cycleCountDetails.size() > 0) {
- return Result.error("当前容器已经在盘点队列还没有完成 盘点单号" + cycleCountDetails.get(0).getCycleCountHeadCode());
- }
+ public Result stockDetailAdd(Integer[] taskIdList, Integer headerId, String code) {
+ for (Integer taskId : taskIdList) {
+ LambdaQueryWrapper<InventoryDetail> inventoryDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
+ inventoryDetailLambdaQueryWrapper.eq(InventoryDetail::getInventoryHeaderId, taskId);
+ List<InventoryDetail> inventoryDetails = inventoryDetailService.list(inventoryDetailLambdaQueryWrapper);
+
+ LambdaQueryWrapper<CycleCountDetail> cycleCountDetailLambdaQueryWrapper = Wrappers.lambdaQuery();
+ cycleCountDetailLambdaQueryWrapper.eq(CycleCountDetail::getContainerCode, inventoryDetails.get(0).getContainerCode())
+ .ne(CycleCountDetail::getEnableStatus, QuantityConstant.CYCLECOUNT_STATUS_COMPLETED);
+ List<CycleCountDetail> cycleCountDetails = this.list(cycleCountDetailLambdaQueryWrapper);
+ if (cycleCountDetails.size() > 0) {
+ return Result.error("当前容器已经在盘点队列还没有完成 盘点单号" + cycleCountDetails.get(0).getCycleCountHeadCode());
+ }
- String warehouseCode = inventoryDetails.get(0).getWarehouseCode();
+ String warehouseCode = inventoryDetails.get(0).getWarehouseCode();
- Container containerByCode = containerServiceImpl.getContainerByCode(inventoryDetails.get(0).getContainerCode(), warehouseCode);
- if (containerByCode.getStatus().equals(QuantityConstant.STATUS_CONTAINER_LOCK)) {
- return Result.error("当前容器已锁定 请检查数据 库存里面不是锁定 实际上容器里面锁定了");
- }
+ Container containerByCode = containerServiceImpl.getContainerByCode(inventoryDetails.get(0).getContainerCode(), warehouseCode);
+ if (containerByCode.getStatus().equals(QuantityConstant.STATUS_CONTAINER_LOCK)) {
+ return Result.error("当前容器已锁定 请检查数据 库存里面不是锁定 实际上容器里面锁定了");
+ }
- Location locationByCode = locationService.getLocationByCode(inventoryDetails.get(0).getLocationCode(), warehouseCode);
- if (locationByCode.getStatus().equals(QuantityConstant.STATUS_CONTAINER_LOCK)) {
- return Result.error("当前库位已锁定 请检查数据 库存里面不是锁定 实际上库位里面锁定了");
- }
+ Location locationByCode = locationService.getLocationByCode(inventoryDetails.get(0).getLocationCode(), warehouseCode);
+ if (locationByCode.getStatus().equals(QuantityConstant.STATUS_CONTAINER_LOCK)) {
+ return Result.error("当前库位已锁定 请检查数据 库存里面不是锁定 实际上库位里面锁定了");
+ }
- CycleCountDetail cycleCountDetail = new CycleCountDetail();
- cycleCountDetail.setCycleCountHeadId(headerId);
- cycleCountDetail.setContainerCode(inventoryDetails.get(0).getContainerCode());
- cycleCountDetail.setCycleCountHeadCode(code);
- cycleCountDetail.setCompanyCode(inventoryDetails.get(0).getCompanyCode());
- cycleCountDetail.setWarehouseCode(inventoryDetails.get(0).getWarehouseCode());
- cycleCountDetail.setInventoryHeaderId(inventoryDetails.get(0).getInventoryHeaderId());
- cycleCountDetail.setLocationCode(inventoryDetails.get(0).getLocationCode());
- cycleCountDetail.setInventorySts(inventoryDetails.get(0).getInventoryStatus());
- cycleCountDetail.setSystemQty(BigDecimal.ZERO);
- cycleCountDetail.setCountedQty(BigDecimal.ZERO);
- cycleCountDetail.setGapQty(BigDecimal.ZERO);
- cycleCountDetail.setEnableStatus(QuantityConstant.CYCLECOUNT_STATUS_BUILD);
- this.save(cycleCountDetail);
-
- for (InventoryDetail inventoryDetail : inventoryDetails) {
- CycleCountDetailChild cycleCountDetailChild = new CycleCountDetailChild();
- cycleCountDetailChild.setCycleCountDetailid(cycleCountDetail.getId());
- cycleCountDetailChild.setCyclecountheadcode(code);
- cycleCountDetailChild.setChildStatus(QuantityConstant.CYCLECOUNT_STATUS_BUILD);
- cycleCountDetailChild.setLocationCode(inventoryDetail.getLocationCode());
- cycleCountDetailChild.setContainerCode(inventoryDetail.getContainerCode());
- cycleCountDetailChild.setMaterialCode(inventoryDetail.getMaterialCode());
- cycleCountDetailChild.setMaterialName(inventoryDetail.getMaterialName());
- cycleCountDetailChild.setMaterialSpec(inventoryDetail.getMaterialSpec());
- cycleCountDetailChild.setMaterialUnit(inventoryDetail.getMaterialUnit());
- cycleCountDetailChild.setInventoryStatus(inventoryDetail.getInventoryStatus());
- cycleCountDetailChild.setBatch(inventoryDetail.getBatch());
- cycleCountDetailChild.setLot(inventoryDetail.getLot());
- cycleCountDetailChild.setSystemQty(inventoryDetail.getQty());
- cycleCountDetailChild.setCountedQty(BigDecimal.ZERO);
- cycleCountDetailChild.setGapQty(BigDecimal.ZERO);
- cycleCountDetailChild.setInventoryDetaiId(inventoryDetail.getId());
- cycleCountDetailChildServiceImpl.save(cycleCountDetailChild);
+ CycleCountDetail cycleCountDetail = new CycleCountDetail();
+ cycleCountDetail.setCycleCountHeadId(headerId);
+ cycleCountDetail.setContainerCode(inventoryDetails.get(0).getContainerCode());
+ cycleCountDetail.setCycleCountHeadCode(code);
+ cycleCountDetail.setCompanyCode(inventoryDetails.get(0).getCompanyCode());
+ cycleCountDetail.setWarehouseCode(inventoryDetails.get(0).getWarehouseCode());
+ cycleCountDetail.setInventoryHeaderId(inventoryDetails.get(0).getInventoryHeaderId());
+ cycleCountDetail.setLocationCode(inventoryDetails.get(0).getLocationCode());
+ cycleCountDetail.setInventorySts(inventoryDetails.get(0).getInventoryStatus());
+ cycleCountDetail.setSystemQty(BigDecimal.ZERO);
+ cycleCountDetail.setCountedQty(BigDecimal.ZERO);
+ cycleCountDetail.setGapQty(BigDecimal.ZERO);
+ cycleCountDetail.setEnableStatus(QuantityConstant.CYCLECOUNT_STATUS_BUILD);
+ cycleCountDetailService.save(cycleCountDetail);
+ for (InventoryDetail inventoryDetail : inventoryDetails) {
+ CycleCountDetailChild cycleCountDetailChild = new CycleCountDetailChild();
+ cycleCountDetailChild.setCycleCountDetailid(cycleCountDetail.getId());
+ cycleCountDetailChild.setCyclecountheadcode(code);
+ cycleCountDetailChild.setChildStatus(QuantityConstant.CYCLECOUNT_STATUS_BUILD);
+ cycleCountDetailChild.setLocationCode(inventoryDetail.getLocationCode());
+ cycleCountDetailChild.setContainerCode(inventoryDetail.getContainerCode());
+ cycleCountDetailChild.setMaterialCode(inventoryDetail.getMaterialCode());
+ cycleCountDetailChild.setMaterialName(inventoryDetail.getMaterialName());
+ cycleCountDetailChild.setMaterialSpec(inventoryDetail.getMaterialSpec());
+ cycleCountDetailChild.setMaterialUnit(inventoryDetail.getMaterialUnit());
+ cycleCountDetailChild.setInventoryStatus(inventoryDetail.getInventoryStatus());
+ cycleCountDetailChild.setBatch(inventoryDetail.getBatch());
+ cycleCountDetailChild.setLot(inventoryDetail.getLot());
+ cycleCountDetailChild.setSystemQty(inventoryDetail.getQty());
+ cycleCountDetailChild.setCountedQty(BigDecimal.ZERO);
+ cycleCountDetailChild.setGapQty(BigDecimal.ZERO);
+ cycleCountDetailChild.setInventoryDetaiId(inventoryDetail.getId());
+ cycleCountDetailChildServiceImpl.save(cycleCountDetailChild);
+ }
}
-
- return Result.OK("生成完成");
+ return Result.OK("生成完成", headerId);
}
/**