root/wms1.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev:修改入库单

Browse Source
This commit is contained in:
zhangzq
2024-06-06 09:41:39 +08:00
parent 25f148279d
commit cb35636d6f
46 changed files with 780 additions and 1464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/applyTask/impl/ApplyFlowTask.java
View File

@@ -6,11 +6,15 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.nl.common.domain.exception.BadRequestException;
import org.nl.common.enums.StatusEnum;
import org.nl.common.publish.BussEventMulticaster;
import org.nl.common.utils.MapOf;
import org.nl.wms.decision_manage.applyTask.AbstractApplyTask;
import org.nl.wms.flow_manage.monitor.event.FlowStartEvent;
import org.nl.wms.md_manage.group_dick.service.IMdGruopDickService;
import org.nl.wms.md_manage.group_dick.service.dao.MdGruopDick;
import org.nl.wms.md_manage.vehicleMater.service.IMdPbVehicleMaterService;
import org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater;
import org.nl.wms.md_manage.vehicleMater.service.dto.MdPbVehicleMaterVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -34,6 +38,8 @@ public class ApplyFlowTask extends AbstractApplyTask {
@Autowired
private IMdPbVehicleMaterService iMdPbVehicleMaterService;
@Autowired
private IMdGruopDickService iMdGruopDickService;
@Override
public String createTask(JSONObject data) {
@@ -42,7 +48,7 @@ public class ApplyFlowTask extends AbstractApplyTask {
if (StringUtils.isEmpty(point_code1)){
throw new BadRequestException("申请任务失败:请求参数数据异常");
}
org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater mst = iMdPbVehicleMaterService.getGroupMst(vehicle_code);
MdGruopDick mst = iMdGruopDickService.getOne(new QueryWrapper<MdGruopDick>().eq("vehicle_code", vehicle_code).lt("status", StatusEnum.FORM_STATUS.code("完成")));
if (mst == null){
throw new BadRequestException("申请任务失败:载具"+vehicle_code+"组盘信息不存在");
}
@@ -50,11 +56,11 @@ public class ApplyFlowTask extends AbstractApplyTask {
if (CollectionUtils.isEmpty(item)){
throw new BadRequestException("申请任务失败:载具"+vehicle_code+"组盘信息不存在");
}
JSONObject groupJson = (JSONObject)JSONObject.toJSON(mst);
JSONObject mstJ = (JSONObject) JSONObject.toJSON(mst);
mstJ.put("stor_code",item.get(0).getStor_code());
BussEventMulticaster.Publish(
new FlowStartEvent("md_group",null,new JSONObject(MapOf.of("point_code1",point_code1)))
.build("md_pb_vehicleMater",mst.getId(),mst.getSource_form_type(),mst.getSource_form_id(),(JSONObject) groupJson)
new FlowStartEvent("md_group",null,new JSONObject(MapOf.of("start_point",point_code1)))
.build("md_group_dick",mst.getId(),mst.getSource_form_type(),mst.getSource_form_id(), mstJ)
.build("md_pb_vehicleMater",item)
);
}

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/service/dao/StStrategyConfig.java
View File

@@ -59,7 +59,7 @@ public class StStrategyConfig implements Serializable {
*限定参数
*/
@TableField(typeHandler = FastjsonTypeHandler.class)
private JSONObject form_data;
private JSONObject form_data = new JSONObject();;
/**
* 描述
*/

1
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/StackingTaskHandler.java
View File

@@ -52,6 +52,7 @@ public class StackingTaskHandler implements TaskHandler {
}
SchBaseTask task = new SchBaseTask();
task.setId(IdUtil.getStringId());
task.setSource_form_id(from.getString("id"));
task.setTask_code(CodeUtil.getNewCode("TASK_CODE"));
task.setStatus(StatusEnum.FORM_STATUS.code("生成"));
task.setHandle_class(this.getClass().getName());

4
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/SchBaseTask.java
View File

@@ -84,6 +84,10 @@ public class SchBaseTask implements Serializable {
* 载具编码1
*/
private String vehicle_code;
/**
* 载具组盘id
*/
private String source_form_id;
/**
* 优先级

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/mapper/xml/SchBaseTaskMapper.xml
View File

@@ -55,7 +55,7 @@
md_pb_vehicleMater
LEFT JOIN st_ivt_structattr ON md_pb_vehicleMater.vehicle_code = st_ivt_structattr.vehicle_code
LEFT JOIN md_me_materialbase ON md_pb_vehicleMater.material_id = md_me_materialbase.material_id
LEFT JOIN sch_base_task ON md_pb_vehicleMater.vehicle_code = sch_base_task.vehicle_code
LEFT JOIN sch_base_task ON (md_pb_vehicleMater.vehicle_code = sch_base_task.vehicle_code )
where md_pb_vehicleMater.vehicle_code in
<foreach collection="vehicles" item="vehicle_code" open="(" close=")" separator=",">
#{vehicle_code}

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dao/ActRuExecution.java
View File

@@ -101,7 +101,7 @@ public class ActRuExecution implements Serializable {
* 业务数据
*/
@TableField(typeHandler = FastjsonTypeHandler.class)
private JSONObject form_data;
private JSONObject form_data = new JSONObject();;
@TableField(exist = false)
private List<ActRuExecution> children = new ArrayList<>();

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/history/dao/ActHiExecution.java
View File

@@ -70,7 +70,7 @@ public class ActHiExecution implements Serializable {
* 业务数据
*/
@TableField(typeHandler = FastjsonTypeHandler.class)
private JSONObject form_data;
private JSONObject form_data = new JSONObject();;
}

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/controller/MdGruopDickController.java
View File

@@ -47,7 +47,7 @@ public class MdGruopDickController {
}
@GetMapping("getVehicleMater/{code}")
public ResponseEntity<Object> vehicleInfo(@PathVariable String code) {
return new ResponseEntity<>(TableDataInfo.build(iMdGruopDickService.getGroupDtl(code)), HttpStatus.OK);
return new ResponseEntity<>(iMdGruopDickService.getGroupDtl(code), HttpStatus.OK);
}
@PutMapping("/updategroup")

6
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/IMdGruopDickService.java
View File

@@ -5,7 +5,7 @@ import org.nl.common.domain.entity.PageQuery;
import org.nl.wms.md_manage.group_dick.service.dao.MdGruopDick;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.wms.md_manage.group_dick.service.dto.GroupDickQuery;
import org.nl.wms.md_manage.group_dick.service.dto.MdGruopDtlVo;
import org.nl.wms.md_manage.vehicleMater.service.dto.MdPbVehicleMaterVo;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
@@ -37,9 +37,9 @@ public interface IMdGruopDickService extends IService<MdGruopDick> {
/**
* 查询组盘明细
* @param dick_id
* @param vehicle
* @return
*/
List<MdGruopDtlVo> getGroupDtl(String dick_id);
List<MdPbVehicleMaterVo> getGroupDtl(String vehicle);
}

3
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/MdGruopDick.java
View File

@@ -47,6 +47,7 @@ public class MdGruopDick implements Serializable {
*/
private String vehicle_code;
/**
* 备注
*/
@@ -82,7 +83,7 @@ public class MdGruopDick implements Serializable {
* 自定义字段
*/
@TableField(typeHandler = FastjsonTypeHandler.class)
private JSONObject form_data;
private JSONObject form_data = new JSONObject();

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/MdGruopDickMapper.java
View File

@@ -5,10 +5,8 @@ import org.apache.ibatis.annotations.Param;
import org.nl.wms.md_manage.group_dick.service.dao.MdGruopDick;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.nl.wms.md_manage.group_dick.service.dto.GroupDickQuery;
import org.nl.wms.md_manage.group_dick.service.dto.MdGruopDtlDto;
import java.util.List;
import java.util.Map;
/**
* <p>

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/xml/MdGruopDickMapper.xml
View File

@@ -5,7 +5,7 @@
<resultMap id="BaseResultMap" type="org.nl.wms.md_manage.group_dick.service.dao.MdGruopDick">
<result property="id" column="id"/>
<result property="code" column="code"/>
<result property="parent_vehicle_code" column="parent_vehicle_code"/>
<result property="vehicle_code" column="vehicle_code"/>
<result property="status" column="status"/>
<result property="remark" column="remark"/>
<result property="source_form_type" column="source_form_type"/>

20
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/MdGruopDtlVo.java
View File

@@ -1,20 +0,0 @@
package org.nl.wms.md_manage.group_dick.service.dto;
import lombok.Data;
/**
* <p>
* 载具物料组盘表
* </p>
*
* @author generator
* @since 2024-04-24
*/
@Data
public class MdGruopDtlVo extends MdGruopDtlDto {
private String material_name;
private String material_spec;
private String material_code;
}

51
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/MdGruopDtlDto.java → wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/MdGruopVo.java
View File

@@ -1,5 +1,9 @@
package org.nl.wms.md_manage.group_dick.service.dto;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import lombok.Data;
import org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater;
@@ -12,34 +16,33 @@ import org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater;
* @since 2024-04-24
*/
@Data
public class MdGruopDtlDto extends MdPbVehicleMater {
public class MdGruopVo extends MdPbVehicleMater {
/**
* 主键
*/
@TableId
private String id;
/**
* 主表id
*/
private String dick_id;
/**
* 载具
*/
private String vehicle_code;
/**
* 仓位
*/
private String struct_code;
/**
* 仓库
*/
private String stor_code;
private String code;
/**
* 组盘状态
*/
private String status;
/**
* 组盘
*/
private String vehicle_code;
/**
* 备注
*/
private String remark;
/**
* 源单
*/
@@ -49,9 +52,29 @@ public class MdGruopDtlDto extends MdPbVehicleMater {
*/
private String source_form_id;
/**
* 修改人
*/
private String update_name;
/**
* 修改时间
*/
private String update_time;
/**
* 创建时间
*/
private String create_time;
/**
* 创建人
*/
private String create_name;
/**
* 自定义字段
*/
private JSONObject form_data;
}

41
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java
View File

@@ -2,17 +2,21 @@ package org.nl.wms.md_manage.group_dick.service.impl;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import org.apache.commons.lang3.StringUtils;
import org.nl.common.TableDataInfo;
import org.nl.common.domain.entity.PageQuery;
import org.nl.common.domain.exception.BadRequestException;
import org.nl.common.enums.StatusEnum;
import org.nl.common.utils.CodeUtil;
import org.nl.common.utils.IdUtil;
import org.nl.common.utils.MapOf;
import org.nl.common.utils.SecurityUtils;
import org.nl.wms.base_manage.vehicle.service.IBmVehicleInfoService;
import org.nl.wms.base_manage.vehicle.service.dao.BmVehicleInfo;
import org.nl.wms.md_manage.vehicleMater.service.IMdPbVehicleMaterService;
import org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater;
@@ -21,7 +25,7 @@ import org.nl.wms.md_manage.group_dick.service.dao.mapper.MdGruopDickMapper;
import org.nl.wms.md_manage.group_dick.service.IMdGruopDickService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.nl.wms.md_manage.group_dick.service.dto.GroupDickQuery;
import org.nl.wms.md_manage.group_dick.service.dto.MdGruopDtlVo;
import org.nl.wms.md_manage.vehicleMater.service.dto.MdPbVehicleMaterVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -35,6 +39,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Consumer;
import java.util.stream.Collectors;
/**
* <p>
@@ -51,6 +56,9 @@ public class MdGruopDickServiceImpl extends ServiceImpl<MdGruopDickMapper, MdGru
@Autowired
private IMdPbVehicleMaterService iMdPbVehicleMaterService;
@Autowired
private IBmVehicleInfoService iBmVehicleInfoService;
@Override
public Object queryAll(GroupDickQuery query, PageQuery pageQuery) {
Page<Object> page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize());
@@ -74,8 +82,11 @@ public class MdGruopDickServiceImpl extends ServiceImpl<MdGruopDickMapper, MdGru
Map<String, MdGruopDick> map = new HashMap<>();
if (!CollectionUtils.isEmpty(forms)){
for (int i = 0; i < tableData.size(); i++) {
JSONObject item = tableData.get(i);
Map itemMap = tableData.get(i);
JSONObject item = new JSONObject(itemMap);
String vehicle_code = item.getString("vehicle_code");
MdPbVehicleMater vehicleMater = item.toJavaObject(MdPbVehicleMater.class);
MdGruopDick mdGruopDick = map.get(vehicle_code);
if (mdGruopDick ==null){
MdGruopDick dick = forms.toJavaObject(MdGruopDick.class);
@@ -84,12 +95,25 @@ public class MdGruopDickServiceImpl extends ServiceImpl<MdGruopDickMapper, MdGru
dick.setId(IdUtil.getStringId());
map.put(vehicle_code,dick);
}
MdPbVehicleMater vehicleMater = item.toJavaObject(MdPbVehicleMater.class);
vehicleMater.setId(IdUtil.getStringId());
vehicleMater.setCreate_time(now);
vehicleMater.setCreate_name(SecurityUtils.getCurrentNickName());
vehicleMaters.add(vehicleMater);
}
}
//参数校验
List<MdGruopDick> tmpCount2= this.list(new QueryWrapper<MdGruopDick>().in("vehicle_code", map.keySet()).lt("status", StatusEnum.FORM_STATUS.code("完成")));
if (tmpCount2.size()>0){
throw new BadRequestException("组盘失败：当前载具存在未完成的组盘任务"+tmpCount2.stream().map(MdGruopDick::getVehicle_code).collect(Collectors.joining(",")));
}
int tmpCount = iBmVehicleInfoService.count(new QueryWrapper<BmVehicleInfo>().in("vehicle_code", map.keySet()));
if (tmpCount<map.size()){
throw new BadRequestException("组盘失败：载具编号不存在");
}
List<MdPbVehicleMater> tmpCount1 = iMdPbVehicleMaterService.list(new QueryWrapper<MdPbVehicleMater>().in("vehicle_code", map.keySet()));
if (tmpCount1.size()>0){
throw new BadRequestException("组盘失败：载具已经存在组盘信息"+tmpCount1.stream().map(MdPbVehicleMater::getVehicle_code).collect(Collectors.joining(",")));
}
this.saveBatch(map.values());
iMdPbVehicleMaterService.saveBatch(vehicleMaters);
}
@@ -100,15 +124,10 @@ public class MdGruopDickServiceImpl extends ServiceImpl<MdGruopDickMapper, MdGru
}
@Override
public List<MdGruopDtlVo> getGroupDtl(String dick_id) {
List<MdGruopDtlVo> result = new ArrayList<>();
if (StringUtils.isEmpty(dick_id)){
public List<MdPbVehicleMaterVo> getGroupDtl(String vehicle_code) {
if (StringUtils.isEmpty(vehicle_code)){
return new ArrayList<>();
}
List<JSONObject> groupDtl = this.baseMapper.getGroupDtl(dick_id);
for (JSONObject json : groupDtl) {
result.add(json.toJavaObject(MdGruopDtlVo.class));
}
return result;
return iMdPbVehicleMaterService.getVehicleMaters(vehicle_code);
}
}

1
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/IMdPbVehicleMaterService.java
View File

@@ -18,6 +18,7 @@ import java.util.Map;
public interface IMdPbVehicleMaterService extends IService<MdPbVehicleMater> {
Integer getQtySumByMaterial(String material_id);
MdPbVehicleMater getGroupMst(String vehicle_code);
List<MdPbVehicleMaterVo> getVehicleMaters(String vehicle_code);

9
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/dao/MdPbVehicleMater.java
View File

@@ -2,6 +2,7 @@ package org.nl.wms.md_manage.vehicleMater.service.dao;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import lombok.Data;
@@ -25,8 +26,12 @@ public class MdPbVehicleMater implements Serializable {
private static final long serialVersionUID = 1L;
@TableId
private String id;
/**
* 仓库
*/
private String stor_code;
/**
* 载具编码
*/
@@ -79,7 +84,7 @@ public class MdPbVehicleMater implements Serializable {
* 扩展信息
*/
@TableField(typeHandler = FastjsonTypeHandler.class)
private JSONObject form_data;
private JSONObject form_data = new JSONObject();
/**
* 修改时间

1
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/dao/mapper/xml/MdPbVehicleivtMapper.xml
View File

@@ -5,6 +5,7 @@
<result property="id" column="id"/>
<result property="parent_vehicle_code" column="parent_vehicle_code"/>
<result property="vehicle_code" column="vehicle_code"/>
<result property="stor_code" column="stor_code"/>
<result property="remark" column="remark"/>
<result property="source_form_type" column="source_form_type"/>
<result property="source_form_id" column="source_form_id"/>

3
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/impl/MdPbVehicleMaterServiceImpl.java
View File

@@ -31,7 +31,8 @@ public class MdPbVehicleMaterServiceImpl extends ServiceImpl<MdPbVehicleMaterMap
@Override
public MdPbVehicleMater getGroupMst(String vehicle_code) {
return this.getOne(new QueryWrapper<MdPbVehicleMater>().eq("vehicle_code",vehicle_code));
return this.getOne(new QueryWrapper<MdPbVehicleMater>()
.eq("vehicle_code",vehicle_code));
}
@Override

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/PmFormData.java
View File

@@ -109,7 +109,7 @@ public class PmFormData implements Serializable {
* 自定义表单字段
*/
@TableField(typeHandler = FastjsonTypeHandler.class)
private JSONObject form_data;
private JSONObject form_data = new JSONObject();;
/**
* 关联上级表单id

39
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/controller/StIvtIostorinvController.java
View File

@@ -4,6 +4,7 @@ package org.nl.wms.stor_manage.io.controller;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.nl.common.TableDataInfo;
import org.nl.common.anno.Log;
import org.nl.common.domain.entity.PageQuery;
import org.nl.wms.dispatch_manage.task.service.ISchBaseTaskService;
import org.nl.wms.stor_manage.io.service.dto.StorInvQuery;
@@ -33,7 +34,7 @@ public class StIvtIostorinvController {
@Autowired
private IStIvtIostorinvService iStIvtIostorinvService;
@Autowired
private IStIvtIostorinvdtlService iStIvtIostorinvDtlOutService;
private IStIvtIostorinvdtlService iStIvtIostorinvDtlService;
@Autowired
private ISchBaseTaskService iSchBaseTaskService;
@@ -55,41 +56,25 @@ public class StIvtIostorinvController {
@PostMapping("getIosInvDtl")
public ResponseEntity<Object> getDtl(@RequestBody String inv_id) {
List<Map> mapList = iStIvtIostorinvDtlOutService.getByInv(inv_id);
List<Map> mapList = iStIvtIostorinvDtlService.getByInv(inv_id);
return new ResponseEntity<>(mapList,HttpStatus.OK);
}
/**
* 出库分配
* 入库分配
* @param dtl
* @return
*/
@PostMapping("/outDecision")
public ResponseEntity<Object> outDecision(@RequestBody JSONObject dtl) {
String struct_code = iStIvtIostorinvService.dispense(dtl);
return new ResponseEntity<>(struct_code,HttpStatus.OK);
}
/**
* 取消分配
* @param dtl
* @return
*/
@PostMapping("/cancelDecision")
public ResponseEntity<Object> cancelDecision(@RequestBody JSONObject dtl) {
iStIvtIostorinvService.canceldispense(dtl);
@PostMapping("/inDecision")
@Log("分配载具")
public ResponseEntity<Object> inDecision(@RequestBody JSONObject dtl) {
iStIvtIostorinvService.inDecision(dtl);
return new ResponseEntity<>(HttpStatus.OK);
}
@PostMapping("/divDis")
public ResponseEntity<Object> divDis(@RequestBody JSONObject dtl) {
List<Map> dis = iSchBaseTaskService.getByVehicle(dtl.getString("vehicle_code"));
return new ResponseEntity<>(TableDataInfo.build(dis),HttpStatus.OK);
}
@PostMapping("/taskOpen")
public ResponseEntity<Object> taskOpen(@RequestBody JSONObject dtl) {
iStIvtIostorinvService.taskOpen(dtl);
@PostMapping("/cancelDecision")
@Log("取消分配载具")
public ResponseEntity<Object> cancelDecision(@RequestBody JSONObject dtl) {
iStIvtIostorinvService.cancelVehicle(dtl);
return new ResponseEntity<>(HttpStatus.OK);
}
}

96
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/controller/StIvtIostorinvOutController.java Normal file
View File

@@ -0,0 +1,96 @@
package org.nl.wms.stor_manage.io.controller;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.nl.common.TableDataInfo;
import org.nl.common.domain.entity.PageQuery;
import org.nl.wms.dispatch_manage.task.service.ISchBaseTaskService;
import org.nl.wms.stor_manage.io.service.dto.StorInvQuery;
import org.nl.wms.stor_manage.io.service.iostor.IStIvtIostorinvService;
import org.nl.wms.stor_manage.io.service.iostor.dao.StIvtIostorinv;
import org.nl.wms.stor_manage.io.service.iostor_dtl.IStIvtIostorinvdtlService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
/**
* <p>
* 出入库单主表 前端控制器
* </p>
*
* @author generator
* @since 2024-03-28
*/
@RestController
@RequestMapping("api/stIvtIostorinvout")
public class StIvtIostorinvOutController {
@Autowired
private IStIvtIostorinvService iStIvtIostorinvService;
@Autowired
private IStIvtIostorinvdtlService iStIvtIostorinvDtlOutService;
@Autowired
private ISchBaseTaskService iSchBaseTaskService;
@GetMapping
public ResponseEntity<Object> getAll(StorInvQuery query, PageQuery page) {
Page<StIvtIostorinv> result = iStIvtIostorinvService.page(page.build(), query.build());
return new ResponseEntity<>(TableDataInfo.build(result), HttpStatus.OK);
}
@PostMapping("delete")
public ResponseEntity<Object> delete(@RequestBody List<String> ids) {
iStIvtIostorinvService.removeByIds(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
@PostMapping
public ResponseEntity<Object> save(@RequestBody JSONObject form) {
iStIvtIostorinvService.save(form);
return new ResponseEntity<>(HttpStatus.OK);
}
@PostMapping("getIosInvDtl")
public ResponseEntity<Object> getDtl(@RequestBody String inv_id) {
List<Map> mapList = iStIvtIostorinvDtlOutService.getByInv(inv_id);
return new ResponseEntity<>(mapList,HttpStatus.OK);
}
/**
* 出库分配
* @param dtl
* @return
*/
@PostMapping("/outDecision")
public ResponseEntity<Object> outDecision(@RequestBody JSONObject dtl) {
String struct_code = iStIvtIostorinvService.outDispense(dtl);
return new ResponseEntity<>(struct_code,HttpStatus.OK);
}
/**
* 取消分配
* @param dtl
* @return
*/
@PostMapping("/cancelDecision")
public ResponseEntity<Object> cancelDecision(@RequestBody JSONObject dtl) {
iStIvtIostorinvService.canceldispense(dtl);
return new ResponseEntity<>(HttpStatus.OK);
}
@PostMapping("/divDis")
public ResponseEntity<Object> divDis(@RequestBody JSONObject dtl) {
List<Map> dis = iSchBaseTaskService.getByVehicle(dtl.getString("vehicle_code"));
return new ResponseEntity<>(TableDataInfo.build(dis),HttpStatus.OK);
}
@PostMapping("/taskOpen")
public ResponseEntity<Object> taskOpen(@RequestBody JSONObject dtl) {
iStIvtIostorinvService.taskOpen(dtl);
return new ResponseEntity<>(HttpStatus.OK);
}
}

19
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/IStIvtIostorinvService.java
View File

@@ -16,7 +16,24 @@ public interface IStIvtIostorinvService extends IService<StIvtIostorinv> {
void save(JSONObject form);
String dispense(JSONObject form);
/**
* 出库分配
* @param form
* @return
*/
String outDispense(JSONObject form);
/**
* 入库分配载具
* @param form
*/
void inDecision(JSONObject form);
/**
* 入库取消分配载具
* @param form
*/
void cancelVehicle(JSONObject form);
String canceldispense(JSONObject form);

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/dao/StIvtIostorinv.java
View File

@@ -95,7 +95,7 @@ public class StIvtIostorinv implements Serializable {
* 自定义映射数据
*/
@TableField(typeHandler = FastjsonTypeHandler.class)
private JSONObject form_data;
private JSONObject form_data = new JSONObject();;
/**
* 是否为入库单

128
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/impl/StIvtIostorinvServiceImpl.java
View File

@@ -13,7 +13,13 @@ import org.nl.common.utils.IdUtil;
import org.nl.common.utils.MapOf;
import org.nl.common.utils.SecurityUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.nl.wms.base_manage.vehicle.service.IBmVehicleInfoService;
import org.nl.wms.base_manage.vehicle.service.dao.BmVehicleInfo;
import org.nl.wms.flow_manage.monitor.event.FlowStartEvent;
import org.nl.wms.md_manage.group_dick.service.IMdGruopDickService;
import org.nl.wms.md_manage.group_dick.service.dao.MdGruopDick;
import org.nl.wms.md_manage.vehicleMater.service.IMdPbVehicleMaterService;
import org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater;
import org.nl.wms.stor_manage.io.service.iostor.IStIvtIostorinvService;
import org.nl.wms.stor_manage.io.service.iostor.dao.StIvtIostorinv;
import org.nl.wms.stor_manage.io.service.iostor.dao.mapper.StIvtIostorinvOutMapper;
@@ -26,10 +32,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
/**
@@ -44,10 +47,15 @@ import java.util.stream.Collectors;
public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvOutMapper, StIvtIostorinv> implements IStIvtIostorinvService {
@Autowired
private IStIvtIostorinvdtlService iStIvtIostorinvDtlOutService;
private IStIvtIostorinvdtlService iStIvtIostorinvDtlService;
@Autowired
private IStIvtStructattrService iStIvtStructattrService;
@Autowired
private IMdPbVehicleMaterService iMdPbVehicleMaterService;
@Autowired
private IMdGruopDickService iMdGruopDickService;
@Autowired
private IBmVehicleInfoService iBmVehicleInfoService;
@Override
@Transactional
public void save(JSONObject form) {
@@ -67,7 +75,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvOutMapp
dtl.setId(IdUtil.getStringId());
dtl.setInv_id(mst.getId());
dtl.setStatus(StatusEnum.FORM_STATUS.code("生成"));
iStIvtIostorinvDtlOutService.save(dtl);
iStIvtIostorinvDtlService.save(dtl);
}
}
this.save(mst);
@@ -75,16 +83,112 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvOutMapp
@Override
public String dispense(JSONObject form) {
@Transactional
public void inDecision(JSONObject form) {
Object tmpItemO = form.remove("item");
if (tmpItemO==null||((List)tmpItemO).size()<1){
throw new BadRequestException("入库分配失败:明细不能为空");
}
String now = DateUtil.now();
StIvtIostorinvdtl dtl = form.toJavaObject(StIvtIostorinvdtl.class);
List<MdPbVehicleMater> vehicleMaters = groupVehicle(form, (List<Map>) tmpItemO, dtl);
iStIvtIostorinvDtlService.update(new UpdateWrapper<StIvtIostorinvdtl>()
.set("update_time", now)
.set("vehicle_code",vehicleMaters.stream().map(MdPbVehicleMater::getVehicle_code).collect(Collectors.joining(",")))
.eq("id", dtl.getId())
);
//更新组单据
int count = iStIvtIostorinvDtlService.count(new QueryWrapper<StIvtIostorinvdtl>()
.eq("inv_id", dtl.getInv_id()).isNull("vehicle_code"));
if (count == 0){
this.update(new UpdateWrapper<StIvtIostorinv>()
.set("status",StatusEnum.FORM_STATUS.code("已分配"))
.set("update_time", now).set("update_name",SecurityUtils.getCurrentNickName())
.eq("id",dtl.getInv_id()));
}
}
private List<MdPbVehicleMater> groupVehicle(JSONObject form, List<Map> tmpItemO, StIvtIostorinvdtl dtl) {
String now = DateUtil.now();
String user = SecurityUtils.getCurrentNickName();
List<MdPbVehicleMater> vehicleMaters = new ArrayList<>();
List<MdGruopDick> gruops = new ArrayList<>();
List<Map> items = tmpItemO;
for (Map item : items) {
JSONObject itemJ = new JSONObject(item);
MdPbVehicleMater vehicleMater = new MdPbVehicleMater();
vehicleMater.setVehicle_code(itemJ.getString("vehicle_code"));
vehicleMater.setQty(itemJ.getBigDecimal("qty"));
vehicleMater.setMaterial_id(form.getString("material_id"));
vehicleMater.setPcsn(form.getString("pcsn"));
vehicleMater.setUnit_id(form.getString("unit_id"));
vehicleMater.setStor_code(form.getString("stor_code"));
vehicleMater.setCreate_time(now);
vehicleMater.setSource_form_id(dtl.getId());
vehicleMater.setSource_form_type("st_ivt_iostorinvdtl");
vehicleMater.setCreate_name(user);
vehicleMater.setId(IdUtil.getStringId());
vehicleMaters.add(vehicleMater);
MdGruopDick dick = new MdGruopDick();
dick.setCode(CodeUtil.getNewCode("md_group_dick"));
dick.setId(IdUtil.getStringId());
dick.setCreate_time(now);
dick.setCreate_name(user);
dick.setVehicle_code(itemJ.getString("vehicle_code"));
dick.setSource_form_type("st_ivt_iostorinvdtl");
dick.setSource_form_id(dtl.getId());
dick.setStatus(StatusEnum.FORM_STATUS.code("完成"));
gruops.add(dick);
}
//载具校验
Set<String> collect = vehicleMaters.stream().map(MdPbVehicleMater::getVehicle_code).collect(Collectors.toSet());
int tmpCount = iBmVehicleInfoService.count(new QueryWrapper<BmVehicleInfo>().in("vehicle_code", collect));
if (tmpCount<vehicleMaters.size()){
throw new BadRequestException("组盘失败：载具编号不存在");
}
List<MdPbVehicleMater> tmpCount1 = iMdPbVehicleMaterService.list(new QueryWrapper<MdPbVehicleMater>().in("vehicle_code", collect));
if (tmpCount1.size()>0){
throw new BadRequestException("组盘失败：载具已经存在组盘信息"+tmpCount1.stream().map(MdPbVehicleMater::getVehicle_code).distinct().collect(Collectors.joining(",")));
}
//生成组盘信息
iMdPbVehicleMaterService.saveBatch(vehicleMaters);
iMdGruopDickService.saveBatch(gruops);
return vehicleMaters;
}
@Override
@Transactional
public void cancelVehicle(JSONObject form) {
if (form==null){
throw new BadRequestException("取消分配失败：请求参数不能为空");
}
StIvtIostorinvdtl dtl = form.toJavaObject(StIvtIostorinvdtl.class);
String[] vehicles = dtl.getVehicle_code().split(",");
iMdPbVehicleMaterService.remove(new QueryWrapper<MdPbVehicleMater>().in("vehicle_code",Arrays.asList(vehicles)));
iMdGruopDickService.remove(new QueryWrapper<MdGruopDick>().in("vehicle_code",Arrays.asList(vehicles)));
iStIvtIostorinvDtlService.update(new UpdateWrapper<StIvtIostorinvdtl>()
.set("update_time",DateUtil.now())
.set("vehicle_code",null)
.eq("id",dtl.getId())
);
this.update(new UpdateWrapper<StIvtIostorinv>()
.set("status",StatusEnum.FORM_STATUS.code("生成"))
.set("update_time", DateUtil.now())
.set("update_name",SecurityUtils.getCurrentNickName())
.eq("id",dtl.getInv_id()));
}
@Override
public String outDispense(JSONObject form) {
//分配更新
List<StIvtStructattr> desicion = iStIvtStructattrService.desicion(form, Boolean.FALSE);
if (CollectionUtils.isEmpty(desicion)){
throw new BadRequestException("分配失败,当前出库分配无可用货位");
}
iStIvtIostorinvDtlOutService.update(new UpdateWrapper<StIvtIostorinvdtl>()
iStIvtIostorinvDtlService.update(new UpdateWrapper<StIvtIostorinvdtl>()
.set("vehicle_code",desicion.stream().map(StIvtStructattr::getVehicle_code).collect(Collectors.joining(",")))
.eq("id",form.getString("id")));
int count = iStIvtIostorinvDtlOutService.count(new QueryWrapper<StIvtIostorinvdtl>()
int count = iStIvtIostorinvDtlService.count(new QueryWrapper<StIvtIostorinvdtl>()
.eq("inv_id", form.getString("inv_id")).isNull("vehicle_code"));
if (count == 0){
this.update(new UpdateWrapper<StIvtIostorinv>()
@@ -104,7 +208,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvOutMapp
iStIvtStructattrService.update(new UpdateWrapper<StIvtStructattr>()
.set("lock_type", StatusEnum.LOCK.code("无"))
.in("vehicle_code", Arrays.asList(split)));
iStIvtIostorinvDtlOutService.update(new UpdateWrapper<StIvtIostorinvdtl>()
iStIvtIostorinvDtlService.update(new UpdateWrapper<StIvtIostorinvdtl>()
.set("vehicle_code",null)
.eq("id",form.getString("id")));
@@ -121,7 +225,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvOutMapp
StIvtIostorinv iostorinv = form.toJavaObject(StIvtIostorinv.class);
//查询明细
List<StIvtIostorinvdtl> dtls = iStIvtIostorinvDtlOutService.list(new QueryWrapper<StIvtIostorinvdtl>().eq("inv_id", iostorinv.getId()));
List<StIvtIostorinvdtl> dtls = iStIvtIostorinvDtlService.list(new QueryWrapper<StIvtIostorinvdtl>().eq("inv_id", iostorinv.getId()));
List<Map> dtlJson = new ArrayList<>();
if (!CollectionUtils.isEmpty(dtls)){
for (StIvtIostorinvdtl dtl : dtls) {

3
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dtl/dao/StIvtIostorinvdtl.java
View File

@@ -75,6 +75,7 @@ public class StIvtIostorinvdtl implements Serializable {
*/
private String vehicle_code;
/**
* 仓库
*/
@@ -91,7 +92,7 @@ public class StIvtIostorinvdtl implements Serializable {
@TableField(typeHandler = FastjsonTypeHandler.class)
private JSONObject form_data;
private JSONObject form_data = new JSONObject();;

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dtl/dao/mapper/StIvtIostorinvdtlMapper.java
View File

@@ -23,7 +23,7 @@ public interface StIvtIostorinvdtlMapper extends BaseMapper<StIvtIostorinvdtl> {
Integer batchInsert(List<StIvtIostorinvdtl> dtls);
@Select("SELECT\n" +
" sum(md_pb_vehicleMater.qty) as qty,\n" +
" sum(md_pb_vehicleMater.qty) as vehicle_qty,\n" +
" st_ivt_iostorinvdtl.*,\n" +
" md_me_materialbase.material_code,\n" +
" md_me_materialbase.material_name,\n" +

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dtl/impl/StIvtIostorinvdtlServiceImpl.java
View File

@@ -52,9 +52,7 @@ public class StIvtIostorinvdtlServiceImpl extends ServiceImpl<StIvtIostorinvdtlM
, "stor_code", map.get("stor_code")
, "vehicles", vehicles));
String structs = vechielDtos.stream().map(StructattrVechielDto::getStruct_code).collect(Collectors.joining(","));
int qty = vechielDtos.stream().mapToInt(a->a.getQty().intValue()).sum();
map.put("struct_code",structs);
map.put("qty",qty);
}
}
return byInv;

3
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dto/StructattrVechielDto.java
View File

@@ -1,6 +1,7 @@
package org.nl.wms.stor_manage.struct.service.dto;
import lombok.Data;
import org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater;
import java.math.BigDecimal;
@@ -9,7 +10,7 @@ import java.math.BigDecimal;
* @Date 2023/5/4 19:49
*/
@Data
public class StructattrVechielDto extends org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater {
public class StructattrVechielDto extends MdPbVehicleMater {
private static final long serialVersionUID = 1L;
/**