zccbbg/wms-ruoyi
1
1
Fork 0
mirror of https://github.com/zccbbg/wms-ruoyi.git synced 2024-11-10 17:13:51 +08:00
Code Issues Projects Releases Packages Wiki Activity

修复体验账号密码;完善发货记录；修复无库区，货架 仓库筛选失败的问题

Browse source
This commit is contained in:
zhangcheng 2023-03-30 20:48:41 +08:00
parent 7e4134f190
commit 7447b364de
6 changed files with 29 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sql/结构和数据.sql
View file

@ -1040,9 +1040,10 @@ CREATE TABLE `sys_user` (
-- ----------------------------
-- Records of sys_user admin 密码和cyl一样
-- ----------------------------
INSERT INTO `sys_user` VALUES (1, 103, 'admin', '若依', '00', 'ry@163.com', '15888888888', '1', '', '$2a$10$f/LxZ5IyZTuArQyKDhSzbOB17dDiGzV.BSmbPcVVU62I2ryPhP82m', '0', '0', '153.37.195.162', '2022-11-07 02:39:09', 1, '2022-06-17 17:20:19.000', NULL, '2022-11-07 10:39:08.000', '管理员');
INSERT INTO `sys_user` VALUES (115, 100, 'cyl', 'cyl', '00', '', '', '0', '', '$2a$10$f/LxZ5IyZTuArQyKDhSzbOB17dDiGzV.BSmbPcVVU62I2ryPhP82m', '0', '0', '223.74.181.186', '2022-11-07 03:31:27', 1, '2022-11-04 17:06:20.000', NULL, '2022-11-07 11:31:27.000', NULL);
BEGIN;
INSERT INTO `sys_user` (`user_id`, `dept_id`, `user_name`, `nick_name`, `user_type`, `email`, `phonenumber`, `sex`, `avatar`, `password`, `status`, `del_flag`, `login_ip`, `login_date`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1, 103, 'admin', '若依', '00', 'ry@163.com', '15888888888', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', '2023-03-30 12:43:20', 1, '2022-06-17 17:20:19.000', NULL, '2023-03-30 12:43:20.000', '管理员');
INSERT INTO `sys_user` (`user_id`, `dept_id`, `user_name`, `nick_name`, `user_type`, `email`, `phonenumber`, `sex`, `avatar`, `password`, `status`, `del_flag`, `login_ip`, `login_date`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (115, 100, 'cyl', 'cyl', '00', '', '', '0', '', '$2a$10$Ci8A29XNcZT.4hJI8HkwO.r0rL0FPKuGAmvnsvAfUAFwLe/vpombG', '0', '0', '127.0.0.1', '2023-03-30 12:43:59', 1, '2022-11-04 17:06:20.000', 1, '2023-03-30 12:43:58.000', NULL);
COMMIT;
-- ----------------------------
-- Table structure for sys_user_post
-- ----------------------------

3
wms/src/main/java/com/cyl/wms/pojo/vo/form/ShipmentOrderFrom.java
View file

@ -2,6 +2,7 @@ package com.cyl.wms.pojo.vo.form;
import com.cyl.wms.domain.ShipmentOrder;
import com.cyl.wms.domain.ShipmentOrderDetail;
import com.cyl.wms.pojo.vo.DeliveryVO;
import com.cyl.wms.pojo.vo.ItemVO;
import com.cyl.wms.pojo.vo.ShipmentOrderDetailVO;
import lombok.Data;
@ -14,4 +15,6 @@ public class ShipmentOrderFrom extends ShipmentOrder {
private List<ShipmentOrderDetailVO> details;
// 所有商品
private List<ItemVO> items;
// 物流信息
private List<DeliveryVO> delivery;
}

10
wms/src/main/java/com/cyl/wms/service/AreaService.java
View file

@ -1,10 +1,7 @@
package com.cyl.wms.service;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.*;
import java.time.LocalDateTime;
import java.util.Set;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.cyl.wms.domain.Warehouse;
@ -110,8 +107,11 @@ public class AreaService {
}
public List<Area> selectByIdIn(Collection<Long> ids) {
if (ids.isEmpty()) {
return new ArrayList<>();
}
QueryWrapper<Area> qw = new QueryWrapper<>();
qw.in("id",ids);
qw.in("id", ids);
return areaMapper.selectList(qw);
}
}

2
wms/src/main/java/com/cyl/wms/service/DeliveryService.java
View file

@ -5,6 +5,8 @@ import java.util.Arrays;
import java.util.List;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.cyl.wms.convert.DeliveryConvert;
import com.cyl.wms.pojo.vo.DeliveryVO;
import com.github.pagehelper.PageHelper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;

9
wms/src/main/java/com/cyl/wms/service/RackService.java
View file

@ -1,10 +1,7 @@
package com.cyl.wms.service;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.*;
import java.time.LocalDateTime;
import java.util.Set;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.cyl.wms.domain.Warehouse;
@ -114,8 +111,10 @@ public class RackService {
}
public List<Rack> selectByIdIn(Collection<Long> ids) {
if (ids.isEmpty())
return new ArrayList<>();
QueryWrapper<Rack> qw = new QueryWrapper<>();
qw.in("id",ids);
qw.in("id", ids);
return rackMapper.selectList(qw);
}
}

11
wms/src/main/java/com/cyl/wms/service/ShipmentOrderService.java
View file

@ -9,10 +9,12 @@ import java.util.stream.Collectors;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.cyl.wms.constant.ShipmentOrderConstant;
import com.cyl.wms.convert.DeliveryConvert;
import com.cyl.wms.convert.ShipmentOrderConvert;
import com.cyl.wms.convert.ShipmentOrderDetailConvert;
import com.cyl.wms.domain.*;
import com.cyl.wms.mapper.ShipmentOrderDetailMapper;
import com.cyl.wms.pojo.query.DeliveryQuery;
import com.cyl.wms.pojo.query.ItemQuery;
import com.cyl.wms.pojo.query.ShipmentOrderDetailQuery;
import com.cyl.wms.pojo.vo.*;
@ -56,6 +58,10 @@ public class ShipmentOrderService {
@Autowired
private ItemService itemService;
@Autowired
private DeliveryConvert deliveryConvert;
@Autowired
private DeliveryService deliveryService;
@Autowired
private InventoryHistoryService inventoryHistoryService;
@Autowired
private InventoryService inventoryService;
@ -84,6 +90,11 @@ public class ShipmentOrderService {
List<Item> list = itemService.selectList(query1, null);
List<ItemVO> items = itemService.toVos(list);
form.setItems(items);
DeliveryQuery deliveryQuery = new DeliveryQuery();
deliveryQuery.setShipmentOrderId(id);
List<Delivery> deliveries = deliveryService.selectList(deliveryQuery, null);
form.setDelivery(deliveryConvert.dos2vos(deliveries));
}
return form;
}