From d5cc4eeeff3dc226fed1d14502cc969a61eb5747 Mon Sep 17 00:00:00 2001 From: ligaode Date: Thu, 13 Feb 2025 17:51:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/baseaccadjapply/BaseAccadjApplyService.java | 12 ------------ .../biz/as/storechange/AppStoreChangeService.java | 12 +++++++++++- .../fegin/wmsInventory/WmsInventoryFeign.java | 2 +- .../yxt/wms/apiadmin/inventroy/WmsInventoryRest.java | 2 +- .../inventory/wmsinventory/WmsInventoryMapper.java | 4 ++++ .../inventory/wmsinventory/WmsInventoryService.java | 9 ++++++++- 6 files changed, 25 insertions(+), 16 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java index ebbad6e4f5..5ad0ed0504 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java @@ -67,7 +67,6 @@ import com.yxt.anrui.base.common.enums.VehicleState; import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.base.common.utils.domain.BillNo; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; -import com.yxt.anrui.fin.api.kingdee.KingDeeResult; import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer; import com.yxt.anrui.fin.api.kingdee.bdsupplier.BdSupplier; import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock; @@ -154,27 +153,16 @@ public class BaseAccadjApplyService extends MybatisBaseService createQueryWrapper(BaseAccadjApplyQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - return qw; - } - public PagerVo listPageVo(PagerQuery pq) { BaseAccadjApplyQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/storechange/AppStoreChangeService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/storechange/AppStoreChangeService.java index e501af6685..eefd73b71c 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/storechange/AppStoreChangeService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/storechange/AppStoreChangeService.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.terminal.biz.as.storechange; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateUtil; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; @@ -35,6 +36,7 @@ import com.yxt.anrui.terminal.api.as.storechange.AppStoreChangeScanVo; import com.yxt.anrui.terminal.fegin.wmsInventory.WmsInventory; import com.yxt.anrui.terminal.fegin.wmsInventory.WmsInventoryFeign; import com.yxt.anrui.terminal.fegin.wmsInventory.WmsInventorySaveDto; +import com.yxt.anrui.terminal.fegin.wmsInventory.WmsStoreChangeDto; import com.yxt.anrui.terminal.fegin.wmsgoodstag.GoodsTagListQuery; import com.yxt.anrui.terminal.fegin.wmsgoodstag.WmsGoodsTag; import com.yxt.anrui.terminal.fegin.wmsgoodstag.WmsGoodsTagFeign; @@ -176,6 +178,14 @@ public class AppStoreChangeService { } public ResultBean save(List dto) { - return null; + ResultBean rb = ResultBean.fireFail(); + List wmsStoreChangeDtos = new ArrayList<>(); + for (AppStoreChangeDto appStoreChangeDto : dto) { + WmsStoreChangeDto wmsStoreChangeDto = new WmsStoreChangeDto(); + BeanUtil.copyProperties(appStoreChangeDto,wmsStoreChangeDto); + wmsStoreChangeDtos.add(wmsStoreChangeDto); + } + wmsInventoryFeign.saveKnyw(wmsStoreChangeDtos); + return rb.success(); } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventory/WmsInventoryFeign.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventory/WmsInventoryFeign.java index 0ba4b5f6de..6669949617 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventory/WmsInventoryFeign.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventory/WmsInventoryFeign.java @@ -53,5 +53,5 @@ public interface WmsInventoryFeign { @ApiOperation("库内移位保存") @PostMapping("/saveKnyw") - ResultBean saveKnyw(List dto); + ResultBean saveKnyw(@RequestBody List dto); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java index 3e5072b0bc..066a5a43c1 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java @@ -327,7 +327,7 @@ public class WmsInventoryRest { @ApiOperation("库内移位保存") @PostMapping("/saveKnyw") - ResultBean saveKnyw(List dto){ + ResultBean saveKnyw(@RequestBody List dto){ return wmsInventoryService.saveKnyw(dto); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java index 3fee8efb24..03f2090915 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java @@ -14,6 +14,7 @@ import com.yxt.wms.biz.inventory.wmsinventory.report.InventoryStockListVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; import java.math.BigDecimal; import java.util.List; @@ -119,4 +120,7 @@ public interface WmsInventoryMapper extends BaseMapper { List selBySpuSidAndUseOrgSid(@Param("spuSid") String spuSid, @Param("useOrgSid") String useOrgSid); List selBySpuSidAndUseOrgSidWarehouseSid(@Param("spuSid") String spuSid, @Param("useOrgSid") String useOrgSid, @Param("warehouseSid") String warehouseSid, @Param("sids") List sids); + + @Update("update wms_inventory set count = #{count} where sid = #{sid}") + void updateCount(@Param("sid") String sid,@Param("count") String count); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java index 20f38fad1a..7985139d0e 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java @@ -1419,6 +1419,7 @@ public class WmsInventoryService extends MybatisBaseService dto) { + ResultBean rb = ResultBean.fireFail(); for (WmsStoreChangeDto wmsStoreChangeDto : dto) { String sid = wmsStoreChangeDto.getSid(); WmsInventory wmsInventory = fetchBySid(sid); @@ -1444,7 +1445,13 @@ public class WmsInventoryService extends MybatisBaseService