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 cc4e56b342..f638d7ac9e 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 @@ -33,8 +33,8 @@ import com.yxt.anrui.terminal.fegin.wmsInventory.WmsInventorySaveDto; import com.yxt.anrui.terminal.fegin.wmsgoodstag.GoodsTagListQuery; import com.yxt.anrui.terminal.fegin.wmsgoodstag.WmsGoodsTag; import com.yxt.anrui.terminal.fegin.wmsgoodstag.WmsGoodsTagFeign; +import com.yxt.anrui.terminal.fegin.wmsinitialdetail.WmsInitialDetail; import com.yxt.anrui.terminal.fegin.wmsinitialdetail.WmsInitialDetailFeign; -import com.yxt.anrui.terminal.fegin.wmsinitialdetail.WmsInitialDetailVo; import com.yxt.anrui.terminal.fegin.wmswarehouserack.WmsHouseInfoVo; import com.yxt.anrui.terminal.fegin.wmswarehouserack.WmsWarehouseRackFeign; import com.yxt.common.core.query.PagerQuery; @@ -54,11 +54,11 @@ public class AppFirstShelvesService { @Resource private WmsGoodsTagFeign wmsGoodsTagFeign; @Resource - private WmsInitialDetailFeign wmsInitialDetailFeign; - @Resource private WmsWarehouseRackFeign wmsWarehouseRackFeign; @Resource private WmsInventoryFeign wmsInventoryFeign; + @Resource + private WmsInitialDetailFeign wmsInitialDetailFeign; @Autowired private SysStaffOrgFeign sysStaffOrgFeign; @@ -98,15 +98,21 @@ public class AppFirstShelvesService { if (content.contains("#")) { return rb.setMsg("请扫描商品码"); } - WmsInitialDetailVo wmsInitialDetailVo = wmsInitialDetailFeign.selByGoodsID(content).getData(); - if (wmsInitialDetailVo == null){ - return rb.setMsg("该商品不属于期初上架"); + String count = wmsInventoryFeign.selCountByGoodsID(content).getData(); + BigDecimal num = null; + if (StringUtils.isNotBlank(count)){ + num = new BigDecimal(count); + }else { + num = new BigDecimal("0"); + } + WmsGoodsTag wmsGoodsTag = wmsGoodsTagFeign.selectByGoodsId(content).getData(); + BigDecimal chae = wmsGoodsTag.getGoodsCount().subtract(num); + if (chae.compareTo(BigDecimal.ZERO) == 0){ + return rb.setMsg("该商品已全部入库"); } - BigDecimal count = new BigDecimal(wmsInventoryFeign.selCountByGoodsID(content).getData()); - BigDecimal chae = wmsInitialDetailVo.getNum().subtract(count); appFirstShelvesScanVo.setType(type); appFirstShelvesScanVo.setGoodsID(content); - appFirstShelvesScanVo.setGoodsName(wmsInitialDetailVo.getGoodsSpuName()); + appFirstShelvesScanVo.setGoodsName(wmsGoodsTag.getGoodsSkuTitle()); appFirstShelvesScanVo.setGoodsMax(chae.setScale(0,BigDecimal.ROUND_DOWN).toString()); } else if ("1".equals(type)) {//库位码 if (!content.contains("#")) { @@ -156,9 +162,25 @@ public class AppFirstShelvesService { 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()); - wmsInventorySaveDto.setCount(appFirstShelvesGoodsDto.getCount()); wmsInventoryFeign.saveWmsInventory(wmsInventorySaveDto).getData(); } return rb.success(); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsgoodstag/WmsGoodsTagFeign.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsgoodstag/WmsGoodsTagFeign.java index 194112801b..ba01bafb41 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsgoodstag/WmsGoodsTagFeign.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsgoodstag/WmsGoodsTagFeign.java @@ -7,6 +7,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; /** * @Author @@ -22,4 +23,8 @@ public interface WmsGoodsTagFeign { @PostMapping("goodsTagList") @ApiOperation("商品标签列表") ResultBean> goodsTagList(@RequestBody PagerQuery pagerQuery); + + @ApiOperation("根据商品ID查询标签信息") + @PostMapping("/selectByGoodsId") + public ResultBean selectByGoodsId(@RequestParam("oldGoodsId") String oldGoodsId); } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinitialdetail/WmsInitialDetailVo.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinitialdetail/WmsInitialDetail.java similarity index 61% rename from anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinitialdetail/WmsInitialDetailVo.java rename to anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinitialdetail/WmsInitialDetail.java index 2c010cf23b..a1b5afcb4c 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinitialdetail/WmsInitialDetailVo.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinitialdetail/WmsInitialDetail.java @@ -26,7 +26,7 @@ package com.yxt.anrui.terminal.fegin.wmsinitialdetail; import com.fasterxml.jackson.annotation.JsonFormat; -import com.yxt.common.core.vo.Vo; +import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -35,40 +35,55 @@ import java.math.BigDecimal; import java.util.Date; @Data -@ApiModel(value = "期初上架-明细 视图数据对象", description = "期初上架-明细 视图数据对象") -public class WmsInitialDetailVo implements Vo { - - private String sid; +@ApiModel(value = "期初上架-明细", description = "期初上架-明细") +public class WmsInitialDetail extends BaseEntity { + private static final long serialVersionUID = 1L; + @ApiModelProperty("单据sid") + private String billSid; // 单据sid + @ApiModelProperty("商品spuSid") + private String goodsSpuSid; // 商品spuSid @ApiModelProperty("商品spu名称") - private String goodsSpuName; + private String goodsSpuName; // 商品spu名称 + @ApiModelProperty("商品skuSid") + private String goodsSkuSid; // 商品skuSid + @ApiModelProperty("商品sku名称") + private String goodsSkuTitle; // 商品Sku名称 @ApiModelProperty("图号") - private String goodsSkuCode; + private String goodsSkuCode; // 图号 @ApiModelProperty("规格型号") - private String goodsSkuOwnSpec; + private String goodsSkuOwnSpec; // 规格型号 @ApiModelProperty("单位") - private String unit; + private String unit; // 单位 @ApiModelProperty("数量") - private BigDecimal num; + private BigDecimal num; // 数量 + @ApiModelProperty("品牌sid") + private String brandSid; // 品牌sid @ApiModelProperty("品牌名称") - private String brandName; + private String brandName; // 品牌名称 + @ApiModelProperty("厂家sid") + private String manufacturerSid; // 厂家sid @ApiModelProperty("厂家名称") - private String manufacturerName; + private String manufacturerName; // 厂家名称 @ApiModelProperty("供应商名称") - private String supplierName; + private String supplierName; // 供应商名称 @ApiModelProperty("销售指导价") - private BigDecimal saleGuidePrice; + private BigDecimal saleGuidePrice; // 销售指导价 @ApiModelProperty("入库单价") - private BigDecimal inCost; + private BigDecimal inCost; // 入库单价 @ApiModelProperty("税率") - private String taxRate; + private String taxRate; // 税率 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("首次入库日期") - private Date firstInDate; + private Date firstInDate; // 首次入库日期 + @ApiModelProperty("商品类别sid") + private String goodsTypeSid; // 商品类别sid + @ApiModelProperty("商品类别编码") + private String goodsTypeCode; // 商品类别编码 @ApiModelProperty("商品类别名称") - private String goodsTypeName; + private String goodsTypeName; // 商品类别名称 @ApiModelProperty("已上架数量") - private BigDecimal listNum; + private BigDecimal listNum; // 已上架数量 @ApiModelProperty("是否为一物一码") private Integer isYwym; @ApiModelProperty("是否已上传商品标签") diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinitialdetail/WmsInitialDetailFeign.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinitialdetail/WmsInitialDetailFeign.java index 1128dafbda..2a85754d4e 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinitialdetail/WmsInitialDetailFeign.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinitialdetail/WmsInitialDetailFeign.java @@ -20,8 +20,8 @@ import org.springframework.web.bind.annotation.ResponseBody; path = "v1/wmsinitialdetail") public interface WmsInitialDetailFeign { - @PostMapping("/selByGoodsID") + @PostMapping("/selBySid") @ResponseBody - @ApiOperation(value = "根据商品ID查询") - public ResultBean selByGoodsID(@RequestParam("goodsID") String goodsID); + @ApiOperation(value = "根据sid查询") + public ResultBean selBySid(@RequestParam("sid") String sid); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInitialDetailRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInitialDetailRest.java index be4f7388bc..e8089cb019 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInitialDetailRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInitialDetailRest.java @@ -28,6 +28,7 @@ package com.yxt.wms.apiadmin.inventroy; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.inventory.wmsinitialdetail.WmsInitialDetail; import com.yxt.wms.biz.inventory.wmsinitialdetail.WmsInitialDetailQuery; import com.yxt.wms.biz.inventory.wmsinitialdetail.WmsInitialDetailService; import com.yxt.wms.biz.inventory.wmsinitialdetail.WmsInitialDetailVo; @@ -51,4 +52,13 @@ public class WmsInitialDetailRest { PagerVo pv = wmsInitialDetailService.listPageVo(pq); return rb.success().setData(pv); } + + @PostMapping("/selBySid") + @ResponseBody + @ApiOperation(value = "根据sid查询") + public ResultBean selBySid(@RequestParam("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + WmsInitialDetail wmsInitialDetail = wmsInitialDetailService.fetchBySid(sid); + return rb.success().setData(wmsInitialDetail); + } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInitialRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInitialRest.java index 07a11c6238..3697ac5aa0 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInitialRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInitialRest.java @@ -35,7 +35,6 @@ import com.yxt.wms.biz.inventory.wmsinitialdetail.WmsInitialDetail; import com.yxt.wms.biz.inventory.wmsinitialdetail.WmsInitialDetailService; import com.yxt.wms.biz.inventory.wmsinitialdetail.WmsInitialDetailVo; import com.yxt.wms.feign.base.basegoodspu.BaseGoodsSpuFeign; -import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuFeign; import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo; import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign; @@ -54,7 +53,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.annotation.Resource; import java.io.IOException; import java.io.InputStream; import java.math.BigDecimal; @@ -191,13 +189,6 @@ public class WmsInitialRest { return wmsInitialDetailService.generateGoodsTag(sids); } - @PostMapping("/selByGoodsID") - @ResponseBody - @ApiOperation(value = "根据商品ID查询") - public ResultBean selByGoodsID(@RequestParam("goodsID") String goodsID) { - return wmsInitialDetailService.selByGoodsID(goodsID); - } - private ReturnExcelInfo getSheetVal(Sheet sheet, int[] resultCell, String deptSid) { ReturnExcelInfo importReturn = new ReturnExcelInfo(); List importVoList = new ArrayList<>(); diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagService.java index 8cfdb91f6a..f9380f3d79 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsgoodstag/WmsGoodsTagService.java @@ -92,7 +92,9 @@ public class WmsGoodsTagService extends MybatisBaseService wrapper.like("t.goodsSkuTitle", query.getName()) + .or().like("t.goodsSkuCode", query.getName()) + ); } qw.orderByDesc("t.createTime"); IPage page = PagerUtil.queryToPage(pagerQuery); diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailMapper.java index 8ab17ecc9a..cbeff898bf 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailMapper.java @@ -43,7 +43,4 @@ public interface WmsInitialDetailMapper extends BaseMapper { @Update("update wms_initial_detail set isScbq = 1 where sid = #{sid}") void updateIsScbq(String sid); - - @Select("select * from wms_initial_detail where goodsID = #{goodsID}") - WmsInitialDetailVo selByGoodsID(String goodsID); } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailService.java index 8b0f822fe8..2a56ae8276 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinitialdetail/WmsInitialDetailService.java @@ -199,10 +199,4 @@ public class WmsInitialDetailService extends MybatisBaseService selByGoodsID(String goodsID) { - ResultBean rb = ResultBean.fireFail(); - WmsInitialDetailVo wmsInitialDetailVo = baseMapper.selByGoodsID(goodsID); - return rb.success().setData(wmsInitialDetailVo); - } } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java index 72419281bc..cd30fbebed 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java @@ -1321,8 +1321,8 @@ public class WmsShelfBillService extends MybatisBaseService list = new ArrayList<>(); for (String sid : sids) { GoodsTag goodsTag = new GoodsTag(); - WmsGoodsTag wmsGoodsTag = wmsGoodsTagService.selectByGoodsId(sid); - goodsTag.setQrText(sid); + WmsGoodsTag wmsGoodsTag = wmsGoodsTagService.fetchBySid(sid); + goodsTag.setQrText(wmsGoodsTag.getGoodsID()); goodsTag.setText1(wmsGoodsTag.getGoodsSkuTitle()); goodsTag.setText2(wmsGoodsTag.getGoodsSkuCode()); goodsTag.setText3(DateUtil.formatDate(wmsGoodsTag.getCreateTime()));