diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/OneExcelVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/OneExcelVo.java index fd567e6764..561d7e786d 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/OneExcelVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/OneExcelVo.java @@ -20,12 +20,12 @@ public class OneExcelVo { @ExportEntityMap(CnName = "创建日期*", EnName = "createTime") private String createTime; - @ExportEntityMap(CnName = "返利名称*", EnName = "rebateName") - private String rebateName; - @ExportEntityMap(CnName = "返利类型*", EnName = "rebateTypeValue") private String rebateTypeValue; + @ExportEntityMap(CnName = "返利名称*", EnName = "rebateName") + private String rebateName; + @ExportEntityMap(CnName = "预提返利*", EnName = "estimateRebate") private String estimateRebate; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/TwoExcelVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/TwoExcelVo.java index 3bea60b78b..57c96860fa 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/TwoExcelVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/TwoExcelVo.java @@ -20,12 +20,12 @@ public class TwoExcelVo { @ExportEntityMap(CnName = "创建日期*", EnName = "createTime") private String createTime; - @ExportEntityMap(CnName = "返利名称*", EnName = "rebateName") - private String rebateName; - @ExportEntityMap(CnName = "返利类型*", EnName = "rebateTypeValue") private String rebateTypeValue; + @ExportEntityMap(CnName = "返利名称*", EnName = "rebateName") + private String rebateName; + @ExportEntityMap(CnName = "预提返利*", EnName = "estimateRebate") private String estimateRebate; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/OneExcelVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/OneExcelVo.java index fecebb5b52..b2a84473f8 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/OneExcelVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/OneExcelVo.java @@ -30,14 +30,12 @@ public class OneExcelVo { @ExportEntityMap(CnName = "创建日期*", EnName = "createTime") private String createTime; - //返利名称 - @ExportEntityMap(CnName = "返利名称*", EnName = "rebateName") - private String rebateName; - - //返利类型 @ExportEntityMap(CnName = "返利类型*", EnName = "rebateTypeValue") private String rebateTypeValue; + @ExportEntityMap(CnName = "返利名称*", EnName = "rebateName") + private String rebateName; + //预提返利 @ExportEntityMap(CnName = "预提返利*", EnName = "estimateRebate") private String estimateRebate; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/TwoExcelVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/TwoExcelVo.java index 559943ead1..797b9ca24c 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/TwoExcelVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/TwoExcelVo.java @@ -29,14 +29,12 @@ public class TwoExcelVo { @ExportEntityMap(CnName = "创建日期*", EnName = "createTime") private String createTime; - //返利名称 - @ExportEntityMap(CnName = "返利名称*", EnName = "rebateName") - private String rebateName; - - //返利类型 @ExportEntityMap(CnName = "返利类型*", EnName = "rebateTypeValue") private String rebateTypeValue; + @ExportEntityMap(CnName = "返利名称*", EnName = "rebateName") + private String rebateName; + //预提返利 @ExportEntityMap(CnName = "预提返利*", EnName = "estimateRebate") private String estimateRebate; diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java index e4b053c180..4ace04ccc5 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java @@ -702,10 +702,10 @@ public class ScmSpecialRebateService extends MybatisBaseService dto); } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/firstshelves/AppFirstShelvesService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/firstshelves/AppFirstShelvesService.java index cefe591b19..cacb4f3cc7 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/firstshelves/AppFirstShelvesService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/firstshelves/AppFirstShelvesService.java @@ -176,7 +176,6 @@ public class AppFirstShelvesService { deptSid = sysOrganization.getSid(); } wmsInventorySaveDto.setUseOrgSid(deptSid); - wmsInventorySaveDto.setFirstInDate(DateUtil.today()); for (AppFirstShelvesGoodsDto appFirstShelvesGoodsDto : goodsList) { WmsGoodsTag wmsGoodsTag = wmsGoodsTagFeign.selectByGoodsId(appFirstShelvesGoodsDto.getGoodsID()).getData(); WmsInitialDetail wmsInitialDetail = wmsInitialDetailFeign.selBySid(wmsGoodsTag.getBillDetailSid()).getData(); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/storechange/AppStoreChangeRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/storechange/AppStoreChangeRest.java index 4151300b0c..b4d8c96e62 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/storechange/AppStoreChangeRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/storechange/AppStoreChangeRest.java @@ -33,6 +33,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @RestController @RequestMapping("v1/storeChange") public class AppStoreChangeRest implements AppStoreChangeFeign { @@ -46,7 +48,7 @@ public class AppStoreChangeRest implements AppStoreChangeFeign { } @Override - public ResultBean save(AppStoreChangeDto dto) { - return null; + public ResultBean save(List dto) { + return appStoreChangeService.save(dto); } } 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 366f3c6ecb..e501af6685 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 @@ -30,6 +30,7 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.terminal.api.as.firstshelves.*; +import com.yxt.anrui.terminal.api.as.storechange.AppStoreChangeDto; 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; @@ -126,7 +127,7 @@ public class AppStoreChangeService { } appStoreChangeScanVo.setType(type); appStoreChangeScanVo.setSid(wmsInventoryList.get(0).getGoodsSpuSid()); - appStoreChangeScanVo.setStoreSids(wmsInventoryList.stream().map(WmsInventory::getWarehouseSid).collect(Collectors.toList())); + appStoreChangeScanVo.setStoreSids(wmsInventoryList.stream().map(WmsInventory::getSid).collect(Collectors.toList())); } else { List wmsInventoryList = wmsInventoryFeign.selByGoodsIDAndUseOrgSidAndWarehouseSid(content, deptSid, storeSid).getData(); if (wmsInventoryList == null) { @@ -134,7 +135,7 @@ public class AppStoreChangeService { } appStoreChangeScanVo.setType(type); appStoreChangeScanVo.setSid(wmsInventoryList.get(0).getGoodsSpuSid()); - appStoreChangeScanVo.setStoreSids(wmsInventoryList.stream().map(WmsInventory::getWarehouseSid).collect(Collectors.toList())); + appStoreChangeScanVo.setStoreSids(wmsInventoryList.stream().map(WmsInventory::getSid).collect(Collectors.toList())); } } else if ("1".equals(type)) {//库位码 if (!content.contains("#")) { @@ -174,37 +175,7 @@ public class AppStoreChangeService { return rb.success().setData(appStoreChangeScanVo); } - public ResultBean save(AppFirstShelvesDto dto) { - ResultBean rb = ResultBean.fireFail(); - List goodsList = dto.getGoodsList(); - WmsInventorySaveDto wmsInventorySaveDto = new WmsInventorySaveDto(); - wmsInventorySaveDto.setCreateBySid(dto.getUserSid()); - String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData(); - wmsInventorySaveDto.setCreateOrgSid(useOrgSid); - wmsInventorySaveDto.setUseOrgSid(useOrgSid); - wmsInventorySaveDto.setFirstInDate(DateUtil.today()); - for (AppFirstShelvesGoodsDto appFirstShelvesGoodsDto : goodsList) { - WmsGoodsTag wmsGoodsTag = wmsGoodsTagFeign.selectByGoodsId(appFirstShelvesGoodsDto.getGoodsID()).getData(); - WmsInitialDetail wmsInitialDetail = wmsInitialDetailFeign.selBySid(wmsGoodsTag.getBillDetailSid()).getData(); - WmsHouseInfoVo wmsHouseInfoVo = wmsWarehouseRackFeign.selHouseInfoByFullCode(appFirstShelvesGoodsDto.getHouseCode()).getData(); - wmsInventorySaveDto.setGoodsSpuSid(wmsGoodsTag.getGoodsSpuSid()); - wmsInventorySaveDto.setGoodsSpuName(wmsGoodsTag.getGoodsSpuName()); - wmsInventorySaveDto.setGoodsSkuSid(wmsGoodsTag.getGoodsSkuSid()); - wmsInventorySaveDto.setGoodsSkuTitle(wmsGoodsTag.getGoodsSkuTitle()); - wmsInventorySaveDto.setGoodsSkuCode(wmsGoodsTag.getGoodsSkuCode()); - wmsInventorySaveDto.setGoodsSkuOwnSpec(wmsGoodsTag.getGoodsSkuOwnSpec()); - wmsInventorySaveDto.setUnit(wmsGoodsTag.getUnit()); - wmsInventorySaveDto.setCount(appFirstShelvesGoodsDto.getCount()); - wmsInventorySaveDto.setGoodsID(appFirstShelvesGoodsDto.getGoodsID()); - wmsInventorySaveDto.setManufacturerSid(wmsInitialDetail.getManufacturerSid()); - wmsInventorySaveDto.setManufacturerName(wmsInitialDetail.getManufacturerName()); - wmsInventorySaveDto.setFirstInDate(DateUtil.formatDate(wmsInitialDetail.getFirstInDate())); - wmsInventorySaveDto.setWarehouseSid(wmsHouseInfoVo.getWarehouseSid()); - wmsInventorySaveDto.setWarehouseName(wmsHouseInfoVo.getWarehouseName()); - wmsInventorySaveDto.setWarehouseRackSid(wmsHouseInfoVo.getWarehouseRackSid()); - wmsInventorySaveDto.setWarehouseRackCode(appFirstShelvesGoodsDto.getHouseCode()); - wmsInventoryFeign.saveWmsInventory(wmsInventorySaveDto).getData(); - } - return rb.success(); + public ResultBean save(List dto) { + return null; } } \ 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 98a1281ef2..0ba4b5f6de 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 @@ -1,5 +1,6 @@ package com.yxt.anrui.terminal.fegin.wmsInventory; +import com.yxt.anrui.terminal.api.as.storechange.AppStoreChangeDto; import com.yxt.anrui.terminal.api.wms.inventorySearch.InventorySearchQuery; import com.yxt.anrui.terminal.api.wms.inventorySearch.OldStorageVo; import com.yxt.anrui.terminal.api.wms.inventorySearch.StorageVo; @@ -49,4 +50,8 @@ public interface WmsInventoryFeign { @ApiOperation("根据商品ID和部门sid和仓库sid查询") @PostMapping("/selByGoodsIDAndUseOrgSidAndWarehouseSid") ResultBean> selByGoodsIDAndUseOrgSidAndWarehouseSid(@RequestParam("goodsID") String goodsID, @RequestParam("useOrgSid") String useOrgSid, @RequestParam("warehouseSid") String warehouseSid); + + @ApiOperation("库内移位保存") + @PostMapping("/saveKnyw") + ResultBean saveKnyw(List dto); } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventory/WmsStoreChangeDto.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventory/WmsStoreChangeDto.java new file mode 100644 index 0000000000..477717b722 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventory/WmsStoreChangeDto.java @@ -0,0 +1,18 @@ +package com.yxt.anrui.terminal.fegin.wmsInventory; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class WmsStoreChangeDto implements Dto { + + @ApiModelProperty("库存sid") + private String sid; + @ApiModelProperty("移位数量") + private String count; + @ApiModelProperty("最大移位数量") + private String maxCount; + @ApiModelProperty("移位库位sid") + private String houseCode2; +} 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 e2ddd0d1fe..3e5072b0bc 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 @@ -325,6 +325,12 @@ public class WmsInventoryRest { return wmsInventoryService.selByGoodsIDAndUseOrgSidAndWarehouseSid(goodsID, useOrgSid, warehouseSid); } + @ApiOperation("库内移位保存") + @PostMapping("/saveKnyw") + ResultBean saveKnyw(List dto){ + return wmsInventoryService.saveKnyw(dto); + } + //----------------------------- 报表 ----------------------------- @ApiOperation("滞销品查询") @PostMapping("/deadStockList") 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 a15e1efb4b..20f38fad1a 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 @@ -1417,4 +1417,34 @@ public class WmsInventoryService extends MybatisBaseService wmsInventoryList = baseMapper.selByGoodsIDAndUseOrgSidAndWarehouseSid(goodsID, useOrgSid, warehouseSid); return rb.success().setData(wmsInventoryList); } + + public ResultBean saveKnyw(List dto) { + for (WmsStoreChangeDto wmsStoreChangeDto : dto) { + String sid = wmsStoreChangeDto.getSid(); + WmsInventory wmsInventory = fetchBySid(sid); + WmsInventorySaveDto wmsInventorySaveDto = new WmsInventorySaveDto(); + wmsInventorySaveDto.setCreateBySid(wmsInventory.getCreateBySid()); + wmsInventorySaveDto.setCreateOrgSid(wmsInventory.getCreateOrgSid()); + wmsInventorySaveDto.setUseOrgSid(wmsInventory.getUseOrgSid()); + wmsInventorySaveDto.setFirstInDate(DateUtil.today()); + wmsInventorySaveDto.setGoodsSpuSid(wmsInventory.getGoodsSpuSid()); + wmsInventorySaveDto.setGoodsSpuName(wmsInventory.getGoodsSpuName()); + wmsInventorySaveDto.setGoodsSkuSid(wmsInventory.getGoodsSkuSid()); + wmsInventorySaveDto.setGoodsSkuTitle(wmsInventory.getGoodsSkuTitle()); + wmsInventorySaveDto.setGoodsSkuCode(wmsInventory.getGoodsSkuCode()); + wmsInventorySaveDto.setGoodsSkuOwnSpec(wmsInventory.getGoodsSkuOwnSpec()); + wmsInventorySaveDto.setUnit(wmsInventory.getUnit()); + wmsInventorySaveDto.setCount(wmsStoreChangeDto.getCount()); + wmsInventorySaveDto.setGoodsID(wmsInventory.getGoodsID()); + wmsInventorySaveDto.setManufacturerSid(wmsInventory.getManufacturerSid()); + wmsInventorySaveDto.setManufacturerName(wmsInventory.getManufacturerName()); + WmsHouseInfoVo houseInfoVo = wmsWarehouseRackService.selHouseInfoByFullCode(wmsStoreChangeDto.getHouseCode2()).getData(); + wmsInventorySaveDto.setWarehouseSid(houseInfoVo.getWarehouseSid()); + wmsInventorySaveDto.setWarehouseName(houseInfoVo.getWarehouseName()); + wmsInventorySaveDto.setWarehouseRackSid(houseInfoVo.getWarehouseRackSid()); + wmsInventorySaveDto.setWarehouseRackCode(houseInfoVo.getWarehouseRackCode()); + saveWmsInventory(wmsInventorySaveDto); + } + return null; + } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsStoreChangeDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsStoreChangeDto.java new file mode 100644 index 0000000000..0e2e151502 --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsStoreChangeDto.java @@ -0,0 +1,18 @@ +package com.yxt.wms.biz.inventory.wmsinventory; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class WmsStoreChangeDto implements Dto { + + @ApiModelProperty("库存sid") + private String sid; + @ApiModelProperty("移位数量") + private String count; + @ApiModelProperty("最大移位数量") + private String maxCount; + @ApiModelProperty("移位库位sid") + private String houseCode2; +}