open_platform/ss-common-storage
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

入库预约

Browse Source
This commit is contained in:
wangpengfei
2024-08-02 08:46:02 +08:00
parent ec5326330c
commit 97129bbd62
14 changed files with 147 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/yxt/warehouse/apiadmin/PurchaseInventoryBillRest.java Normal file
View File

@@ -0,0 +1,8 @@
package com.yxt.warehouse.apiadmin;
/**
* @author wangpengfei
* @date 2024/8/1 17:46
*/
public class PurchaseInventoryBillRest {
}

4
src/main/java/com/yxt/warehouse/apiadmin/WarehouseAnsBillDetailsRest.java
View File

@@ -17,7 +17,7 @@ import java.util.List;
*/
@Api(tags = "预期到货通知单明细")
@RestController
@RequestMapping("/apiadmin/wmsansbilldetails")
@RequestMapping("/apiadmin/warehouseansbillDetail")
public class WarehouseAnsBillDetailsRest {
@Autowired
@@ -30,7 +30,7 @@ public class WarehouseAnsBillDetailsRest {
}
@ApiOperation("根据sid查询详情")
@PostMapping("/selectByBillSid/{sid}")
public ResultBean<PagerVo<WarehouseAnsBillDetailVo>> selectByBillSid(@PathVariable("sid") String sid){
public ResultBean<List<WarehouseAnsBillDetailVo>> selectByBillSid(@PathVariable("sid") String sid){
ResultBean rb= new ResultBean().fail();
List<WarehouseAnsListDetailsVo>warehouseAnsListDetailsVos= warehouseAnsBillDetailService.selectByBillSid(sid);
return rb.success().setData(warehouseAnsListDetailsVos);

10
src/main/java/com/yxt/warehouse/apiadmin/WarehouseRackRest.java
View File

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.warehouse.biz.warehousearea.WarehouseAreaAllVo;
import com.yxt.warehouse.biz.warehouserack.*;
import com.yxt.warehouse.utils.OrgPathQuery;
import io.swagger.annotations.Api;
@@ -12,6 +13,8 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* @author wangpengfei
* @date 2024/2/28 8:59
@@ -65,4 +68,11 @@ public class WarehouseRackRest {
public ResultBean updateIsEnable(@PathVariable("sid") String sid,@PathVariable("isEnable")String isEnable) {
return wmsWarehouseRackService.updateIsEnable(sid,isEnable);
}
@ApiOperation("根据仓库sid查询所有库位")
@GetMapping("/selectAll")
public ResultBean<List<WarehouseAreaAllVo>> selectAll(@RequestParam("ckSid") String ckSid){
ResultBean rb = ResultBean.fireFail();
List<WarehouseRackVo> vo = wmsWarehouseRackService.selectAll(ckSid);
return rb.success().setData(vo);
}
}

3
src/main/java/com/yxt/warehouse/biz/operationrecord/OperationRecordVo.java
View File

@@ -22,4 +22,7 @@ public class OperationRecordVo {
private String userName;
@ApiModelProperty("内容")
private String content;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("创建时间")
private Date createTime;
}

8
src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBill.java
View File

@@ -20,10 +20,8 @@ public class WarehouseAnsBill extends BaseEntity {
private Date applicationTime;
@ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("业务类型key（采购预约、调拨预约、其他预约）")
@ApiModelProperty("业务类型key（0 采购入库、1验货入库、2其他入库）")
private String busTypeKey;
@ApiModelProperty("业务类型value（采购预约、调拨预约、其他预约）")
private String busTypeValue;
@ApiModelProperty("交接状态")
private String handoverStatus;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@@ -54,6 +52,10 @@ public class WarehouseAnsBill extends BaseEntity {
private String contact;
@ApiModelProperty("联系电话")
private String mobile;
@ApiModelProperty("承运商")
private String carrier;
@ApiModelProperty("运单号")
private String waybillNumber;
@ApiModelProperty("使用组织sid")
private String useOrgSid;
@ApiModelProperty("创建组织sid")

6
src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillDto.java
View File

@@ -63,6 +63,12 @@ public class WarehouseAnsBillDto {
@ApiModelProperty("创建组织sid")
private String createOrgSid;
private String userSid;
private String userName;
private String remarks;
private String rackSid;
@ApiModelProperty("承运商")
private String carrier;
@ApiModelProperty("运单号")
private String waybillNumber;
private List<WarehouseAnsBillDetailDto> StorageAnsBillDetailList = new ArrayList<>();
}

1
src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillMapper.java
View File

@@ -27,4 +27,5 @@ public interface WarehouseAnsBillMapper extends BaseMapper<WarehouseAnsBill> {
List<WarehouseAnsBillExcelVo> listExcel3(@Param("sids")String[]sids);
WarehouseAnsDetailsVo details(String sid);
String selectNum(String billNo);
}

30
src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillMapper.xml
View File

@@ -10,9 +10,30 @@
</select>
<select id="listPages" resultType="com.yxt.warehouse.biz.warehouseansbill.WarehouseAnsBillVo">
select wab.*
select distinct wab.*,
CASE
wab.billState
WHEN 0 THEN
'在途'
WHEN 1 THEN
'部分收货'
WHEN 2 THEN
'收货完成'
WHEN 3 THEN
'关闭'
END AS billStateValue,
CASE wab.handoverStatus
WHEN 1 THEN '未交接'
WHEN 2 THEN '已交接'
END AS handoverStatusValue,
case wab.busTypeKey
when 0 then '采购入库'
when 1 then '验货入库'
when 2 then '其他入库'
end as busTypeKeyValue
from warehouse_ans_bill wab
LEFT JOIN ss_user.sys_organization as s ON wab.useOrgSid = s.sid
left join warehouse_ans_bill_detail wabd on wab.sid =wabd.billSid
<where>
${ew.sqlSegment}
</where>
@@ -57,4 +78,11 @@
from warehouse_ans_bill wab
where sid = #{sid}
</select>
<select id="selectNum" resultType="java.lang.String">
select RIGHT (billNo, 4)
from warehouse_ans_bill
where billNo LIKE concat(#{billNo}, '%')
order by billNo desc
limit 1
</select>
</mapper>

4
src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillQuery.java
View File

@@ -29,7 +29,9 @@ public class WarehouseAnsBillQuery implements Query {
private String supplierName;
@ApiModelProperty("运单号")
private String waybillNumber;
@ApiModelProperty("库区sid")
@ApiModelProperty("承运商")
private String carrier;
@ApiModelProperty("库位sid")
private String warehouseRackSid;
private String orgLevelKey;//权限等级

57
src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillService.java
View File

@@ -2,6 +2,7 @@ package com.yxt.warehouse.biz.warehouseansbill;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.base.service.MybatisBaseService;
@@ -10,10 +11,13 @@ import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.warehouse.biz.operationrecord.OperationRecordDto;
import com.yxt.warehouse.biz.operationrecord.OperationRecordService;
import com.yxt.warehouse.biz.warehouseansbilldetail.*;
import com.yxt.warehouse.biz.warehouseinfo.WarehouseInfoVo;
import com.yxt.warehouse.biz.warehouserack.WarehouseRack;
import com.yxt.warehouse.biz.warehouserack.WarehouseRackService;
import com.yxt.warehouse.utils.Rule;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -34,6 +38,8 @@ public class WarehouseAnsBillService extends MybatisBaseService<WarehouseAnsBill
private WarehouseAnsBillDetailService WarehouseAnsBillDetailService;
@Autowired
WarehouseRackService warehouseRackService;
@Autowired
OperationRecordService operationRecordService;
public ResultBean<String> saveOrUpdateBill(WarehouseAnsBillDto dto) {
ResultBean<String> rb = ResultBean.fireFail();
@@ -129,6 +135,18 @@ public class WarehouseAnsBillService extends MybatisBaseService<WarehouseAnsBill
if (StringUtils.isNotBlank(query.getSourceBillNo())) {
qw.like("wab.sourceBillNo", query.getSourceBillNo());
}
if (StringUtils.isNotBlank(query.getGoodsSkuSid())) {
qw.eq("wabd.goodsSkuSid", query.getGoodsSkuSid());
}
if (StringUtils.isNotBlank(query.getWarehouseRackSid())) {
qw.eq("wab.warehouseRackSid", query.getWarehouseRackSid());
}
if (StringUtils.isNotBlank(query.getCarrier())) {
qw.like("wab.carrier", query.getCarrier());
}
if (StringUtils.isNotBlank(query.getWaybillNumber())) {
qw.like("wab.waybillNumber", query.getWaybillNumber());
}
}
IPage<WarehouseAnsBill> page = PagerUtil.queryToPage(pagerQuery);
@@ -165,9 +183,30 @@ public class WarehouseAnsBillService extends MybatisBaseService<WarehouseAnsBill
} else {
return rb.setMsg("单据明细不能为空");
}
//生成单据编号
String billNo = "";
String date = DateUtil.format(DateUtil.date(), "yyyyMMdd");
billNo = "RY" + date;
String i = baseMapper.selectNum(billNo);
if (org.apache.commons.lang3.StringUtils.isNotBlank(i)) {
billNo = Rule.getBillNo(billNo, Integer.valueOf(i).intValue());
} else {
billNo = Rule.getBillNo(billNo, 0);
}
WarehouseAnsBill.setBillState(0);
WarehouseAnsBill.setBusTypeKey("0");
WarehouseAnsBill.setHandoverStatus("1");
// WarehouseAnsBill.setHandoverTime("");
WarehouseAnsBill.setBillNo(billNo);
WarehouseAnsBill.setCreateTime(new DateTime());
WarehouseAnsBill.setCreateBySid(dto.getUserSid());
baseMapper.insert(WarehouseAnsBill);
OperationRecordDto dto1=new OperationRecordDto();
dto1.setBillSid(WarehouseAnsBill.getSid());
dto1.setUserSid(dto.getUserSid());
dto1.setCreateTime(new Date());
dto1.setContent("oms推送入库预约单");
operationRecordService.save(dto1);
return rb;
}
@@ -250,17 +289,31 @@ public class WarehouseAnsBillService extends MybatisBaseService<WarehouseAnsBill
public ResultBean<List<WarehouseAnsBillExcelVo>> updateRack(WarehouseAnsBillDto dto) {
ResultBean rb = ResultBean.fireFail();
WarehouseAnsBill bill=baseMapper.selectOne(new QueryWrapper<WarehouseAnsBill>().eq("sid",dto.getSid()));
bill.setWarehouseRackSid(dto.getWarehouseRackSid());
bill.setWarehouseRackSid(dto.getRackSid());
WarehouseRack warehouseRack=warehouseRackService.getOne(new QueryWrapper<WarehouseRack>().eq("sid",bill.getWarehouseRackSid()));
bill.setWarehouseRackName(warehouseRack.getRackName());
baseMapper.updateById(bill);
OperationRecordDto dto1=new OperationRecordDto();
dto1.setBillSid(dto.getSid());
dto1.setUserSid(dto.getUserSid());
dto1.setUserName(dto.getUserName());
dto1.setCreateTime(new Date());
dto1.setContent("wms修改库位："+warehouseRack.getRackName());
operationRecordService.save(dto1);
return rb.success().setData("成功");
}
public ResultBean<List<WarehouseAnsBillExcelVo>> updateRemarks(WarehouseAnsBillDto dto) {
ResultBean rb = ResultBean.fireFail();
WarehouseAnsBill bill=baseMapper.selectOne(new QueryWrapper<WarehouseAnsBill>().eq("sid",dto.getSid()));
bill.setWarehouseRackSid(dto.getRemarks());
bill.setRemarks(dto.getRemarks());
baseMapper.updateById(bill);
OperationRecordDto dto1=new OperationRecordDto();
dto1.setBillSid(dto.getSid());
dto1.setUserSid(dto.getUserSid());
dto1.setUserName(dto.getUserName());
dto1.setCreateTime(new Date());
dto1.setContent("wms修改单据备注："+dto.getRemarks());
operationRecordService.save(dto1);
return rb.success().setData("成功");
}
}

16
src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillVo.java
View File

@@ -12,7 +12,7 @@ import java.util.Date;
* @date: 2024/4/11
**/
@Data
public class WarehouseAnsBillVo {
public class WarehouseAnsBillVo {
private String sid;
@@ -21,17 +21,20 @@ public class WarehouseAnsBillVo {
private Date applicationTime;
@ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("业务类型key（采购预约、调拨预约、其他预约）")
@ApiModelProperty("业务类型key（采购入库、收货入库、其他入库）")
private String busTypeKey;
@ApiModelProperty("业务类型value（采购预约、调拨预约、其他预约）")
private String busTypeValue;
@ApiModelProperty("业务类型value（采购入库、收货入库、其他入库）")
private String busTypeKeyValue;
@ApiModelProperty("交接状态")
private String handoverStatus;
private String handoverStatusValue;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("交接时间")
private Date handoverTime;
@ApiModelProperty("货物状态（在途、部分收货、已收货、已取消）")
private Integer billState;
private String billStateValue;
@ApiModelProperty("仓库sid")
private String warehouseSid;
@ApiModelProperty("仓库名")
@@ -59,6 +62,11 @@ public class WarehouseAnsBillVo {
private String useOrgSid;
@ApiModelProperty("创建组织sid")
private String createOrgSid;
private String remarks;
@ApiModelProperty("承运商")
private String carrier;
@ApiModelProperty("运单号")
private String waybillNumber;
}

5
src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsDetailsVo.java
View File

@@ -59,6 +59,9 @@ public class WarehouseAnsDetailsVo {
private String useOrgSid;
@ApiModelProperty("创建组织sid")
private String createOrgSid;
@ApiModelProperty("承运商")
private String carrier;
@ApiModelProperty("运单号")
private String waybillNumber;
private List<WarehouseAnsListDetailsVo> list = new ArrayList<>();
}

5
src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackMapper.java
View File

@@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.warehouse.biz.warehousearea.WarehouseAreaAllVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
@@ -19,4 +21,7 @@ public interface WarehouseRackMapper extends BaseMapper<WarehouseRack> {
WarehouseRackVo initialization (@Param("sid") String sid);
int updateBySidIsDelete(List<String> list);
List<WarehouseRackVo> listAll(@Param("orgPath")String orgPath);
@Select("select * from warehouse_rack where warehouseSid = #{ckSid} and isDelete!='1' and isEnable='1'")
List<WarehouseRackVo> selectAll(String ckSid);
}

4
src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackService.java
View File

@@ -10,6 +10,7 @@ import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.warehouse.biz.warehousearea.WarehouseAreaAllVo;
import com.yxt.warehouse.biz.warehouseinfo.WarehouseInfoVo;
import com.yxt.warehouse.utils.OrgPathQuery;
import org.springframework.stereotype.Service;
@@ -132,4 +133,7 @@ public class WarehouseRackService extends MybatisBaseService<WarehouseRackMapper
}
return rb.success().setMsg("成功");
}
public List<WarehouseRackVo> selectAll(String ckSid) {
return baseMapper.selectAll(ckSid);
}
}