java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

Merge remote-tracking branch 'origin/dev' into dev

training
pref_mail@163.com 1 year ago
parent
07405fce4e 181b0d3870
commit
cc7a4ef759
6 changed files with 233 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/QuestDetailEntity.java
  2. 68
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTaskApiController.java
  3. 8
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/TaskSearchDTO.java
  4. 9
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml
  5. 1
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ITaskQuestService.java
  6. 138
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java

16
blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/QuestDetailEntity.java
Unescape View File

@ -160,4 +160,20 @@ public class QuestDetailEntity extends TenantEntity {
@ApiModelProperty(value = "上架后的完整库位")
private String groundingPositionCode;
/**
* 物料编码
*/
private String materialCode;
/**
* 商场名称
*/
private String marketName;
/**
* 批次号
*/
private String incomingBatch;
}

68
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTaskApiController.java
Unescape View File

@ -20,6 +20,7 @@ import org.springblade.common.exception.CustomerException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.StringUtil;
import org.springframework.web.bind.annotation.*;
import java.util.*;
@ -389,6 +390,73 @@ public class WarehouseTaskApiController {
}
@PostMapping("/saveNewQuestDetail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "保存新的盘点数据", notes = "code,type")
public R saveNewQuestDetail(@RequestBody TaskSearchDTO taskSearchDTO) {
String method = "###########saveNewQuestDetail: ";
log.info(method+"保存新的盘点数据 参数：{}",taskSearchDTO);
Long questId = taskSearchDTO.getQuestId();//盘点任务id
Integer questType = taskSearchDTO.getQuestType();//盘点方式
Integer questTarget = taskSearchDTO.getQuestTarget();//盘点对象
String trayCode = taskSearchDTO.getTrayCode();//托盘
Long allocationId = taskSearchDTO.getAllocationId();//库位
QuestDetailDTO questDetail = taskSearchDTO.getQuestDetail();
try{
//当前登录人选择的仓库
BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
if(Objects.isNull(myCurrentWarehouse)){
log.warn(method+"仓库信息为空 myCurrentWarehouse={}",myCurrentWarehouse);
return R.fail(403,"仓库信息为空");
}
taskSearchDTO.setWarehouseId(myCurrentWarehouse.getId());
if(Objects.isNull(questId)){
log.warn(method+"盘点任务id为空 questId={}",questId);
return R.fail(403,"盘点任务id为空");
}
if(Objects.isNull(questType)){
log.warn(method+"盘点方式为空 questType={}",questType);
return R.fail(403,"盘点方式为空");
}
if(Objects.isNull(questTarget)){
log.warn(method+"盘点对象为空 questTarget={}",questTarget);
return R.fail(403,"盘点对象为空");
}
if(questType == 2 && Objects.isNull(allocationId)){
log.warn(method+"库位id为空 allocationId={}",allocationId);
return R.fail(403,"库位id为空");
}
if(questType == 4 && StringUtil.isBlank(trayCode)){
log.warn(method+"托盘码为空 trayCode={}",trayCode);
return R.fail(403,"托盘码为空");
}
// if(Objects.isNull(num) || num == 0){
// log.warn(method+"数量不正确 num={}",num);
// return R.fail(403,"数量不正确");
// }
if(Objects.isNull(questDetail)){
log.warn(method+"新增对象为空 questDetail={}",questDetail);
return R.fail(403,"新增对象为空");
}
taskQuestService.saveNewQuestDetail(taskSearchDTO);
return R.success("新增成功");
}catch (CustomerException e){
log.warn(e.message);
return R.fail(e.code,e.message);
}catch (Exception e){
log.error(method+"系统异常，联系管理员",e);
return R.fail(500,"系统异常，联系管理员");
}
}
}

8
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/TaskSearchDTO.java
Unescape View File

