From d8fb6d11aa24b77b8bbcc5740140d31f5692837d Mon Sep 17 00:00:00 2001 From: cy <1664593601@qq.com> Date: 星期四, 16 十一月 2023 16:11:05 +0800 Subject: [PATCH] feat: 调拨调整 --- consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java | 50 ++++++++++++++++++++++++-------------------------- 1 files changed, 24 insertions(+), 26 deletions(-) diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java index 24c767c..9527206 100644 --- a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java +++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java @@ -4,28 +4,14 @@ import com.consum.base.core.utils.IdUtil; import com.consum.base.core.utils.MapUtils; import com.consum.base.core.utils.MapperUtil; -import com.consum.base.pojo.LWhFormTransferGoodsInfoParam; -import com.consum.base.pojo.LWhFormTransferParam; -import com.consum.base.pojo.ProcureModelInfoDto; -import com.consum.base.pojo.UseRecordDto; -import com.consum.base.pojo.UseRecordSkuDto; +import com.consum.base.pojo.*; import com.consum.base.pojo.query.TransferQry; import com.consum.base.pojo.response.FormTransferVO; import com.consum.base.pojo.response.FromTransferTemplateInfoVO; import com.consum.base.pojo.response.LWHFromTransferExtendVO; import com.consum.base.pojo.response.TransferInfoVO; -import com.consum.base.service.BaseGoodsModelsServiceImpl; -import com.consum.base.service.LWhFormTransferCoreService; -import com.consum.base.service.LWhFormTransferServiceImpl; -import com.consum.base.service.LWhProcureModelService; -import com.consum.base.service.LWhProcureModelUserRecordServiceImpl; -import com.consum.base.service.LWhProcureModelUserServiceImpl; -import com.consum.model.po.BaseGoodsModels; -import com.consum.model.po.FinSysTenantUser; -import com.consum.model.po.LWhFormTransfer; -import com.consum.model.po.LWhProcureModel; -import com.consum.model.po.LWhProcureModelUser; -import com.consum.model.po.LWhProcureModelUserRecord; +import com.consum.base.service.*; +import com.consum.model.po.*; import com.consum.model.vo.LWhFormOutputVo; import com.iplatform.model.po.S_user_core; import com.walker.db.page.GenericPager; @@ -36,19 +22,16 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.commons.compress.utils.Lists; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + import java.lang.reflect.Field; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.compress.utils.Lists; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; /** * @Description 璋冩嫧绠$悊 @@ -72,7 +55,8 @@ private LWhProcureModelUserRecordServiceImpl lWhProcureModelUserRecordService; @Autowired private BaseGoodsModelsServiceImpl baseGoodsModelsService; - + @Autowired + private BaseWarehouseServiceImpl baseWarehouseService; /** * @Description 鏂板 */ @@ -254,6 +238,20 @@ }) @PostMapping("/output") public ResponseValue output(Long id) { + // 鍑哄簱鍓� 璁剧疆鍑哄簱浠撳簱 + FinSysTenantUser sysTenantUser = this.getSysInfo(); + String agencyId = sysTenantUser.getTenantId(); + List<BaseWarehouse> baseWarehouseList = baseWarehouseService.getByAgencyId(Long.valueOf(agencyId), (short) 1, (short) 1); + if (CollectionUtils.isEmpty(baseWarehouseList)){ + return ResponseValue.error("鏈烘瀯鏃犻粯璁や粨搴擄紒"); + } + BaseWarehouse baseWarehouse = baseWarehouseList.get(0); + Long wareHouseId = baseWarehouse.getId(); + String warehouseName = baseWarehouse.getWarehouseName(); + LWhFormTransfer lWhFormTransfer = new LWhFormTransfer(id); + lWhFormTransfer.setOutWarehouseId(wareHouseId); + lWhFormTransfer.setOutWarehouseName(warehouseName); + lWhFormTransferService.update(lWhFormTransfer); lWhFormTransferCoreService.doTransferOutPut(id, getCurrentUser()); return ResponseValue.success(); } -- Gitblit v1.9.1