Skip to content

J
jiayanWMS
提交 4c0168b5 authored 作者: 许俊's avatar 许俊
浏览文件
操作

金蝶云包

上级 734946fd
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 624 行增加 和 29 行删除
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/entity/HouseLocationReady.java
浏览文件 @ 4c0168b5
......@@ -95,5 +95,10 @@ public class HouseLocationReady implements Serializable {
@Excel(name = "入库定位单号", width = 15)
@ApiModelProperty(value = "入库定位单号")
private String housewarehousinglocationId;
/**
* 完成数量
*/
@ApiModelProperty(value = "完成数量")
private Integer completenumber;
}
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/entity/HousePickingFinsh.java 0 → 100644
浏览文件 @ 4c0168b5
package org.jeecg.modules.iost.basedata.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: 已拣货产品明细
* @Author: jeecg-boot
* @Date: 2021-09-010
* @Version: V1.0
*/
@Data
@TableName("house_picking_finsh")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="house_picking_finsh对象", description="已拣货产品明细")
public class HousePickingFinsh implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private String id;
/**创建人*/
@ApiModelProperty(value = "创建人")
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期")
private Date createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期")
private Date updateTime;
/**所属部门*/
@ApiModelProperty(value = "所属部门")
private String sysOrgCode;
/**
* 产品编码
*/
@ApiModelProperty(value = "产品编码")
private String productcodeId;
/**
* 产品名称
*/
@ApiModelProperty(value = "产品名称")
private String productname;
/**
* 功效
*/
@ApiModelProperty(value = "产品功效")
private String productnotes;
/**
* 仓位
*/
@ApiModelProperty(value = "仓位")
private String positionId;
/**
* 完成数量
*/
@ApiModelProperty(value = "完成数量")
private Integer completenumber;
/**
* 仓库
*/
@ApiModelProperty(value = "仓库")
private String warehouseId;
/**
* 工号
*/
@ApiModelProperty(value = "工号")
private String workNo;
/**
* 操作员名称
*/
@ApiModelProperty(value = "操作员名称")
private String realname;
/**
* 拣货单号
*/
@ApiModelProperty(value = "拣货单号")
private String housePickingtableId;
/**
* 当前拣货的数量
*/
@ApiModelProperty(value = "当前拣货的数量")
private Integer nowNum;
}
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/entity/HousePickingReady.java 0 → 100644
浏览文件 @ 4c0168b5
package org.jeecg.modules.iost.basedata.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/**
* @Description: 待拣货产品明细
* @Author: jeecg-boot
* @Date: 2021-09-010
* @Version: V1.0
*/
@Data
@TableName("house_picking_ready")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="house_picking_ready对象", description="待拣货产品明细")
public class HousePickingReady implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键")
private String id;
/**创建人*/
@ApiModelProperty(value = "创建人")
private String createBy;
/**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期")
private Date createTime;
/**更新人*/
@ApiModelProperty(value = "更新人")
private String updateBy;
/**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期")
private Date updateTime;
/**所属部门*/
@ApiModelProperty(value = "所属部门")
private String sysOrgCode;
/**
* 产品编码
*/
@ApiModelProperty(value = "产品编码")
private String productcodeId;
/**
* 产品名称
*/
@ApiModelProperty(value = "产品名称")
private String productname;
/**
* 功效
*/
@ApiModelProperty(value = "产品功效")
private String productnotes;
/**
* 仓位
*/
@ApiModelProperty(value = "仓位")
private String positionId;
/**
* 总需求数量
*/
@ApiModelProperty(value = "总需求数量")
private Integer productnumber;
/**
* 完成数量
*/
@ApiModelProperty(value = "完成数量")
private Integer completenumber;
/**
* 仓库
*/
@ApiModelProperty(value = "仓库")
private String warehouseId;
/**
* 拣货单号
*/
@ApiModelProperty(value = "拣货单号")
private String housePickingtableId;
}
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/entity/HousePickingtable.java
浏览文件 @ 4c0168b5
......@@ -30,7 +30,7 @@ public class HousePickingtable implements Serializable {
private static final long serialVersionUID = 1L;
/**主键*/
@TableId(type = IdType.ASSIGN_ID)
@TableId(type = IdType.INPUT)
@ApiModelProperty(value = "主键")
private String id;
/**创建人*/
......@@ -52,28 +52,12 @@ public class HousePickingtable implements Serializable {
/**所属部门*/
@ApiModelProperty(value = "所属部门")
private String sysOrgCode;
/**销售单号*/
@Excel(name = "销售单号", width = 15)
@ApiModelProperty(value = "销售单号")
private String saleid;
/**领单时间*/
@Excel(name = "领单时间", width = 15)
@ApiModelProperty(value = "领单时间")
private String lindandata;
/**拣货员*/
@Excel(name = "拣货员", width = 15)
@ApiModelProperty(value = "拣货员")
private String yuanggongid;
/**扫描完成时间*/
@Excel(name = "扫描完成时间", width = 15)
@ApiModelProperty(value = "扫描完成时间")
private String wanchengdata;
/**需求数量*/
@Excel(name = "需求数量", width = 15)
@ApiModelProperty(value = "需求数量")
private String demandnumber;
/**0=拣货中，1=已拣货*/
@Excel(name = "0=拣货中，1=已拣货", width = 15)
@ApiModelProperty(value = "0=拣货中，1=已拣货")
private String zhuangtai;
/**客户*/
@ApiModelProperty(value = "客户")
private String customer;
/**备注*/
@ApiModelProperty(value = "备注")
private String remarks;
}
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/entity/Vo/HouseLocationReadyVo.java
浏览文件 @ 4c0168b5
......@@ -100,4 +100,9 @@ public class HouseLocationReadyVo {
*/
@ApiModelProperty(value = "入库定位单号")
private String housewarehousinglocationId;
/**
* 完成数量
*/
@ApiModelProperty(value = "完成数量")
private Integer completenumber;
}
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/entity/Vo/HousePickingReadyVo.java 0 → 100644
浏览文件 @ 4c0168b5
package org.jeecg.modules.iost.basedata.entity.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @Description: 待拣货产品明细Vo-增加需求数量（总需求数量-已完成数量)
* @Author: jeecg-boot
* @Date: 2021-09-010
* @Version: V1.0
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
public class HousePickingReadyVo {
/**主键*/
@ApiModelProperty(value = "主键")
private String id;
/**
* 产品编码
*/
@ApiModelProperty(value = "产品编码")
private String productcodeId;
/**
* 产品名称
*/
@ApiModelProperty(value = "产品名称")
private String productname;
/**
* 功效
*/
@ApiModelProperty(value = "产品功效")
private String productnotes;
/**
* 仓位
*/
@ApiModelProperty(value = "仓位")
private String positionId;
/**
* 总需求数量
*/
@ApiModelProperty(value = "总需求数量")
private Integer productnumber;
/**
* 完成数量
*/
@ApiModelProperty(value = "完成数量")
private Integer completenumber;
/**
* 仓库
*/
@ApiModelProperty(value = "仓库")
private String warehouseId;
/**
* 拣货单号
*/
@ApiModelProperty(value = "拣货单号")
private String housePickingtableId;
/**
* 需求数量
*/
@ApiModelProperty(value = "需求数量")
private Integer quantityDemanded;
}
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/entity/Vo/HousePickingVo.java 0 → 100644
浏览文件 @ 4c0168b5
package org.jeecg.modules.iost.basedata.entity.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* @Description: 接收拣货保存参数Vo
* @Author: jeecg-boot
* @Date: 2021-09-10
* @Version: V1.0
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
public class HousePickingVo {
/**
* 工号
*/
private String workNo;
/**
* 操作员名称
*/
private String realname;
/**
* 产品编码
*/
@ApiModelProperty(value = "产品编码")
private String productcodeId;
/**
* 产品名称
*/
@ApiModelProperty(value = "产品名称")
private String productname;
/**
* 功效
*/
@ApiModelProperty(value = "产品功效")
private String productnotes;
/**
* 完成数量
*/
@ApiModelProperty(value = "完成数量")
private Integer completenumber;
/**
* 仓位
*/
@ApiModelProperty(value = "仓位")
private String positionId;
/**
* 仓库
*/
@ApiModelProperty(value = "仓库")
private String warehouseId;
/**
* 拣货单号
*/
@ApiModelProperty(value = "拣货单号")
private String housePickingtableId;
}
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/mapper/HousePickingReadyMapper.java 0 → 100644
浏览文件 @ 4c0168b5
package org.jeecg.modules.iost.basedata.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.iost.basedata.entity.HousePickingReady;
public interface HousePickingReadyMapper extends BaseMapper<HousePickingReady> {
}
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/mapper/xml/HousePickingFinshMapper.xml 0 → 100644
浏览文件 @ 4c0168b5
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.inandoutofstorage.basedata.mapper.HousePickingFinshMapper">
</mapper>
\ No newline at end of file
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/mapper/xml/HousePickingReadyMapper.xml 0 → 100644
浏览文件 @ 4c0168b5
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.inandoutofstorage.basedata.mapper.HousePickingReadyMapper">
</mapper>
\ No newline at end of file
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/service/HouseIPickingtableService.java
浏览文件 @ 4c0168b5
package org.jeecg.modules.iost.basedata.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.iost.basedata.entity.HousePickingFinsh;
import org.jeecg.modules.iost.basedata.entity.HousePickingtable;
import org.jeecg.modules.iost.basedata.entity.Vo.HousePickingVo;
import java.util.List;
/**
* @Description: 拣货单表
......@@ -10,5 +15,7 @@ import org.jeecg.modules.iost.basedata.entity.HousePickingtable;
* @Version: V1.0
*/
public interface HouseIPickingtableService extends IService<HousePickingtable> {
public Result<?> saveByHousePickingVo(HousePickingVo housePickingVo);
public Result<?> saveHouseWareHouse(String housePickingtableId,String realname,String workNo);
}
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/service/HousePickingReadyService.java 0 → 100644
浏览文件 @ 4c0168b5
package org.jeecg.modules.iost.basedata.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.iost.basedata.entity.HousePickingReady;
import org.jeecg.modules.iost.basedata.entity.Vo.HousePickingVo;
import java.util.List;
public interface HousePickingReadyService extends IService<HousePickingReady> {
public List<HousePickingReady> queryByPickingId(String housePickingtableId);
public Result<?> UpdateHousePickingReady(HousePickingVo housePickingVo);
}
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/service/impl/HouseLocationReadyServiceImpl.java
浏览文件 @ 4c0168b5
......@@ -32,8 +32,9 @@ public class HouseLocationReadyServiceImpl extends ServiceImpl<HouseLocationRead
@Override
@Transactional
public void UpdateNum(HouseLocationReady houseLocationReadie, Integer num) {
int i = houseLocationReadie.getProductnumber() - num;
houseLocationReadie.setProductnumber(i);
int i = houseLocationReadie.getCompletenumber()+num;
houseLocationReadie.setCompletenumber(i);
this.getBaseMapper().updateById(houseLocationReadie);
}
......
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/service/impl/HousePickingFinshServiceImpl.java 0 → 100644
浏览文件 @ 4c0168b5
package org.jeecg.modules.iost.basedata.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.iost.basedata.entity.HousePickingFinsh;
import org.jeecg.modules.iost.basedata.entity.Vo.HousePickingVo;
import org.jeecg.modules.iost.basedata.mapper.HousePickingFinshMapper;
import org.jeecg.modules.iost.basedata.service.HousePickingFinshService;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Service
public class HousePickingFinshServiceImpl extends ServiceImpl<HousePickingFinshMapper, HousePickingFinsh> implements HousePickingFinshService {
//进行HousePickingFinsh表更新操作
public void UpdateHousePickingFinsh(HousePickingVo housePickingVo)
{
//查询待拣货明细是否存在这一个产品
Map<String, String> map = new HashMap<>();
map.put("productcode_id", housePickingVo.getProductcodeId());
map.put("position_id", housePickingVo.getPositionId());
map.put("productnotes", housePickingVo.getProductnotes());
map.put("realname",housePickingVo.getRealname());
map.put("work_no",housePickingVo.getWorkNo());
QueryWrapper<HousePickingFinsh> qw = new QueryWrapper<>();
qw.allEq(map);
HousePickingFinsh housePickingFinsh = this.getBaseMapper().selectOne(qw);
// 如果为空，则不存在这一条数据,进行插入操作
if (ObjectUtils.isEmpty(housePickingFinsh)) {
HousePickingFinsh h=new HousePickingFinsh();
h.setProductcodeId(housePickingVo.getProductcodeId());
h.setProductname(housePickingVo.getProductname());
h.setProductnotes(housePickingVo.getProductnotes());
h.setPositionId(housePickingVo.getPositionId());
h.setCompletenumber(housePickingVo.getCompletenumber());
h.setWarehouseId(housePickingVo.getWarehouseId());
h.setWorkNo(housePickingVo.getWorkNo());
h.setRealname(housePickingVo.getRealname());
h.setHousePickingtableId(housePickingVo.getHousePickingtableId());
h.setNowNum(housePickingVo.getCompletenumber());
this.getBaseMapper().insert(h);
}
else
{
// 先查询某个人所操作(增加姓名和工号条件查询)的已拣货明细
Map<String, String> map2 = new HashMap<>();
map2.put("productcode_id", housePickingVo.getProductcodeId());
map2.put("position_id", housePickingVo.getPositionId());
map2.put("productnotes", housePickingVo.getProductnotes());
map2.put("realname",housePickingVo.getRealname());
map2.put("work_no",housePickingVo.getWorkNo());
QueryWrapper<HousePickingFinsh> qw2 = new QueryWrapper<>();
qw2.allEq(map2);
HousePickingFinsh housePickingFinsh2 = this.getBaseMapper().selectOne(qw2);
//根据这个明细数据进行更新，因为一个待拣货明细是可能有两个人一起完成的，所以已拣货明细可能是同一个拣货单的里面的内容
Integer completenumber = housePickingFinsh2.getCompletenumber();
housePickingFinsh2.setCompletenumber(housePickingVo.getCompletenumber()+completenumber);
housePickingFinsh2.setNowNum(housePickingVo.getCompletenumber()+housePickingFinsh2.getNowNum());
this.getBaseMapper().updateById(housePickingFinsh2);
}
}
/**
* 拣货-查看已拣货产品
*/
public List<HousePickingFinsh> QueryByPickingTableId(String housePickingtableId,String realname,String workNo)
{
Map<String,String> map=new HashMap<>();
map.put("house_pickingtable_id",housePickingtableId);
map.put("work_no",workNo);
map.put("realname",realname);
QueryWrapper<HousePickingFinsh> qw=new QueryWrapper();
qw.allEq(map);
List<HousePickingFinsh> housePickingFinshes = this.getBaseMapper().selectList(qw);
//判断nowNum是否为0，提交操作后会重置nowNum为0，防止重复提交扰乱数据，如果不为0表示没提交过
List<HousePickingFinsh> housePickingFinshes2 = new ArrayList<>();
for (HousePickingFinsh housePickingFinsh : housePickingFinshes) {
if(!housePickingFinsh.getNowNum().equals(0))
{
housePickingFinshes2.add(housePickingFinsh);
}
}
return housePickingFinshes2;
}
}
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/service/impl/HousePickingReadyServiceImpl.java 0 → 100644
浏览文件 @ 4c0168b5
package org.jeecg.modules.iost.basedata.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.iost.basedata.entity.HousePickingReady;
import org.jeecg.modules.iost.basedata.entity.Vo.HousePickingVo;
import org.jeecg.modules.iost.basedata.mapper.HousePickingReadyMapper;
import org.jeecg.modules.iost.basedata.service.HousePickingReadyService;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Service
public class HousePickingReadyServiceImpl extends ServiceImpl<HousePickingReadyMapper, HousePickingReady> implements HousePickingReadyService {
/**
* 根据拣货单号查出待拣货产品明细
*/
public List<HousePickingReady> queryByPickingId(String housePickingtableId)
{
QueryWrapper<HousePickingReady> qw=new QueryWrapper();
qw.eq("house_pickingtable_id",housePickingtableId);
List<HousePickingReady> housePickingReadies = this.baseMapper.selectList(qw);
return housePickingReadies;
}
//进行HousePickingReady表更新操作
public Result<?> UpdateHousePickingReady(HousePickingVo housePickingVo)
{
//查询待拣货明细是否存在这一个产品
Map<String, String> map = new HashMap<>();
map.put("productcode_id", housePickingVo.getProductcodeId());
map.put("position_id", housePickingVo.getPositionId());
map.put("productnotes", housePickingVo.getProductnotes());
QueryWrapper<HousePickingReady> qw = new QueryWrapper<>();
qw.allEq(map);
HousePickingReady housePickingReady = this.getBaseMapper().selectOne(qw);
// 如果为空，则不存在这一条数据
if (ObjectUtils.isEmpty(housePickingReady)) {
return Result.error("拣货单不存在这个产品，请核对拣货单!");
}
else
{
//判断保存的数量是否大于总需求数量
if(housePickingReady.getCompletenumber()+housePickingVo.getCompletenumber()>housePickingReady.getProductnumber())
{
return Result.error("保存的数量不能大于需求数量!");
}
//进行更新操作
Integer completenumber = housePickingReady.getCompletenumber();
housePickingReady.setCompletenumber(housePickingVo.getCompletenumber()+completenumber);
int i = this.getBaseMapper().updateById(housePickingReady);
if(i==1)
{
return Result.OK("保存成功");
}
else
{
return Result.error("保存失败");
}
}
}
}
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/service/impl/HousePickingtableServiceImpl.java
浏览文件 @ 4c0168b5
package org.jeecg.modules.iost.basedata.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.iost.basedata.entity.HousePickingtable;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.iost.basedata.entity.*;
import org.jeecg.modules.iost.basedata.entity.Vo.HousePickingVo;
import org.jeecg.modules.iost.basedata.mapper.HousePickingtableMapper;
import org.jeecg.modules.iost.basedata.service.HouseIPickingtableService;
import org.jeecg.modules.iost.basedata.service.HouseIWarehouseService;
import org.jeecg.modules.iost.basedata.service.HousePickingFinshService;
import org.jeecg.modules.iost.basedata.service.HousePickingReadyService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @Description: 拣货单表
* @Author: jeecg-boot
* @Date: 2021-06-08
* @Date: 2021-06-08
* @Version: V1.0
*/
@Service
public class HousePickingtableServiceImpl extends ServiceImpl<HousePickingtableMapper, HousePickingtable> implements HouseIPickingtableService {
@Autowired
HousePickingReadyService housePickingReadyService;
@Autowired
HousePickingFinshService housePickingFinshService;
@Autowired
HouseIWarehouseService houseIWarehouseService;
/**
* 拣货-保存(更新待拣货和已拣货明细)
*/
@Transactional
public Result<?> saveByHousePickingVo(HousePickingVo housePickingVo) {
//进行HousePickingReady(待拣货)表更新操作
Result<?> result = housePickingReadyService.UpdateHousePickingReady(housePickingVo);
//先进行判断上面的更新是否成功，成功才进行HousePickingFinsh(已拣货)表插入或者更新操作
if (result.getCode().equals(200)) {
housePickingFinshService.UpdateHousePickingFinsh(housePickingVo);
}
//只要返回待明细表的更新结果，已拣货明细不返回东西
return result;
}
/**
* 拣货-提交(更新库存信息)
*/
public Result<?> saveHouseWareHouse(String housePickingtableId, String realname, String workNo) {
//先根据拣货单号查询已拣货产品列表
Map<String, String> map2 = new HashMap<>();
map2.put("house_pickingtable_id", housePickingtableId);
map2.put("work_no", workNo);
map2.put("realname", realname);
QueryWrapper<HousePickingFinsh> qw = new QueryWrapper<>();
qw.allEq(map2);
List<HousePickingFinsh> housePickingFinshes = housePickingFinshService.getBaseMapper().selectList(qw);
for (HousePickingFinsh housePickingFinsh : housePickingFinshes) {
//直接更新，不用查询库存是否存在这一个数据，因为待拣货明细就是来自于库存里面的，所以已拣货明细肯定存在于库存里面其中一条
Map<String, String> map = new HashMap<>();
map.put("productcode_id", housePickingFinsh.getProductcodeId());
map.put("productnotes", housePickingFinsh.getProductnotes());
map.put("PositionId", housePickingFinsh.getPositionId());
QueryWrapper<HouseWarehouse> qw2 = new QueryWrapper();
qw2.allEq(map);
HouseWarehouse houseWarehouse = houseIWarehouseService.getBaseMapper().selectOne(qw2);
if (!ObjectUtils.isEmpty(houseWarehouse)) {
//仓库原有的产品数量
Integer productnum = Integer.valueOf(houseWarehouse.getProductnum());
//仓库的数量减去已拣货明细的nowNum
productnum = productnum - housePickingFinsh.getNowNum();
//如果为0，进行删除，不为0就更新库存数量
if (productnum.equals(0)) {
houseIWarehouseService.getBaseMapper().deleteById(houseWarehouse);
} else {
houseWarehouse.setProductnum(String.valueOf(productnum));
houseIWarehouseService.getBaseMapper().updateById(houseWarehouse);
}
//仓库更新后，设置已经拣货产品明细的当前拣货数量字段值为0，方便下次进入已拣货产品页面时候可以看到当前已经拣货多少
housePickingFinshService.getBaseMapper().updateById(housePickingFinsh.setNowNum(0));
}
}
return Result.OK("提交成功");
}
}
jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/service/impl/HouseWarehousingLocationServiceImpl.java
浏览文件 @ 4c0168b5
......@@ -154,6 +154,7 @@ public class HouseWarehousingLocationServiceImpl extends ServiceImpl<HouseWareho
houseLocationReady.setUnit(houseLocationReadyVo.getUnit());
houseLocationReady.setProductnumber(houseLocationReadyVo.getProductnumber());
houseLocationReady.setHousewarehousinglocationId(houseLocationReadyVo.getHousewarehousinglocationId());
houseLocationReady.setCompletenumber(houseLocationReadyVo.getCompletenumber());
//先更新待上架明细的数量
houseILocationReadyService.UpdateNum(houseLocationReady,houseLocationReadyVo.getSubmitnumber());
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论