@ -71,5 +71,13 @@ public class TaskSearchDTO {
private List<QuestDetailDTO> questDetailList = new ArrayList<>();
private Integer questType;//盘点方式;1. 随机 2 库位3 订单 4 托盘
private Integer questTarget;//盘点对象;1.定制品 2零担 3 库存品
private Integer num;//数量
private QuestDetailDTO questDetail;
}

9
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml
Unescape View File

@ -297,7 +297,7 @@
<select id="selectCountSumByallocation" resultType="java.lang.Integer">
select COALESCE (sum(lwug.num),0) from logpm_warehouse_updown_goods lwug where lwug.is_deleted =0 and lwug.allocation_id =#{id}
</select>
<select id="allocationDetailByPackage" resultType="com.logpm.warehouse.vo.TaskStripApiVO">
<select id="allocationDetailByPackage" resultType="com.logpm.warehouse.entity.QuestDetailEntity">
select ldpl.order_code orderCode,
ldpl.stock_article_id orderId,
2 questType,
@ -329,7 +329,7 @@
</if>
</select>
<select id="allocationDetailByZero" resultType="com.logpm.warehouse.vo.TaskStripApiVO">
<select id="allocationDetailByZero" resultType="com.logpm.warehouse.entity.QuestDetailEntity">
select ldsa.order_code orderCode,
ldsa.id orderId,
2 questType,
@ -358,7 +358,7 @@
</if>
</select>
<select id="allocationDetailByStock" resultType="com.logpm.warehouse.vo.TaskStripApiVO">
<select id="allocationDetailByStock" resultType="com.logpm.warehouse.entity.QuestDetailEntity">
SELECT
ldsl.order_code orderCode,
ldsl.id stockId,
@ -371,6 +371,9 @@
lwta.tray_id trayId,
lwt.tray_code trayCode,
lwug.allocation_id allocationId,
ldsl.cargo_number materialCode,
ldsl.market_name marketName,
ldsl.incoming_batch incomingBatch,
0 isNew
FROM
logpm_warehouse_updown_goods lwug

1
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ITaskQuestService.java
Unescape View File

@ -95,4 +95,5 @@ public interface ITaskQuestService extends BaseService<TaskQuestEntity> {
* @return
*/
R trayListInfo(IPage<Object> page, TaskSearchDTO taskSearchDTO);
void saveNewQuestDetail(TaskSearchDTO taskSearchDTO);
}

138
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java
Unescape View File

