ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkController.java
@@ -43,7 +43,7 @@ @PostMapping("/addSlVolumeProductionCk") @ApiOperation(value = "添加出库") public R addSlVolumeProductionCk(@RequestBody AddSlVolumeProductionCkDTO addSlVolumeProductionCkDTO) { public R addSlVolumeProductionCk(@RequestBody List<AddSlVolumeProductionCkDTO> addSlVolumeProductionCkDTO) { slVolumeProductionCkService.addSlVolumeProductionCk(addSlVolumeProductionCkDTO); return R.ok(); } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java
@@ -15,6 +15,7 @@ import javax.annotation.Resource; import java.util.List; import java.util.Map; /** * <p> @@ -40,8 +41,9 @@ @PostMapping("/addSlVolumeProductionRk") @ApiOperation(value = "添加入库批次管理") public R addVolumeProductionRkgl(@RequestBody SlVolumeProductionRkListDTO slVolumeProductionRkListDTO) { slVolumeProductionRkService.addVolumeProductionRkgl(slVolumeProductionRkListDTO); public R addVolumeProductionRkgl(@RequestBody Map<String, List<SlVolumeProductionRkListDTO>> slVolumeProductionRkListDTO1) { List<SlVolumeProductionRkListDTO> schools = slVolumeProductionRkListDTO1.get("slVolumeProductionRkListDTO"); slVolumeProductionRkService.addVolumeProductionRkgl(schools); return R.ok(); }
@@ -44,6 +44,8 @@ private SlAuditMapper slAuditMapper; @PostMapping("/getSupplierVolumeProductionRkglList") @ApiOperation(value = "分页获取供应商关联入库") public R<PageDTO<SupplierVolumeProductionRkglVO>> getSupplierVolumeProductionRkglList(@RequestBody SupplierVolumeProductionRkglQuery supplierVolumeProductionRkglQuery) { ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlGoodsShelf.java
@@ -75,5 +75,13 @@ @TableField("update_time") private Date updateTime; @ApiModelProperty("货架在图片坐标宽") @TableField("width") private String width; @ApiModelProperty("货架在图片坐标高") @TableField("height") private String height; } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/AddSlVolumeProductionCkDTO.java
@@ -1,5 +1,6 @@ package com.ruoyi.management.domain.dto; import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -13,5 +14,15 @@ private Long ckgl_id; @ApiModelProperty("入库批次") private List<Long> rkId; private Long rkId; @ApiModelProperty("出库数量") @TableField("ck_num") private Integer ckNum; @ApiModelProperty("归还数量") @TableField("guih_num") private Integer guihNum; } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/GoodsShelfDTO.java
@@ -3,22 +3,39 @@ import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import jdk.internal.dynalink.beans.StaticClass; import lombok.Data; import java.util.List; @Data @ApiModel("货物管理放置数据传输对象") @ApiModel("图片放置数据传输对象") public class GoodsShelfDTO { private Long id; @ApiModelProperty("图片id") private Long imgId; @ApiModelProperty("仓库在图片坐标X轴") private String zbX; @ApiModelProperty("仓库在图片坐标y轴") private String zbY; @ApiModelProperty("仓库层数 1代表一层，2代表两层，3代表三层") private Integer storeManagementNumber; @ApiModelProperty("货架图片数据") List<ShelfDTO> shelfDTOS; @Data public static class ShelfDTO { private Long id; @ApiModelProperty("仓库在图片坐标X轴") private String zbX; @ApiModelProperty("仓库在图片坐标y轴") private String zbY; @ApiModelProperty("仓库在图片宽") private String width; @ApiModelProperty("仓库在图片高") private String height; } } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlVolumeProductionRkListDTO.java
@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; import java.util.List; @Data @@ -14,9 +15,37 @@ private Long VolumeProductionRkglId; @ApiModelProperty("物资id") private List<Long> materialsId; private Long materialsId; @ApiModelProperty("仓库ID") private Long managementId; @ApiModelProperty("入库数量") private Long rkNum; @ApiModelProperty("入库编号") private String rkNumber; @ApiModelProperty("入库型号") private String rkModel; @ApiModelProperty("入库价格") private BigDecimal rkPice; @ApiModelProperty("仓库层数 1代表一层，2代表两层，3代表三层") private Integer storeManagementNumber; @ApiModelProperty("货架id") private Long shelfId; @ApiModelProperty("二维码数量") private Integer erwmNum; @ApiModelProperty("入库管理id") private Long rkgl_id; } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionCkService.java
@@ -26,7 +26,7 @@ PageDTO<ManagementimgSlVolumeProductionCkVO> getManagementimgSlVolumeProductionCkList(SlGoodsMaterialsSlVolumeProductionRkQuery slGoodsMaterialsSlVolumeProductionRkQuery); void updSlVolumeProductionCk(List<SlVolumeProductionCkDTO>slVolumeProductionCkDTO); void addSlVolumeProductionCk(AddSlVolumeProductionCkDTO addSlVolumeProductionCkDTO); void addSlVolumeProductionCk(List<AddSlVolumeProductionCkDTO> addSlVolumeProductionCkDTO); PageDTO<ManagementimgVolumeProductionCkVO> getSlVolumeProductionCkList(ManagementimgVolumeProductionCkQuery managementimgVolumeProductionCkQuery); ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkService.java
@@ -26,7 +26,7 @@ PageDTO<ManagementimgVolumeProductionRkVO> getSlGoodsMaterialsSlVolumeProductionRkList(SlGoodsMaterialsSlVolumeProductionRkQuery SlGoodsMaterialsSlVolumeProductionRkDTO); void addVolumeProductionRkgl(@RequestBody SlVolumeProductionRkListDTO slVolumeProductionRkListDTO); void addVolumeProductionRkgl(@RequestBody List<SlVolumeProductionRkListDTO> slVolumeProductionRkListDTO); void uplSlVolumeProductionRk(@RequestBody List<SlVolumeProductionRkDTO> SlVolumeProductionRkDTO);
@@ -39,7 +39,7 @@ Page<SlEquipment> page = new Page<>(slEquipmentQuery.getPageCurr(), slEquipmentQuery.getPageSize()); LambdaQueryWrapper< SlEquipment> wrapper= Wrappers.lambdaQuery(); if(slEquipmentQuery.getEquipmentName()!=null&&slEquipmentQuery.getEquipmentName()!=""){ wrapper.eq(SlEquipment::getEquipmentName,slEquipmentQuery.getEquipmentName()); wrapper.like(SlEquipment::getEquipmentName,slEquipmentQuery.getEquipmentName()); } if(slEquipmentQuery.getEquipmentName()!=null&&slEquipmentQuery.getType()!=0){ wrapper.eq(SlEquipment::getType,slEquipmentQuery.getType()); @@ -51,6 +51,7 @@ List<SlEquipmentVO> list = slEquipmentVOPageDTO.getList(); for (SlEquipmentVO sl:list){ SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(sl.getManagementId()); sl.setStoreManagementName(slStoreManagement.getStoreManagementName()); sl.setCountyCode(slStoreManagement.getCountyCode()); sl.setProvinceName(slStoreManagement.getProvinceName()); sl.setProvinceCode(slStoreManagement.getProvinceCode()); ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java
@@ -130,7 +130,7 @@ SlGoodsShelf byId1 = this.getById(id); SlGoodsShelfVO slGoodsShelfVO=new SlGoodsShelfVO(); BeanUtils.copyProperties(byId1,slGoodsShelfVO.getClass()); slGoodsShelfVO.setGoodsShelfName(byId1.getGoodsShelfName()); SlStoreManagement byId = SlStoreManagementService.getById(byId1.getStoreManagementId()); slGoodsShelfVO.setStoreManagementId(byId1.getStoreManagementId()); slGoodsShelfVO.setStoreManagementName(byId.getStoreManagementName()); @@ -161,12 +161,17 @@ @Override public void fanzGoodsShelfList(GoodsShelfDTO goodsShelfDTO) { SlGoodsShelf slGoodsShelf = this.getById(goodsShelfDTO.getId()); slGoodsShelf.setImgId(goodsShelfDTO.getImgId()); slGoodsShelf.setIsStoreManagement(2); slGoodsShelf.setZbX(goodsShelfDTO.getZbX()); slGoodsShelf.setZbY(goodsShelfDTO.getZbY()); this.updateById(slGoodsShelf); for(GoodsShelfDTO.ShelfDTO g:goodsShelfDTO.getShelfDTOS()){ SlGoodsShelf slGoodsShelf = this.getById(g.getId()); slGoodsShelf.setImgId(goodsShelfDTO.getImgId()); slGoodsShelf.setIsStoreManagement(2); slGoodsShelf.setZbX(g.getZbX()); slGoodsShelf.setZbY(g.getZbY()); slGoodsShelf.setWidth(g.getWidth()); slGoodsShelf.setHeight(g.getHeight()); this.updateById(slGoodsShelf); } } @Override ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlStoreManagementServiceImpl.java
@@ -155,9 +155,13 @@ if (StoreManagementQuery.getCountyCode()!="" && StoreManagementQuery.getCountyCode()!=null){ wrapper.eq(SlStoreManagement::getCountyCode,StoreManagementQuery.getCountyCode()); } if (StoreManagementQuery.getStoreManagementGrade()!=0 && StoreManagementQuery.getStoreManagementGrade()!=null){ if (StoreManagementQuery.getStoreManagementGrade()!=null&&StoreManagementQuery.getStoreManagementGrade()!=0 ){ wrapper.eq(SlStoreManagement::getStoreManagementGrade,StoreManagementQuery.getStoreManagementGrade()); } if (StoreManagementQuery.getStoreManagementGrade()!=null&&StoreManagementQuery.getStoreManagementGrade()!=0 ){ wrapper.eq(SlStoreManagement::getStoreManagementGrade,StoreManagementQuery.getStoreManagementGrade()); } wrapper.eq( SlStoreManagement::getDelFlag,0); wrapper.orderByDesc(SlStoreManagement::getCreateTime); List<SlStoreManagement> page1 = this.list(wrapper); ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkServiceImpl.java
@@ -77,15 +77,16 @@ } @Override public void addSlVolumeProductionCk(AddSlVolumeProductionCkDTO addSlVolumeProductionCkDTO) { List<Long> rkId = addSlVolumeProductionCkDTO.getRkId(); for (Long m:rkId){ SlVolumeProductionRk slVolumeProductionRk = slVolumeProductionRkMapper.selectById(m); public void addSlVolumeProductionCk(List<AddSlVolumeProductionCkDTO> addSlVolumeProductionCkDTO) { for (AddSlVolumeProductionCkDTO m:addSlVolumeProductionCkDTO){ SlVolumeProductionRk slVolumeProductionRk = slVolumeProductionRkMapper.selectById(m.getRkId()); SlVolumeProductionCk slVolumeProductionCk=new SlVolumeProductionCk(); slVolumeProductionCk.setRkId(m); slVolumeProductionCk.setCkglId(addSlVolumeProductionCkDTO.getCkgl_id()); slVolumeProductionCk.setRkId(m.getRkId()); slVolumeProductionCk.setCkglId(m.getCkgl_id()); slVolumeProductionCk.setState(1); slVolumeProductionCk.setType(1); slVolumeProductionCk.setCkNum(m.getCkNum()); slVolumeProductionCk.setGuihNum(m.getGuihNum()); slVolumeProductionCk.setMaterialsId(slVolumeProductionRk.getMaterialsId()); this.save(slVolumeProductionCk); } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkglServiceImpl.java
@@ -15,6 +15,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.domain.getVolumeProductionRkQuery; import com.ruoyi.system.api.feignClient.LogClient; import com.ruoyi.system.api.feignClient.SysUserClient; import io.swagger.models.auth.In; import org.springframework.stereotype.Service; @@ -53,6 +54,9 @@ @Resource private ManagementGoodsMaterialsMapper managementGoodsMaterialsMapper; @Resource private LogClient logClient; @Override public PageDTO<VolumeProductionCkglVO> getslVolumeProductionCkglList(getslVolumeProductionCkglQuery VolumeProductionCkglQuery) { @@ -231,6 +235,8 @@ SlVolumeProductionCkgl byId = this.getById(id); byId.setAuditStatus(6); this.updateById(byId); logClient.savelong1(); } @Override ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java
@@ -104,14 +104,30 @@ } @Override public void addVolumeProductionRkgl(SlVolumeProductionRkListDTO slVolumeProductionRkListDTO) { List<Long> materialsId = slVolumeProductionRkListDTO.getMaterialsId(); for (Long m:materialsId){ public void addVolumeProductionRkgl(List<SlVolumeProductionRkListDTO> slVolumeProductionRkListDTO) { for (SlVolumeProductionRkListDTO m:slVolumeProductionRkListDTO){ SlVolumeProductionRk slVolumeProductionRk=new SlVolumeProductionRk(); slVolumeProductionRk.setVolumeProductionRkglId(slVolumeProductionRkListDTO.getVolumeProductionRkglId()); slVolumeProductionRk.setMaterialsId(m); slVolumeProductionRk.setManagementId(slVolumeProductionRkListDTO.getManagementId()); slVolumeProductionRk.setVolumeProductionRkglId(m.getVolumeProductionRkglId()); slVolumeProductionRk.setMaterialsId(m.getMaterialsId()); slVolumeProductionRk.setManagementId(m.getManagementId()); slVolumeProductionRk.setRkNumber("CD-"+new Date().getTime()); if ( m.getErwmNum()!=null){ slVolumeProductionRk.setErwmNum( m.getErwmNum()); }if ( m.getRkPice()!=null){ slVolumeProductionRk.setRkPice( m.getRkPice()); }if ( m.getRkNum()!=null){ slVolumeProductionRk.setRkNum( m.getRkNum()); }if ( m.getShelfId()!=null){ slVolumeProductionRk.setShelfId( m.getShelfId()); }if ( m.getRkModel()!=null){ slVolumeProductionRk.setRkModel( m.getRkModel()); }if ( m.getStoreManagementNumber()!=null){ slVolumeProductionRk.setStoreManagementNumber( m.getStoreManagementNumber()); }if ( m.getRkNumber()!=null){ slVolumeProductionRk.setRkNumber( m.getRkNumber()); } this.save(slVolumeProductionRk); }
@@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.domain.getVolumeProductionRkQuery; import com.ruoyi.system.api.feignClient.LogClient; import com.ruoyi.system.api.feignClient.SysUserClient; import org.springframework.stereotype.Service; @@ -56,6 +57,9 @@ @Resource private ManagementGoodsMaterialsMapper managementGoodsMaterialsMapper; @Resource private LogClient logClient; @Override public PageDTO<SupplierVolumeProductionRkglVO> getSupplierVolumeProductionRkglList(SupplierVolumeProductionRkglQuery supplierVolumeProductionRkglQuery) { @@ -127,7 +131,9 @@ list.setNickName(data.getNickName()); list.setPhonenumber(data.getPhonenumber()); SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(list.getManagementId()); list.setStoreManagementName(slStoreManagement.getStoreManagementName()); if (slStoreManagement!=null){ list.setStoreManagementName(slStoreManagement.getStoreManagementName()); } } return SlGoodsShelfDTO; } @@ -279,6 +285,8 @@ byId.setAuditStatus(6); byId.setEndTime(new Date()); this.updateById(byId); logClient.savelong(); } }