@ -39,10 +39,7 @@ import com.logpm.warehouse.excel.TaskQuestExcel;
import com.logpm.warehouse.mapper.TaskQuestMapper;
import com.logpm.warehouse.mapper.WarehouseTrayGoodsMapper;
import com.logpm.warehouse.mapper.WarehouseUpdownGoodsMapper;
import com.logpm.warehouse.service.IQuestDetailChildService;
import com.logpm.warehouse.service.IQuestDetailService;
import com.logpm.warehouse.service.ITaskQuestChildService;
import com.logpm.warehouse.service.ITaskQuestService;
import com.logpm.warehouse.service.*;
import com.logpm.warehouse.vo.*;
import lombok.AllArgsConstructor;
import lombok.extern.log4j.Log4j2;
@ -50,6 +47,7 @@ import org.springblade.common.exception.CustomerException;
import org.springblade.common.utils.CommonUtil;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -91,6 +89,8 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
private final IBasicdataGoodsAllocationClient basicdataGoodsAllocationClient;
private final IBasicdataGoodsShelfClient basicdataGoodsShelfClient;
private final IBasicdataGoodsAreaClient basicdataGoodsAreaClient;
private final IWarehouseTrayTypeService trayTypeService;
private final IWarehouseTaryAllocationService taryAllocationService;
@ -812,6 +812,136 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
questDetailService.updateBatchById(ls);
}
@Override
public void saveNewQuestDetail(TaskSearchDTO taskSearchDTO) {
Long warehouseId = taskSearchDTO.getWarehouseId();
Long questId = taskSearchDTO.getQuestId();
String trayCode = taskSearchDTO.getTrayCode();
Long allocationId = taskSearchDTO.getAllocationId();
//先判定盘点任务是否已结束
verifyTask(questId,warehouseId);
Integer questType = taskSearchDTO.getQuestType();
Integer questTarget = taskSearchDTO.getQuestTarget();
String positionCode = null;
Long trayId = null;
if(questType == 2){//库位盘点
BasicdataGoodsAllocationEntity goodsAllocationEntity = basicdataGoodsAllocationClient.getEntityByAllocationId(allocationId);
if(Objects.isNull(goodsAllocationEntity)){
log.warn("###########saveNewQuestDetail: 库位信息不存在 allocationId={}",allocationId);
throw new CustomerException(403,"库位信息不存在");
}
Long wid = goodsAllocationEntity.getWarehouseId();
if(!wid.equals(warehouseId)){
log.warn("###########saveNewQuestDetail: 库位不在当前仓 allocationId={}",allocationId);
throw new CustomerException(403,"库位不在当前仓");
}
Long goodsShelfId = goodsAllocationEntity.getGoodsShelfId();
BasicdataGoodsShelfEntity basicdataGoodsShelfEntity = basicdataGoodsShelfClient.getEntityByGoodsShelfId(goodsShelfId);
if(Objects.isNull(basicdataGoodsShelfEntity)){
log.warn("###########saveNewQuestDetail: 货架信息不存在 goodsShelfId={}",goodsShelfId);
throw new CustomerException(403,"货架信息不存在");
}
Long goodsAreaId = basicdataGoodsShelfEntity.getGoodsAreaId();
BasicdataGoodsAreaEntity goodsAreaEntity = basicdataGoodsAreaClient.getEntityByGoodsAreaId(goodsAreaId);
if(Objects.isNull(goodsAreaEntity)){
log.warn("###########saveNewQuestDetail: 货区信息不存在 goodsAreaId={}",goodsAreaId);
throw new CustomerException(403,"货区信息不存在");
}
//判断库位是否有托盘
BasicdataTrayEntity trayEntity = taryAllocationService.getTrayByAllocationId(allocationId);
trayCode = trayEntity.getPalletCode();
BasicdataTrayEntity basicdataTrayEntity = basicdataTrayClient.getTrayByTrayCode(trayCode);
if(Objects.isNull(basicdataTrayEntity)){
log.warn("###########saveNewQuestDetail: 托盘信息不存在 trayCode={}",trayCode);
throw new CustomerException(403,"托盘信息不存在");
}
trayId = basicdataTrayEntity.getId();
TrayTypeDataVO trayTypeDataVO = trayTypeService.getEntityByTrayCode(trayCode, warehouseId);
if(Objects.isNull(trayTypeDataVO)){
log.warn("###########saveNewQuestDetail: 托盘打托信息不存在 trayCode={}",trayCode);
throw new CustomerException(403,"托盘打托信息不存在");
}
String type = trayTypeDataVO.getType();
if(questTarget != Integer.parseInt(type)){
log.warn("###########saveNewQuestDetail: 托盘打托数据类型错误 trayCode={}",trayCode);
throw new CustomerException(403,"托盘打托数据类型错误");
}
positionCode = goodsAreaEntity.getHeadline()+"-"+basicdataGoodsShelfEntity.getGoodsShelfName()+"-"+goodsAllocationEntity.getGoodsAllocationName();
}else if(questType == 4){
BasicdataTrayEntity basicdataTrayEntity = basicdataTrayClient.getTrayByTrayCode(trayCode);
if(Objects.isNull(basicdataTrayEntity)){
log.warn("###########saveNewQuestDetail: 托盘信息不存在 trayCode={}",trayCode);
throw new CustomerException(403,"托盘信息不存在");
}
trayId = basicdataTrayEntity.getId();
TrayTypeDataVO trayTypeDataVO = trayTypeService.getEntityByTrayCode(trayCode, warehouseId);
if(Objects.isNull(trayTypeDataVO)){
log.warn("###########saveNewQuestDetail: 托盘打托信息不存在 trayCode={}",trayCode);
throw new CustomerException(403,"托盘打托信息不存在");
}
String type = trayTypeDataVO.getType();
if(questTarget != Integer.parseInt(type)){
log.warn("###########saveNewQuestDetail: 托盘打托数据类型错误 trayCode={}",trayCode);
throw new CustomerException(403,"托盘打托数据类型错误");
}
//判断托盘是否有库位信息
allocationId = taryAllocationService.getAllocationIdByTrayId(basicdataTrayEntity.getId());
if (!Objects.isNull(allocationId)){
BasicdataGoodsAllocationEntity goodsAllocationEntity = basicdataGoodsAllocationClient.getEntityByAllocationId(allocationId);
if(Objects.isNull(goodsAllocationEntity)){
log.warn("###########saveNewQuestDetail: 库位信息不存在 allocationId={}",allocationId);
throw new CustomerException(403,"库位信息不存在");
}
Long wid = goodsAllocationEntity.getWarehouseId();
if(!wid.equals(warehouseId)){
log.warn("###########saveNewQuestDetail: 库位不在当前仓 allocationId={}",allocationId);
throw new CustomerException(403,"库位不在当前仓");
}
Long goodsShelfId = goodsAllocationEntity.getGoodsShelfId();
BasicdataGoodsShelfEntity basicdataGoodsShelfEntity = basicdataGoodsShelfClient.getEntityByGoodsShelfId(goodsShelfId);
if(Objects.isNull(basicdataGoodsShelfEntity)){
log.warn("###########saveNewQuestDetail: 货架信息不存在 goodsShelfId={}",goodsShelfId);
throw new CustomerException(403,"货架信息不存在");
}
Long goodsAreaId = basicdataGoodsShelfEntity.getGoodsAreaId();
BasicdataGoodsAreaEntity goodsAreaEntity = basicdataGoodsAreaClient.getEntityByGoodsAreaId(goodsAreaId);
if(Objects.isNull(goodsAreaEntity)){
log.warn("###########saveNewQuestDetail: 货区信息不存在 goodsAreaId={}",goodsAreaId);
throw new CustomerException(403,"货区信息不存在");
}
positionCode = goodsAreaEntity.getHeadline()+"-"+basicdataGoodsShelfEntity.getGoodsShelfName()+"-"+goodsAllocationEntity.getGoodsAllocationName();
}
}
QuestDetailDTO questDetail = taskSearchDTO.getQuestDetail();
QuestDetailEntity questDetailEntity = new QuestDetailEntity();
BeanUtil.copy(questDetail,questDetailEntity);
questDetailEntity.setQuestId(questId);
questDetailEntity.setQuestType(taskSearchDTO.getQuestType());
questDetailEntity.setQuestTarget(taskSearchDTO.getQuestTarget());
questDetailEntity.setQuestStatus(1);
questDetailEntity.setWarehouseId(warehouseId);
// questDetailEntity.setPositionCode(positionCode);
questDetailEntity.setTrayCode(trayCode);
questDetailEntity.setTrayId(trayId);
// questDetailEntity.setAllocationId(allocationId);
questDetailEntity.setGroundingAllocationId(allocationId);
questDetailEntity.setGroundingPositionCode(positionCode);
questDetailEntity.setIsNew(1);
questDetailService.save(questDetailEntity);
}
private QuestDetailChildEntity addQuestDetailChild(Integer num,String cargoName,Long questDetaiId,Long warehouseId){
QuestDetailChildEntity questDetailChildEntity = new QuestDetailChildEntity();

Write Preview
Loading…
Cancel
Save