root/wms_base
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;
/**

9
wms_pro/qd/src/views/wms/dispatch_manage/task/index.vue
View File

@@ -125,11 +125,15 @@
<el-table-column type="selection" width="55"/>
<el-table-column prop="product_area" show-overflow-tooltip show-tooltip-when-overflow label="生产区域"/>
<el-table-column prop="task_code" show-overflow-tooltip show-tooltip-when-overflow label="任务编码"/>
<el-table-column prop="task_type" show-overflow-tooltip show-tooltip-when-overflow label="任务类型"/>
<el-table-column prop="task_type" show-overflow-tooltip show-tooltip-when-overflow label="任务类型">
<template slot-scope="scope">
{{ statusEnum.label.TASK_TYPE[scope.row.task_type] }}
</template>
</el-table-column>
<el-table-column prop="acs_type" show-overflow-tooltip show-tooltip-when-overflow width="130" label="ACS任务类型"/>
<el-table-column prop="status" show-overflow-tooltip show-tooltip-when-overflow label="任务状态">
<template slot-scope="scope">
{{ getStatusName(scope.row.status) }}
{{ statusEnum.label.FORM_STATUS[scope.row.status] }}
</template>
</el-table-column>
<el-table-column prop="task_step" show-overflow-tooltip show-tooltip-when-overflow width="130" label="任务执行步骤"/>
@@ -215,6 +219,7 @@ export default {
name: 'Task',
components: {pagination, crudOperation, rrOperation, udOperation},
mixins: [presenter(), header(), form(defaultForm), crud()],
statusEnums: [ 'TASK_TYPE', 'FORM_STATUS' ],
cruds() {
return CRUD({
title: '任务管理',

46
wms_pro/qd/src/views/wms/md_manage/group_dick/AddDialog.vue
View File

@@ -28,9 +28,6 @@
<el-form-item label="单据状态" prop="status">
<el-input v-model="form.status" disabled placeholder="生成" clearable style="width: 150px" />
</el-form-item>
<el-form-item label="父载具" prop="parent_vehicle_code">
<el-input v-model="form.parent_vehicle_code" clearable style="width: 150px" />
</el-form-item>
<el-form-item label="源单类型" prop="source_form_type">
<el-input v-model="form.source_form_type" clearable style="width: 150px" />
</el-form-item>
@@ -86,14 +83,25 @@
border
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column show-overflow-tooltip prop="stor_code" label="仓库" width="160" align="center">
<template scope="scope">
<el-input v-model="tableData[scope.$index].stor_code" class="input-with-select" />
<el-select
v-model="tableData[scope.$index].stor_code"
clearable
class="filter-item"
placeholder="所属仓库"
@change="crud.toQuery"
>
<el-option
v-for="item in tableEnum.st_ivt_bsrealstorattr"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="struct_code" label="仓位" width="160" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column show-overflow-tooltip prop="vehicle_code" label="载具编号" width="160" align="center">
<template scope="scope">
<el-input v-model="tableData[scope.$index].vehicle_code" class="input-with-select" />
@@ -186,12 +194,15 @@ import measureunit from '@/views/wms/base_manage/measure/measureunit'
const defaultForm = {
id: '',
parent_vehicle_code: '',
child_qty: '0',
vehicle_code: '',
status: '',
source_form_id: '',
source_form_type: '',
remark: '',
update_name: '',
update_time: '',
status: '',
create_time: '',
create_name: '',
form_data: {}
}
@@ -199,7 +210,8 @@ export default {
name: 'AddDialog',
components: { formstruc, MaterDialog, FormDialog, measureunit },
mixins: [ crud(), form(defaultForm) ],
dicts: [ 'FORM_STATUS' ],
statusEnums: [ 'FORM_STATUS' ],
tableEnums: [ 'st_ivt_bsrealstorattr#stor_name#stor_code' ],
props: {
dialogShow: {
type: Boolean,
@@ -236,13 +248,15 @@ export default {
methods: {
open() {
this.tableData = []
this.form.source_form_type = ''
this.form.source_form_id = ''
formstruc.getHeader('md_group_dick').then(res => {
this.cols = res
res.forEach(a => {
this.form.form_data[a.value,'']
})
}),
formstruc.getHeader('md_pb_vehicleivt').then(res => {
formstruc.getHeader('md_pb_vehicleMater').then(res => {
this.dtlCols = res
})
measureunit.getSelect().then(res => {
@@ -280,7 +294,7 @@ export default {
},
tableDtlMaterial2(data) {
let mst = data['t'];
let rows = data['item'];
let rows = [];
this.form.source_form_type = mst.form_type
this.form.source_form_id = mst.id
let mst_form_data = mst.form_data;
@@ -292,6 +306,12 @@ export default {
}
this.$set(this.form.form_data,a.value,item)
})
if (data['item']!=null && data['item'].length>0){
rows = data['item']
}else {
rows
rows.push(mst)
}
rows.forEach((row) => {
const data = {}
data.material_name = row.material_name

7
wms_pro/qd/src/views/wms/md_manage/group_dick/ViewDialog.vue
View File

@@ -66,7 +66,6 @@
>
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column show-overflow-tooltip prop="stor_code" label="仓库" width="160" align="center" />
<el-table-column show-overflow-tooltip prop="struct_code" label="仓位" width="160" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="vehicle_code" label="托盘编号" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="parent_vehicle_code" label="父托盘编码" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_id" label="物料id" align="center" />
@@ -137,15 +136,15 @@ export default {
formstruc.getHeader('md_group_dick').then(res => {
this.cols = res
}),
formstruc.getHeader('md_pb_vehicleivt').then(res => {
formstruc.getHeader('md_pb_vehicleMater').then(res => {
this.dtlCols = res
})
},
setForm(row) {
this.dialogVisible = true
this.form = row
crudVehicleMater.getgroupDtl(this.form.id).then(res => {
this.tableDtl = res.content
crudVehicleMater.getgroupDtl(this.form.vehicle_code).then(res => {
this.tableDtl = res
})
},
close() {

10
wms_pro/qd/src/views/wms/md_manage/group_dick/index.vue
View File

@@ -100,14 +100,15 @@
<el-link type="warning" @click="vechile(scope.row)">{{ scope.row.code }}</el-link>
</template>
</el-table-column>
<el-table-column prop="parent_vehicle_code" label="父托盘" show-overflow-tooltip/>
<el-table-column prop="source_form_type" label="源单号" show-overflow-tooltip/>
<el-table-column prop="source_form_id" label="源单id" show-overflow-tooltip/>
<el-table-column prop="status" label="状态">
<template slot-scope="scope">
{{ dict.label.FORM_STATUS[scope.row.status] }}
</template>
</el-table-column>
<el-table-column prop="vehicle_code" label="托盘" show-overflow-tooltip/>
<el-table-column prop="source_form_type" label="源单号" show-overflow-tooltip/>
<el-table-column prop="source_form_id" label="源单id" show-overflow-tooltip/>
<el-table-column prop="create_time" label="组盘时间"/>
<el-table-column prop="create_name" label="组盘人"/>
<el-table-column v-for="(item, index) in cols" :key="item.value" :label="item.lable" >
@@ -198,6 +199,9 @@ export default {
[CRUD.HOOK.beforeRefresh]() {
formstruc.getHeader('md_group_dick').then(res => {
this.cols = res
res.forEach(a => {
this.form.form_data[a.value,'']
})
})
},
querytable(){

21
wms_pro/qd/src/views/wms/pm_manage/form_data/FormDialog.vue
View File

@@ -25,7 +25,7 @@
@change="crud.toQuery()"
>
<el-option
v-for="item in fromTypes"
v-for="item in tableEnum.bm_form_struc"
:key="item.value"
:value="item.value"
:label="item.label"
@@ -149,7 +149,7 @@ export default {
return CRUD({ title: '单据', url: 'api/pmFormData', crudMethod: { ...crudFormData }, optShow: {}})
},
mixins: [presenter(), header()],
dicts: ['product_series'],
tableEnums: [ 'bm_form_struc#form_name#form_type' ],
props: {
dialogShow: {
type: Boolean,
@@ -166,7 +166,6 @@ export default {
},
data() {
return {
fromTypes: [],
cols: [],
dialogVisible: false,
dtlVisible: false,
@@ -185,10 +184,9 @@ export default {
},
methods: {
open() {
this.getFromTypes()
},
[CRUD.HOOK.beforeRefresh]() {
if (this.fromTypes.length > 0){
if (this.query.form_type !=null){
formstruc.getHeader(this.query.form_type).then(res => {
this.cols = res
})
@@ -196,15 +194,7 @@ export default {
}
return false
},
getFromTypes() {
crudFormData.getFormType().then((res) => { // 获取分类名称，查询根据分类编码查找对应分支树
this.fromTypes = res
if (this.fromTypes.length > 0) {
this.$set(this.query, 'form_type', this.fromTypes[0].value)
this.crud.toQuery()
}
})
},
toView(row){
if (row.hasChildren){
this.dtlVisible = true
@@ -214,9 +204,6 @@ export default {
clickChange(item) {
this.tableRadio = item
},
seriesFormat(row) {
return this.dict.label.product_series[row.product_series]
},
handleSelectionChange(val, row) {
if (this.isSingle) {
if (val.length > 1) {

431
wms_pro/qd/src/views/wms/stor_manage/in/AddDialog.vue
View File

@@ -5,7 +5,7 @@
fullscreen
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0 || crud.status.view > 0"
width="1200px"
width="1600px"
@open="open"
@close="close"
>
@@ -22,107 +22,60 @@
</el-row>
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="85px" label-suffix=":">
<el-form-item label="单据号" prop="bill_code">
<label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
<el-input v-model="form.bill_code" disabled placeholder="系统生成" clearable style="width: 210px" />
</el-form-item>
<el-form-item label="业务日期" prop="biz_date">
<el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px" value-format="yyyy-MM-dd" :disabled="crud.status.view > 0" />
<el-form-item label="单据号" prop="code">
<el-input v-model="form.code" disabled placeholder="系统生成" clearable style="width: 150px" />
</el-form-item>
<el-form-item label="业务类型" prop="bill_type">
<el-select
v-model="form.bill_type"
style="width: 210px"
clearable
size="mini"
style="width: 100px; height: 35px;top: -5px;"
placeholder="业务类型"
class="filter-item"
>
<el-option
v-for="item in dict.ST_INV_CP_IN_TYPE"
v-for="item in statusEnum.IOBILL_TYPE_IN"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="仓库" prop="id">
<label slot="label">仓库</label>
<el-select
v-model="form.id"
clearable
class="filter-item"
style="width: 210px"
:disabled="crud.status.view > 0"
>
<el-option
v-for="item in storlist"
:key="item.id"
:label="item.stor_name"
:value="item.id"
/>
</el-select>
<el-form-item label="单据状态" prop="status">
<el-input v-model="form.status" disabled placeholder="生成" clearable style="width: 150px" />
</el-form-item>
<el-form-item label="单据状态" prop="bill_status">
<el-select
v-model="form.bill_status"
clearable
style="width: 210px"
placeholder="单据状态"
class="filter-item"
disabled
>
<el-option
v-for="item in dict.IO_BILL_STATUS"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
<el-form-item label="源单类型" prop="source_form_type">
<el-input v-model="form.source_form_type" clearable style="width: 150px" />
</el-form-item>
<el-form-item label="总数量" prop="total_qty">
<label slot="label">总&nbsp;&nbsp;数&nbsp;量:</label>
<el-input-number
v-model="form.total_qty"
:controls="false"
:precision="3"
:min="0"
disabled
style="width: 210px"
/>
<el-form-item label="源单id" prop="source_form_id">
<el-input v-model="form.source_form_id" clearable style="width: 150px" />
</el-form-item>
<el-form-item label="源单时间" prop="source_form_date">
<el-input v-model="form.source_form_date" clearable style="width: 150px" />
</el-form-item>
<!-- <el-form-item-->
<!-- v-for="(col,index) in cols"-->
<!-- :label="col.lable"-->
<!-- :value="col.value"-->
<!-- >-->
<!-- <el-input v-model="col.value" clearable style="width: 210px" />-->
<!-- </el-form-item>-->
<template v-for="(col,index) in cols">
<el-form-item label="col.lable" prop="bill_code">
<label slot="label">{{col.lable}}:</label>
<el-input v-model="form.form_data[col.value]" :value="col.value" clearable style="width: 210px" />
<el-input v-model="form.form_data[col.value]" :value="col.value" clearable style="width: 150px" />
</el-form-item>
</template>
<el-form-item label="备注" prop="remark">
<label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
<el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
<el-input v-model="form.remark" style="width: 380px;" rows="2" type="textarea" />
</el-form-item>
</el-form>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<div class="crud-opts2" style="margin-bottom: 5px;">
<span class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left" />
<el-button
slot="left"
class="filter-item"
type="primary"
icon="el-icon-plus"
size="mini"
@click="insertEvent()"
>
<el-button
slot="left"
class="filter-item"
type="primary"
icon="el-icon-plus"
size="mini"
@click="insertEvent()"
>
添加物料
</el-button>
<el-button
@@ -131,9 +84,9 @@
type="primary"
icon="el-icon-plus"
size="mini"
@click="insertdtl()"
@click="insertForm()"
>
新增一行
添加单据
</el-button>
</span>
@@ -141,48 +94,27 @@
<!--表格渲染-->
<el-table
ref="table"
:data="form.tableData"
:data="tableData"
style="width: 100%;"
border
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" width="190" align="center">
<template scope="scope">
<el-input v-show="!scope.row.edit" v-model="scope.row.material_code" disabled class="input-with-select">
<el-button slot="append" icon="el-icon-plus" @click="queryMater(scope.$index, scope.row)" />
</el-input>
<span v-show="scope.row.edit">{{ scope.row.material_code }}</span>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="material_spec" label="物料规格" />
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" />
<el-table-column show-overflow-tooltip prop="material_name" label="物料名称" />
<el-table-column show-overflow-tooltip prop="qty" label="入库数量">
<template slot-scope="scope">
<el-input-number
v-model="form.tableData[scope.$index].qty"
size="small"
controls-position="right"
precision="3"
:min="0"
@change="changeQty"
/>
<span v-show="scope.row.edit">{{ scope.row.qty }}</span>
</template>
<el-table-column show-overflow-tooltip prop="material_spec" label="物料规格" />
<el-table-column show-overflow-tooltip prop="pcsn" label="物料批次" width="160" align="center">
<template scope="scope"><el-input v-model="tableData[scope.$index].pcsn" class="input-with-select" /></template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="qty_unit_name" label="单位">
<el-table-column show-overflow-tooltip prop="qty" label="计划数量" width="160" align="center">
<template scope="scope"><el-input-number v-model="tableData[scope.$index].qty" class="input-with-select" /></template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="unit_id" label="单位" width="160">
<template slot-scope="scope">
<el-select
v-model="form.tableData[scope.$index].qty_unit_id"
style="width: 210px"
clearable
size="mini"
placeholder="单位"
class="filter-item"
>
<el-select v-model="tableData[scope.$index].unit_id"
class="filter-item" placeholder="单位" size="small" style="width: 90px">
<el-option
v-for="item in dict.ST_INV_CP_IN_TYPE"
v-for="item in unitDict"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -190,18 +122,17 @@
</el-select>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="quality_scode" label="品质">
<template slot-scope="scope">
<el-table-column show-overflow-tooltip prop="stor_code" label="仓库" width="160" align="center">
<template scope="scope">
<el-select
v-model="form.tableData[scope.$index].quality_scode"
style="width: 210px"
v-model="tableData[scope.$index].stor_code"
clearable
size="mini"
placeholder="品质"
class="filter-item"
placeholder="所属仓库"
@change="crud.toQuery"
>
<el-option
v-for="item in dict.ST_INV_CP_IN_TYPE"
v-for="item in tableEnum.st_ivt_bsrealstorattr"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -209,28 +140,29 @@
</el-select>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="single_wt" label="单重" width="190" align="center">
<el-table-column show-overflow-tooltip prop="source_form_type" label="源单类型" width="190" align="center">
<template scope="scope">
<el-input v-model="form.tableData[scope.$index].single_wt" class="input-with-select" />
<el-input v-model="tableData[scope.$index].source_form_type" class="input-with-select" />
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="pcsn" label="批次" width="190" align="center">
<el-table-column show-overflow-tooltip prop="source_form_type" label="源单id" width="190" align="center">
<template scope="scope">
<el-input v-model="form.tableData[scope.$index].pcsn" class="input-with-select" />
<el-input v-model="tableData[scope.$index].source_form_id" class="input-with-select" />
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="stor_code" label="仓库" width="190" align="center">
<el-table-column v-for="(item, index) in dtlCols" :key="item.value" :label="item.lable" width="160">
<template scope="scope">
<el-input v-model="form.tableData[scope.$index].stor_code" class="input-with-select" />
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="shipper" label="货主" width="190" align="center">
<template scope="scope">
<el-input v-model="form.tableData[scope.$index].shipper" class="input-with-select" />
<el-input v-model="tableData[scope.$index].form_data[item.value]" class="input-with-select" />
</template>
</el-table-column>
<el-form-item label="备注" prop="remark">
<label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
<template scope="scope">
<el-input v-model="tableData[scope.$index].remark" rows="2" type="textarea"/>
</template>
</el-form-item>
<el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="170" fixed="right">
<template scope="scope">
<el-button
@@ -238,7 +170,7 @@
class="filter-item"
size="mini"
icon="el-icon-delete"
@click.native.prevent="deleteRow(scope.$index, form.tableData)"
@click.native.prevent="deleteRow(scope.$index, tableData)"
/>
</template>
</el-table-column>
@@ -250,46 +182,45 @@
:mater-opt-code="materType"
@setMaterValue="tableDtlMaterial"
/>
<AddDtl
:dialog-show.sync="dtlShow"
<FormDialog
:dialog-show.sync="formShow"
:is-single="false"
@tableChanged="tableChanged2"
@setMaterValue="tableDtlMaterial2"
/>
</el-dialog>
</template>
<script>
import CRUD, { crud, form } from '@crud/crud'
import crudProductIn from '@/views/wms/stor_manage/in/storinvin'
import MaterDialog from '@/views/wms/base_manage/material/MaterDialog'
import AddDtl from '@/views/wms/stor_manage/in/AddDtl'
import FormDialog from '@/views/wms/pm_manage/form_data/FormDialog'
import formstruc from '@/views/wms/config_manage/formStruc/formstruc'
// import crudStorattr, { getStor } from '@/views/wms/storage_manage/basedata/basedata'
import measureunit from '@/views/wms/base_manage/measure/measureunit'
const defaultForm = {
bill_code: '',
product_code: '',
bill_status: '10',
total_qty: '0',
detail_count: '0',
bill_type: '',
remark: '',
workshop_id: '',
id: '',
biz_date: new Date(),
create_mode: '',
tableData: [],
code: '',
bill_type: '',
status: '',
product_area: '',
source_form_type: '',
source_form_id: '',
source_form_date: '',
create_name: '',
create_time: '',
update_name: '',
update_time: '',
remark: '',
form_data: {}
}
export default {
name: 'AddDialog',
components: { formstruc, MaterDialog, AddDtl },
components: { formstruc, MaterDialog,measureunit, FormDialog },
mixins: [crud(), form(defaultForm)],
dicts: ['IO_BILL_STATUS', 'ST_INV_CP_IN_TYPE', 'ST_QUALITY_SCODE', 'bill_type', 'product_area', 'PCS_SAL_TYPE'],
statusEnums: [ 'FORM_STATUS', 'IOBILL_TYPE_IN' ],
tableEnums: [ 'st_ivt_bsrealstorattr#stor_name#stor_code' ],
props: {
dialogShow: {
type: Boolean,
@@ -302,15 +233,20 @@ export default {
data() {
return {
cols:[],
dtlCols:[],
tableData:[],
dialogVisible: false,
materShow: false,
formShow: false,
dtlShow: false,
opendtlParam: null,
materType: '03', // 关键成品
storlist: [],
billtypelist: [],
rules: {
bill_type: [
{ required: true, message: '单据类型不能为空', trigger: 'blur' }
],
}
}
},
@@ -323,144 +259,111 @@ export default {
},
methods: {
open() {
formstruc.getHeader('STOR_IN').then(res => {
this.tableData = [],
formstruc.getHeader('st_ivt_iostorinv').then(res => {
this.cols = res
res.forEach(a => {
this.form.form_data[a.value,'']
})
})
// crudStorattr.getStor({ 'stor_type': '4' }).then(res => {
// this.storlist = res.content
// })
formstruc.getHeader('st_ivt_iostorinvdtl').then(res => {
this.dtlCols = res
}),
measureunit.getSelect().then(res => {
this.unitDict = res.content
})
},
close() {
this.$emit('AddChanged')
},
[CRUD.HOOK.afterToEdit]() {
// 获取入库单明细
crudProductIn.getIosInvDtl({ 'bill_code': this.form.bill_code }).then(res => {
this.form.tableData = res
// 将明细变成不可编辑
for (let i = 0; i < this.form.tableData.length; i++) {
const row = this.form.tableData[i]
this.form.tableData.splice(i, 1, row)
}
})
},
[CRUD.HOOK.afterToView]() {
crudProductIn.getIosInvDtl({ 'bill_code': this.form.bill_code }).then(res => {
this.form.tableData = res
// 将明细变成不可编辑
for (let i = 0; i < this.form.tableData.length; i++) {
const row = this.form.tableData[i]
this.form.tableData.splice(i, 1, row)
}
})
},
[CRUD.HOOK.beforeSubmit]() {
// 提交前校验
if (this.form.tableData.length === 0) {
this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
return true
}
for (let i = 0; i < this.form.tableData.length; i++) {
const row = this.form.tableData[i]
if (!row.qty) {
this.crud.notify('数量不能为空', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
}
},
deleteRow(index, rows) {
const material_code = rows[index].material_code
let len = rows.length
while (len--) {
const obj = rows[len]
if (material_code === obj.material_code) {
const index = rows.indexOf(obj)
if (index > -1) { // 移除找到的指定元素
this.form.total_qty = parseFloat(this.form.total_qty) - parseFloat(rows[index].qty)
rows.splice(index, 1)
this.form.detail_count = this.form.tableData.length
}
}
}
},
tableDtlMaterial(rows) {
rows.forEach((row) => {
const data = {}
data.material_id = row.material_id
data.material_code = row.material_code
data.material_name = row.material_name
data.material_spec = row.material_spec
data.qty = row.sale_qty
data.qty_unit_name = row.qty_unit_name
data.qty_unit_id = row.qty_unit_id
data.base_billdtl_id = row.sale_id
data.base_bill_type = row.sale_type
data.base_bill_code = row.sale_code
data.base_bill_table = row.seq_no
data.unit_weight = row.unit_weight
data.edit = true
this.form.tableData.splice(-1, 0, data)
this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(data.qty)
})
},
tableChanged2(rows) {
rows.forEach((row) => {
let same_mater = true
this.form.tableData.forEach((item) => {
if (item.base_bill_code === row.sale_code && item.base_bill_table === row.seq_no) {
same_mater = false
}
})
if (same_mater) {
const data = {}
data.material_id = row.material_id
data.material_code = row.material_code
data.material_name = row.material_name
data.material_spec = row.material_spec
data.qty = row.sale_qty
data.qty_unit_name = row.qty_unit_name
data.qty_unit_id = row.qty_unit_id
data.base_billdtl_id = row.sale_id
data.base_bill_type = row.sale_type
data.base_bill_code = row.sale_code
data.base_bill_table = row.seq_no
data.unit_weight = row.unit_weight
data.edit = true
this.form.tableData.splice(-1, 0, data)
this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(data.qty)
}
})
},
insertEvent(row) {
this.materShow = true
},
insertForm(row) {
this.formShow = true
},
queryMater(index, row) {
this.nowindex = index
this.nowrow = row
this.materShow = true
},
insertdtl() {
if (this.form.bill_type === '') {
this.crud.notify('请选择业务类型！', CRUD.NOTIFICATION_TYPE.INFO)
return
[CRUD.HOOK.beforeSubmit]() {
// 提交前校验
this.$refs['form'].validate((valid) => {
if (valid) {
return true
}else {
return false
}
})
if (this.tableData.length === 0) {
this.crud.notify('请至少选择一条明细', CRUD.NOTIFICATION_TYPE.INFO)
return false
}
this.form.tableData.push({ edit: false, qty: '0' })
this.form.detail_count = this.form.tableData.length
this.form.item = this.tableData
},
changeQty() {
this.form.total_qty = 0
this.form.tableData.forEach((item) => {
this.form.total_qty = parseFloat(this.form.total_qty) + parseFloat(item.qty)
deleteRow(index, rows) {
rows.splice(index, 1)
},
tableDtlMaterial(rows) {
rows.forEach((row) => {
const data = {}
data.material_name = row.material_name
data.material_code = row.material_code
data.material_id = row.material_id
data.material_spec = row.material_spec
data.source_form_type = ''
data.source_form_id = ''
data.unit_id = row.unit_id
data.form_data = {}
this.dtlCols.forEach(a=>{
this.$set(data.form_data,a.value,'')
})
this.tableData.splice(-1, 0, data)
})
},
formatBaseType(row) {
return this.dict.label.PCS_SAL_TYPE[row.base_bill_type]
tableDtlMaterial2(data) {
let mst = data['t'];
let rows = [];
this.form.source_form_type = mst.form_type
this.form.source_form_id = mst.id
let mst_form_data = mst.form_data;
if (data['item'] ==null || data['item'].length == 0){
rows.push(mst)
}else {
rows = data['item']
}
this.cols.forEach(a=>{
let item = ''
if (a.value in mst_form_data) {
item = mst_form_data[a.value];
}
this.$set(this.form.form_data,a.value,item)
})
rows.forEach((row) => {
const data = {}
data.material_name = row.material_name
data.material_code = row.material_code
data.material_id = row.material_id
data.material_spec = row.material_spec
data.source_form_type = row.form_type
data.source_form_id = row.id
data.unit_id = row.unit_id
data.form_data = {}
let row_form_data = row.form_data;
this.dtlCols.forEach(a=>{
let item = ''
if (a.value in row_form_data) {
item = row_form_data[a.value];
}
this.$set(data.form_data,a.value,item)
})
this.tableData.splice(-1, 0, data)
})
}
}
}

203
wms_pro/qd/src/views/wms/stor_manage/in/AddDtl.vue
View File

@@ -1,203 +0,0 @@
<template>
<el-dialog
title="物料新增"
append-to-body
:visible.sync="dialogVisible"
destroy-on-close
width="1200px"
@close="close"
@open="open"
>
<div class="head-container">
<div v-if="crud.props.searchToggle">
<!-- 搜索 -->
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="80px"
label-suffix=":"
>
<el-form-item label="销售单号">
<el-input
v-model="query.sale_code"
size="mini"
clearable
placeholder="销售单号"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item label="客户编码">
<el-input
v-model="query.cust_code"
size="mini"
clearable
placeholder="客户编码"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<!--
<el-form-item label="创建日期">
<el-date-picker
v-model="query.createTime"
type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
@change="crud.toQuery"
/>
</el-form-item>-->
<rrOperation />
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation />
<!--表格渲染-->
<el-table
ref="multipleTable"
v-loading="crud.loading"
:data="crud.data"
style="width: 100%;"
@select="handleSelectionChange"
@selection-change="crud.selectionChangeHandler"
@current-change="clickChange"
>
<el-table-column v-if="!isSingle" type="selection" width="55" />
<el-table-column v-if="isSingle" label="选择" width="55">
<template slot-scope="scope">
<el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip width="150" prop="sale_code" label="销售单号" />
<el-table-column show-overflow-tooltip width="150" prop="seq_no" label="行号" />
<el-table-column show-overflow-tooltip width="150" prop="sale_type" label="销售单类型" :formatter="formterType" />
<el-table-column show-overflow-tooltip width="150" prop="status" label="状态" :formatter="formterStatus" />
<el-table-column show-overflow-tooltip width="150" prop="material_code" label="物料编码" />
<el-table-column show-overflow-tooltip width="150" prop="material_name" label="物料名称" />
<el-table-column show-overflow-tooltip width="150" prop="sale_qty" label="销售数量" />
<el-table-column show-overflow-tooltip width="150" prop="cust_code" label="客户编码" />
<el-table-column show-overflow-tooltip width="150" prop="cust_name" label="客户名称" />
<el-table-column show-overflow-tooltip width="150" prop="product_qty" label="生产数量" />
<el-table-column show-overflow-tooltip width="150" prop="qty_unit_name" label="单位" />
<el-table-column show-overflow-tooltip width="150" prop="plandeliver_date" label="计划交期" />
<el-table-column show-overflow-tooltip width="150" prop="create_name" label="创建人" />
<el-table-column show-overflow-tooltip width="150" prop="create_time" label="创建时间" />
</el-table>
<!--分页组件-->
<pagination />
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="submit">确 定</el-button>
</span>
</el-dialog>
</template>
<script>
import CRUD, { crud, header, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import pagination from '@crud/Pagination'
import DateRangePicker from '@/components/DateRangePicker/index'
import crudProductIn from '@/views/wms/stor_manage/in/storinvin'
const start = new Date()
export default {
name: 'AddDtl',
dicts: ['PCS_SAL_TYPE', 'PCS_SALE_STATUS'],
components: { crudOperation, rrOperation, pagination, DateRangePicker },
cruds() {
return CRUD({
title: '用户',
url: '/api/mpsSaleOrder',
crudMethod: {},
optShow: {
reset: true
}
})
},
mixins: [presenter(), header(), crud()],
props: {
dialogShow: {
type: Boolean,
default: false
},
opendtlParam: {
type: Object
},
isSingle: {
type: Boolean,
default: true
}
},
data() {
return {
dialogVisible: false,
rows: [],
tableRadio: null,
tableData: []
}
},
watch: {
dialogShow: {
handler(newValue, oldValue) {
this.dialogVisible = newValue
}
}
},
methods: {
[CRUD.HOOK.beforeRefresh]() {
this.crud.query.bill_type = '0001'
return true
},
open() {
this.query.status = '10'
this.crud.toQuery()
},
close() {
this.$emit('update:dialogShow', false)
},
clickChange(item) {
this.tableRadio = item
},
handleSelectionChange(val, row) {
if (this.isSingle) {
if (val.length > 1) {
this.$refs.table.clearSelection()
this.$refs.table.toggleRowSelection(val.pop())
} else {
this.checkrow = row
}
}
},
submit() {
// 处理单选
if (this.isSingle && this.tableRadio) {
this.$emit('update:dialogShow', false)
this.$emit('tableChanged', this.tableRadio)
return
}
this.rows = this.$refs.multipleTable.selection
if (this.rows.length <= 0) {
this.$message('请先勾选物料')
return
}
this.crud.resetQuery(false)
this.$emit('update:dialogShow', false)
this.$emit('tableChanged', this.rows)
},
formterType(row) {
return this.dict.label.PCS_SAL_TYPE[row.sale_type]
},
formterStatus(row) {
return this.dict.label.PCS_SALE_STATUS[row.status]
}
}
}
</script>

2
wms_pro/qd/src/views/wms/stor_manage/in/DivDialog.vue
View File

@@ -258,8 +258,6 @@
<script>
import CRUD, { crud } from '@crud/crud'
// import StructDiv from '@/views/wms/storage_manage/product/productIn/StructDiv'
// import AddBox from '@/views/wms/storage_manage/product/productIn/AddBox'
import crudProductIn from '@/views/wms/stor_manage/in/storinvin'
import crudPoint from '@/views/wms/stor_manage/in/storinvin'

317
wms_pro/qd/src/views/wms/stor_manage/in/GroupDickDialog.vue
View File

@@ -1,317 +0,0 @@
<template>
<el-dialog
append-to-body
:visible.sync="dialogVisible"
destroy-on-close
:show-close="false"
fullscreen
@open="open"
>
<span slot="title" class="dialog-footer">
<div class="crud-opts2">
<span class="el-dialog__title2">入库组盘分配</span>
<span class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left" />
<el-button slot="left" type="info" @click="dialogVisible = false">关闭</el-button>
</span>
</div>
</span>
<div class="crud-opts2">
<span class="role-span">入库明细项</span>
</div>
<el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
<!--表格渲染-->
<el-table
ref="dtl_table"
:data="this.form"
style="width: 100%;"
max-height="300"
border
highlight-current-row
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
@row-click="clickRow"
>
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column prop="bill_status" label="状态" align="center" width="110px">
<template slot-scope="scope">
<el-select
v-model="scope.row.bill_status"
class="filter-item"
:disabled="true"
>
<el-option
v-for="item in dict.IO_BILL_STATUS"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
<el-table-column show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
<el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
<el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="数量" align="center" />
<el-table-column show-overflow-tooltip prop="assign_qty" :formatter="crud.formatNum3" label="已分配数量" align="center" />
<el-table-column show-overflow-tooltip prop="unassign_qty" :formatter="crud.formatNum3" label="未分配数量" align="center" />
<el-table-column show-overflow-tooltip prop="qty_unit_name" label="单位" align="center" />
<el-table-column show-overflow-tooltip prop="base_bill_code" label="源单号" align="center" />
<el-table-column show-overflow-tooltip prop="base_bill_table" label="源单行号" align="center" />
</el-table>
</el-card>
<!-- <el-card class="box-card" shadow="never" :body-style="{padding:'20px 20px 0 20px'}">-->
<!-- <el-form ref="form2" :inline="true" :model="form" :rules="rules" size="mini">-->
<!-- <el-form-item label="载具号:" prop="vehicle_code">-->
<!-- <el-input v-model="form.vehicle_code" style="width: 200px" size="mini" clearable placeholder="载具号">-->
<!-- <el-button slot="append" @click="" >生成</el-button>-->
<!-- </el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="箱号:" prop="pageBox_code">-->
<!-- <el-input v-model="form.bucketunique" size="mini" style="width: 200px" disabled placeholder="箱号">-->
<!-- <el-button slot="append" icon="el-icon-plus" @click="" />-->
<!-- </el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="放入数量:" prop="storage_qty">-->
<!-- <el-input-number-->
<!-- v-model="form.storage_qty"-->
<!-- style="width: 200px"-->
<!-- size="mini"-->
<!-- :controls="false"-->
<!-- precision="3"-->
<!-- :min="0"-->
<!-- placeholder="数量"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="入库点:" prop="point_code">-->
<!-- <el-select-->
<!-- v-model="form.point_code"-->
<!-- size="mini"-->
<!-- clearable-->
<!-- placeholder="请选择"-->
<!-- class="filter-item"-->
<!-- style="width: 200px;"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in pointlist"-->
<!-- :key="item.point_code"-->
<!-- :label="item.point_name"-->
<!-- :value="item.point_code"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="载具超限类型:" prop="vehicle_overstruct_type">-->
<!-- <el-select-->
<!-- v-model="form.vehicle_overstruct_type"-->
<!-- size="mini"-->
<!-- placeholder="请选择"-->
<!-- class="filter-item"-->
<!-- style="width: 200px;"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in dict.VEHICLE_OVER_TYPE"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- </el-card>-->
<div class="crud-opts2">
<span class="role-span">载具物料明细</span>
<div class="crud-opts-form">
<el-form ref="form" :inline="true" :model="form" size="mini">
<el-form-item label="库区:" prop="gender5">
<el-cascader
placeholder="请选择"
:options="sects"
v-model="defaultList"
:props="{ checkStrictly: true }"
clearable
/>
</el-form-item>
<el-form-item prop="checked">
<el-checkbox v-model="form.checked">自动分配货位</el-checkbox>
</el-form-item>
</el-form>
</div>
<span class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left" />
<el-button
slot="left"
class="filter-item"
type="primary"
icon="el-icon-plus"
size="mini"
@click="groupConfim((crud.selections[0]))"
>
组盘确认
</el-button>
<el-button
slot="left"
class="filter-item"
type="primary"
icon="el-icon-plus"
size="mini"
>
取消组盘
</el-button>
</span>
</div>
<el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
<!--表格渲染-->
<el-table
ref="dis_table"
:data="form.tableMater"
style="width: 100%;"
max-height="300"
border
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
<el-table-column show-overflow-tooltip type="index" label="序号" align="center" />
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
<el-table-column show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
<el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
<el-table-column show-overflow-tooltip prop="storagevehicle_code" label="托盘号" align="center" />
<el-table-column show-overflow-tooltip prop="bucketunique" label="箱号" align="center" />
<el-table-column show-overflow-tooltip prop="qty" :formatter="crud.formatNum3" label="数量" align="center" />
<el-table-column show-overflow-tooltip prop="struct_code" label="货位" align="center" />
<el-table-column show-overflow-tooltip prop="point_code" label="入库点" align="center" />
<el-table-column show-overflow-tooltip prop="task_code" label="任务号" align="center" />
<el-table-column align="center" label="操作" width="170" fixed="right">
<template scope="scope">
<el-button
type="danger"
class="filter-item"
size="mini"
icon="el-icon-delete"
/>
</template>
</el-table-column>
</el-table>
</el-card>
<!-- <StructDiv ref="child" :stor-id="storId" :dialog-show.sync="structShow" :sect-prop="sectProp" @tableChanged="tableChanged" />-->
<!-- <AddBox ref="child" :dialog-show.sync="addBoxShow" :add-box-param="boxParam" @tableChanged2="tableChanged2" />-->
<GroupVehicleDialog
ref="groupVehicle"
@setMaterValue="setTableDis"
/>
</el-dialog>
</template>
<script>
import CRUD, { crud } from '@crud/crud'
import GroupVehicleDialog from '@/views/wms/md_manage/group_dick/GroupVehicleDialog'
import formstruc from '@/views/wms/config_manage/formStruc/formstruc'
// import StructDiv from '@/views/wms/storage_manage/product/productIn/StructDiv'
import crudProductIn from '@/views/wms/stor_manage/in/storinvin'
import crudPoint from '@/views/wms/stor_manage/in/storinvin'
// import AddBox from '@/views/wms/storage_manage/product/productIn/AddBox'
import crudSectattr from '@/api/wms/basedata/st/sectattr'
export default {
name: 'GroupDialog',
components: { formstruc, GroupVehicleDialog, crudProductIn },
mixins: [crud()],
dicts: ['IO_BILL_STATUS', 'VEHICLE_OVER_TYPE', 'PCS_SAL_TYPE'],
props: {
dialogShow: {
type: Boolean,
default: false
},
openParam: {
type: Array,
default: () => {
return []
}
},
storId: {
type: String,
default: null
}
},
data() {
return {
dialogVisible: false,
GroupShow: false,
click_Row: {},
id: '1528627995269533696',
sect_id: '1528631043496742912',
sectProp: null,
structShow: false,
bucketObj: null,
divBtn: false,
bucketShow: false,
addBoxShow: false,
bucketuniqueObj: null,
sects: [],
defaultList: ['1528627995269533696', '1528631043496742912'],
dis_row: null,
form: [],
storlist: [],
pointlist: [],
rules: {},
boxParam: {}
}
},
methods: {
open() {
// formstruc.getHeader('STOR_IN').then(res => {
// this.cols = res
// })
},
setForm(row) {
this.dialogVisible = true
crudProductIn.getIosInvDtl(row.id).then(res => {
this.form = res
})
},
clickRow(row) {
this.click_Row = row
},
groupConfim(){
if (this.click_Row !== null) {
this.$refs.groupVehicle.setForm(this.click_Row)
}
},
setTableDis(row){
console.log(row)
}
}
}
</script>
<style>
.crud-opts2 {
padding: 0;
display: -webkit-flex;
display: flex;
align-items: center;
}
.crud-opts2 .el-dialog__title2 {
line-height: 24px;
font-size: 20px;
color: #303133;
}
.crud-opts2 .role-span {
padding: 10px 0px 10px 0px;
}
.crud-opts2 .crud-opts-form {
padding: 10px 0px 0px 20px;
}
.input-with-select {
background-color: #fff;
}
</style>

50
wms_pro/qd/src/views/wms/stor_manage/in/TaskDialog.vue
View File

@@ -63,7 +63,7 @@
</el-form-item>
</el-form>
<div class="crud-opts2">
<span class="role-span">出库明细</span>
<span class="role-span">入库明细</span>
<span class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left"/>
@@ -99,7 +99,7 @@
style="width: 100%;"
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
:highlight-current-row="true"
@current-change="handleCurrentDtl"
@current-change="handleDtlCurrentChange"
border
>
<el-table-column type="index" label="序号" width="55" align="center" />
@@ -107,9 +107,10 @@
<el-table-column show-overflow-tooltip prop="material_name" label="物料名称" />
<el-table-column show-overflow-tooltip prop="material_spec" label="物料规格" />
<el-table-column show-overflow-tooltip prop="pcsn" label="批次" />
<el-table-column show-overflow-tooltip prop="qty" label="数量" />
<el-table-column show-overflow-tooltip prop="qty" label="计划数量" />
<el-table-column show-overflow-tooltip prop="unit_id" label="单位" align="center" />
<el-table-column show-overflow-tooltip prop="stor_code" label="仓库" />
<el-table-column show-overflow-tooltip prop="vehicle_qty" label="物料数量"/>
<el-table-column show-overflow-tooltip prop="vehicle_code" label="载具编码" width="160"/>
<el-table-column show-overflow-tooltip prop="source_form_type" label="源单类型" />
<el-table-column show-overflow-tooltip prop="source_form_id" label="源单id" />
@@ -231,6 +232,7 @@
import CRUD, { crud } from '@crud/crud'
import crudProduct from '@/views/wms/stor_manage/in/storinvin'
import formstruc from '@/views/wms/config_manage/formStruc/formstruc'
import {inDecision} from "./storinvin";
export default {
@@ -302,6 +304,9 @@ export default {
this.dtlCols = res
})
},
formatStatus(row) {
return this.statusEnum.label.FORM_STATUS[row.status]
},
setForm(row) {
this.dialogVisible = true
this.form = row
@@ -316,12 +321,19 @@ export default {
subRow(index,row){
this.vehicledis.slice(index,1)
},
handleCurrentDtl(row){
this.currentDtl = row
if (this.currentDtl.struct_code != null){
this.divflag = false;
}else {
this.divflag = true;
handleDtlCurrentChange(current) {
if (current !== null) {
if (current.vehicle_code != null){
this.divflag = false;
}else {
this.divflag = true;
}
this.tabledis = []
this.currentDtl = current
this.queryTableDdis()
} else {
this.tabledis = []
this.currentDtl = {}
}
},
divVehicle() {
@@ -332,20 +344,28 @@ export default {
this.dialogVehicle = true
this.vehicleform = this.currentDtl
},
divCancel() {
if (!this.currentDtl) {
this.crud.notify('请先选择一条分配明细！', CRUD.NOTIFICATION_TYPE.INFO)
return
}
crudProduct.cancelDecision(this.currentDtl).then(res => {
crudProduct.getIosInvDtl(this.form.id).then(res => {
this.tableData = res
})
this.crud.notify('取消成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.setForm(this.form)
})
this.tabledis = []
},
formatStatus(row) {
return this.statusEnum.label.FORM_STATUS[row.status]
queryTableDdis() {
if (this.currentDtl !== null && this.currentDtl.vehicle_code!=null) {
crudProduct.getVehicleTask({ 'vehicle_code': this.currentDtl.vehicle_code }).then(res => {
this.tabledis = res
}).catch(() => {
this.tabledis = []
})
}
},
closeDialogVehicle(){
this.dialogVehicle = false
@@ -354,7 +374,7 @@ export default {
},
submitDialogVehicle(){
this.vehicleform.item = this.vehicledis
crudProduct.confirmvehicle(this.vehicleform).then(res => {
crudProduct.inDecision(this.vehicleform).then(res => {
this.crud.notify('载具分配成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.dialogVehicle = false
this.vehicledis = []

38
wms_pro/qd/src/views/wms/stor_manage/in/ViewDialog.vue
View File

@@ -110,14 +110,14 @@
<el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
<el-table-column prop="pcsn" label="批次" width="150" align="center" />
<el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="计划数量" align="center" />
<el-table-column prop="qty" :formatter="crud.formatNum3" width="150" label="载具物料数量" align="center" />
<el-table-column prop="qty" :formatter="crud.formatNum3" label="计划数量" align="center" />
<el-table-column prop="vehicle_qty" :formatter="crud.formatNum3" width="150" label="载具物料数量" align="center" />
<el-table-column prop="unit_id" label="单位" align="center" />
<el-table-column prop="vehicle_code" label="载具" align="center" />
<el-table-column prop="vehicle_code" label="载具" width="150" align="center" />
<el-table-column prop="stor_code" label="仓库编号" align="center" />
<el-table-column prop="struct_code" label="分配仓位" align="center" />
<el-table-column show-overflow-tooltip prop="source_form_type" label="源单类型" align="center" />
<el-table-column show-overflow-tooltip prop="source_form_id" label="源单号" align="center" />
<el-table-column show-overflow-tooltip prop="source_form_type" label="源单类型" width="150" align="center" />
<el-table-column show-overflow-tooltip prop="source_form_id" label="源单号" width="150" align="center" />
<el-table-column show-overflow-tooltip width="150" v-for="(item, index) in dtlCols" :key="item.value" :label="item.lable" >
<template slot-scope="scope">{{scope.row.form_data[item.value]}}</template>
</el-table-column>
@@ -144,9 +144,8 @@
<el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
<el-table-column prop="pcsn" label="批次" align="center" width="150" />
<el-table-column show-overflow-tooltip prop="vehicle_code" label="托盘号" align="center" />
<el-table-column show-overflow-tooltip prop="bucketunique" label="箱号" align="center" />
<el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="数量" align="center" />
<el-table-column show-overflow-tooltip prop="vehicle_code" label="载具编码" align="center" />
<el-table-column prop="qty" :formatter="crud.formatNum3" label="数量" align="center" />
<el-table-column prop="point_code1" label="起始位置" align="center" width="120"/>
<el-table-column prop="point_code2" label="目的位置" align="center" width="120"/>
<el-table-column prop="task_code" label="任务号" align="center" />
@@ -206,10 +205,10 @@ export default {
},
methods: {
open() {
formstruc.getHeader('st_ivt_iostorinv_in').then(res => {
formstruc.getHeader('st_ivt_iostorinv').then(res => {
this.cols = res
})
formstruc.getHeader('st_ivt_iostorinvdtl_in').then(res => {
formstruc.getHeader('st_ivt_iostorinvdtl').then(res => {
this.dtlCols = res
})
},
@@ -235,6 +234,15 @@ export default {
this.currentdtl = {}
}
},
queryTableDdis() {
if (this.currentdtl !== null && this.currentdtl.vehicle_code!=null) {
crudProductIn.getVehicleTask({ 'vehicle_code': this.currentdtl.vehicle_code }).then(res => {
this.tabledis = res
}).catch(() => {
this.tabledis = []
})
}
},
invtypeFormat(row, column) {
for (const item of this.billtypelist) {
if (item.code === row.source_bill_type) {
@@ -250,15 +258,7 @@ export default {
this.tableDtl = res
})
},
queryTableDdis() {
if (this.currentdtl !== null) {
crudProductIn.getVehicleTask({ 'vehicle_code': this.currentdtl.vehicle_code }).then(res => {
this.tabledis = res
}).catch(() => {
this.tabledis = []
})
}
},
formatStatus(row) {
return this.dict.label.FORM_STATUS[row.status]
},

198
wms_pro/qd/src/views/wms/stor_manage/in/index.vue
View File

@@ -31,33 +31,13 @@
@change="crud.toQuery"
>
<el-option
v-for="item in statusEnum.IOBILL_TYPE_IN"
v-for="item in statusEnum.IOBILL_TYPE_OUT"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<!--<el-form-item label="生成方式">
<el-select
v-model="query.bill_type"
clearable
filterable
size="mini"
placeholder="生成方式"
class="filter-item"
@change="crud.toQuery"
>
<el-option
v-for="item in dict.ST_INV_CP_IN_TYPE"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>-->
<el-form-item label="单据日期">
<el-date-picker
v-model="query.createTime"
@@ -69,7 +49,6 @@
@change="crud.toQuery"
/>
</el-form-item>
<el-form-item label="单据状态">
<el-select
v-model="query.status"
@@ -87,37 +66,46 @@
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="生产车间">-->
<!-- <el-select-->
<!-- v-model="query.product_area"-->
<!-- clearable-->
<!-- size="mini"-->
<!-- placeholder="全部"-->
<!-- class="filter-item"-->
<!-- @change="crud.toQuery"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in dict.product_area"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<template v-for="(col,index) in cols">
<el-form-item label="col.lable" prop="bill_code">
<label slot="label">{{col.lable}}:</label>
<el-input v-model="query.form_query[col.value]" :value="col.value" clearable style="width: 210px" />
</el-form-item>
</template>
<rrOperation />
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission">
<el-button
slot="right"
class="filter-item"
type="success"
icon="el-icon-position"
size="mini"
:disabled="dis_flag"
@click="disOpen"
>
分配
</el-button>
<el-button
slot="right"
class="filter-item"
type="success"
icon="el-icon-position"
size="mini"
:disabled="task_flag"
@click="taskOpen"
>
作业下发
</el-button>
<el-button
slot="right"
class="filter-item"
type="warning"
:disabled="confirm_flag"
icon="el-icon-check"
size="mini"
:disabled="confirm_flag"
@click="confirm"
>
强制确认
@@ -155,7 +143,7 @@
<el-table-column show-overflow-tooltip prop="source_form_type" min-width="120" label="源单类型" />
<el-table-column show-overflow-tooltip prop="source_form_id" label="源单编码" min-width="155" />
<el-table-column show-overflow-tooltip prop="source_form_date" label="源单时间" min-width="140" />
<el-table-column show-overflow-tooltip width="150" v-for="(item, index) in cols" :key="item.value" :label="item.lable" >
<el-table-column v-for="(item, index) in cols" :key="item.value" :label="item.lable" >
<template slot-scope="scope">{{scope.row.form_data[item.value]}}</template>
</el-table-column>
<el-table-column label="创建人" align="center" prop="create_name" />
@@ -166,13 +154,8 @@
<udOperation
:data="scope.row"
:permission="permission"
:disabled-edit="canUd(scope.row)"
:disabled-dle="canUd(scope.row)"
/>
<!-- <el-button slot="right" size="mini" type="text" icon="el-icon-circle-plus-outline" @click="groupOpen(scope.row)">组盘</el-button>-->
<!-- <el-button slot="right" size="mini" type="text" icon="el-icon-circle-plus-outline" @click="groupOpen(scope.row)">分配</el-button>-->
<!-- <el-button slot="right" size="mini" type="text" icon="el-icon-circle-plus-outline" @click="groupOpen(scope.row)">任务</el-button>-->
</template>-->
</template>-->
</el-table-column>
</el-table>
<!--分页组件-->
@@ -180,42 +163,61 @@
</div>
<AddDialog @AddChanged="querytable" />
<ViewDialog ref="itemview"/>
<GroupDialog ref="groupview" />
<!-- <TaskDialog :dialog-show.sync="taskShow" :open-param="taskOpenParam" />-->
<TaskDialog ref="taskDis"/>
</div>
</template>
<script>
import formstruc from '@/views/wms/config_manage/formStruc/formstruc'
import crudProductIn from '@/views/wms/stor_manage/in/storinvin'
import CRUD, { crud, header, presenter } from '@crud/crud'
import crudProductOut from '@/views/wms/stor_manage/in/storinvin'
import CRUD, { crud, header,form, presenter } from '@crud/crud'
import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import AddDialog from '@/views/wms/stor_manage/in/AddDialog'
import GroupDialog from '@/views/wms/stor_manage/in/GroupDickDialog'
import TaskDialog from '@/views/wms/stor_manage/in/TaskDialog'
import ViewDialog from '@/views/wms/stor_manage/in/ViewDialog'
import { mapGetters } from 'vuex'
const defaultForm = {
id: '',
code: '',
bill_type: '',
status: '',
product_area: '',
source_form_type: '',
source_form_id: '',
source_form_date: '',
create_name: '',
create_time: '',
update_name: '',
update_time: '',
remark: '',
form_data: {}
}
export default {
name: 'ProductIn',
components: { GroupDialog, AddDialog, ViewDialog, formstruc, crudProductIn, crudOperation, rrOperation, udOperation, pagination },
name: 'ProductOut',
components: { TaskDialog, AddDialog, ViewDialog, formstruc, crudProductOut, crudOperation, rrOperation, udOperation, pagination },
cruds() {
return CRUD({
title: '',
optShow: { add: true, reset: true },
idField: 'iostorinv_id',
url: '/api/stIvtIostorinvIn',
crudMethod: { ...crudProductIn },
idField: 'id',
url: '/api/stIvtIostorinv',
crudMethod: { ...crudProductOut },
query:{
in_storage :true
},
props: {
size: 10
}
})
},
mixins: [presenter(), header(), crud()],
mixins: [presenter(), header(), form(defaultForm), crud()],
// 数据字典
statusEnums: [ 'FORM_STATUS','IOBILL_TYPE_IN' ],
statusEnums: ['FORM_STATUS','IOBILL_TYPE_IN','FLOW_STATUS'],
data() {
return {
cols:[],
@@ -248,13 +250,11 @@ export default {
}
},
created() {
// crudStorattr.getStor({ 'stor_type': '4' }).then(res => {
// this.storlist = res.content
// })
this.$set(this.query, 'form_query', {})
},
methods: {
[CRUD.HOOK.beforeRefresh]() {
formstruc.getHeader('st_ivt_iostorinv_in').then(res => {
formstruc.getHeader('st_ivt_iostorinv_out').then(res => {
this.cols = res
})
},
@@ -264,44 +264,41 @@ export default {
this.$refs.itemview.setForm(row)
}
},
groupOpen(row) {
if (row !== null) {
this.$refs.groupview.setForm(row)
}
},
confirm() {
if (!this.currentRow) {
this.crud.notify('请选择一条单据', CRUD.NOTIFICATION_TYPE.INFO)
return
}
crudProductIn.confirm({ 'iostorinv_id': this.currentRow.iostorinv_id }).then(res => {
crudProductOut.confirm({ 'iostorinv_id': this.currentRow.iostorinv_id }).then(res => {
this.crud.notify('单据确认成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
},
stateFormat(row, column) {
return this.statusEnum.label.IO_BILL_STATUS[row.bill_status]
},
divOpen() {
crudProductIn.getIosInvDtl({ 'bill_code': this.currentRow.bill_code }).then(res => {
this.openParam = res
this.storId = this.currentRow.id
this.billType = this.currentRow.bill_type
this.divShow = true
})
disOpen(row) {
if (this.currentRow !== null) {
this.$refs.taskDis.setForm(this.currentRow)
}
},
taskOpen() {
crudProductIn.getIosInvDtl({ 'bill_code': this.currentRow.bill_code }).then(res => {
this.taskOpenParam = res
if (!this.currentRow) {
this.crud.notify('请选择一条单据', CRUD.NOTIFICATION_TYPE.INFO)
return
}
crudProductOut.taskOpen(this.currentRow ).then(res => {
this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
this.taskShow = true
},
fun(val) {
return Number(val).toFixed(3)
},
canUd(row) {
return row.bill_status !== '10'
handleCurrentChange(currentRow) {
if (currentRow === null) {
this.dis_flag = true
this.confirm_flag = true
this.task_flag = true
this.currentRow = {}
}
},
handleSelectionChange(val, row) {
if (val.length > 1) {
@@ -314,40 +311,29 @@ export default {
this.handleCurrentChange(null)
}
},
onSelectAll() {
this.$refs.table.clearSelection()
this.handleCurrentChange(null)
},
buttonChange(currentRow) {
if (currentRow !== null) {
this.currentRow = currentRow
if (currentRow.bill_status === '10' || currentRow.bill_status === '20' || currentRow.bill_status === '30') {
if (currentRow.status === '10'|| currentRow.status === '13') {
this.dis_flag = false
} else {
this.dis_flag = true
}
if (currentRow.bill_status === '30' || currentRow.bill_status === '20') {
if (currentRow.bill_status !== '99') {
this.confirm_flag = false
} else {
this.confirm_flag = true
}
if (currentRow.bill_status !== '99') {
if (currentRow.status === '13') {
this.task_flag = false
} else {
this.task_flag = true
}
}
},
handleCurrentChange(currentRow) {
if (currentRow === null) {
this.dis_flag = true
this.confirm_flag = true
this.task_flag = true
this.currentRow = {}
}
},
bill_typeFormat(row, column) {
return this.statusEnum.label.ST_INV_CP_IN_TYPE[row.bill_type]
onSelectAll() {
this.$refs.table.clearSelection()
this.handleCurrentChange(null)
},
querytable() {
this.onSelectAll()

49
wms_pro/qd/src/views/wms/stor_manage/in/storinvin.js
View File

@@ -2,7 +2,7 @@ import request from '@/utils/request'
export function add(data) {
return request({
url: '/api/stIvtIostorinvIn',
url: '/api/stIvtIostorinv',
method: 'post',
data
})
@@ -10,7 +10,7 @@ export function add(data) {
export function del(ids) {
return request({
url: '/api/stIvtIostorinvIn/delete',
url: '/api/stIvtIostorinv/delete',
method: 'post',
data: ids
})
@@ -18,7 +18,7 @@ export function del(ids) {
export function edit(data) {
return request({
url: '/api/stIvtIostorinvIn/update',
url: '/api/stIvtIostorinv/update',
method: 'post',
data
})
@@ -26,14 +26,7 @@ export function edit(data) {
export function getIosInvDtl(data) {
return request({
url: '/api/stIvtIostorinvIn/getIosInvDtl',
method: 'post',
data
})
}
export function getPoint(data) {
return request({
url: '/api/stIvtIostorinvIn/getIosInvDtl',
url: '/api/stIvtIostorinv/getIosInvDtl',
method: 'post',
data
})
@@ -48,14 +41,14 @@ export function getVehicleTask(data) {
export function vehicleCheck() {
return request({
url: '/api/stIvtIostorinvIn/vehicleCheck',
url: '/api/stIvtIostorinv/vehicleCheck',
method: 'post'
})
}
export function confirmvehicle(data) {
export function inDecision(data) {
return request({
url: '/api/stIvtIostorinvIn/confirmvehicle',
url: '/api/stIvtIostorinv/inDecision',
method: 'post',
data
})
@@ -71,7 +64,7 @@ export function getSect(data) {
export function divStruct(data) {
return request({
url: '/api/stIvtIostorinvIn/divStruct',
url: '/api/stIvtIostorinv/divStruct',
method: 'post',
data
})
@@ -79,7 +72,7 @@ export function divStruct(data) {
export function unDivStruct(data) {
return request({
url: '/api/stIvtIostorinvIn/unDivStruct',
url: '/api/stIvtIostorinv/unDivStruct',
method: 'post',
data
})
@@ -87,7 +80,7 @@ export function unDivStruct(data) {
export function setPoint(data) {
return request({
url: '/api/stIvtIostorinvIn/setPoint',
url: '/api/stIvtIostorinv/setPoint',
method: 'post',
data
})
@@ -95,15 +88,15 @@ export function setPoint(data) {
export function confirm(data) {
return request({
url: '/api/stIvtIostorinvIn/confirm',
url: '/api/stIvtIostorinv/confirm',
method: 'post',
data
})
}
export function cancelConfirmvehicle(data) {
export function cancelDecision(data) {
return request({
url: '/api/stIvtIostorinvIn/cancelConfirmvehicle',
url: '/api/stIvtIostorinv/cancelDecision',
method: 'post',
data
})
@@ -111,7 +104,7 @@ export function cancelConfirmvehicle(data) {
export function delTask(data) {
return request({
url: '/api/stIvtIostorinvIn/delTask',
url: '/api/stIvtIostorinv/delTask',
method: 'post',
data
})
@@ -119,7 +112,7 @@ export function delTask(data) {
export function sendTask(data) {
return request({
url: '/api/stIvtIostorinvIn/sendTask',
url: '/api/stIvtIostorinv/sendTask',
method: 'post',
data
})
@@ -127,7 +120,7 @@ export function sendTask(data) {
export function confirmTask(data) {
return request({
url: '/api/stIvtIostorinvIn/confirmTask',
url: '/api/stIvtIostorinv/confirmTask',
method: 'post',
data
})
@@ -140,15 +133,11 @@ export default {
getVehicleTask,
getIosInvDtl,
vehicleCheck,
confirmvehicle,
getPoint,
inDecision,
cancelDecision,
getSect,
divStruct,
unDivStruct,
setPoint,
confirm,
cancelConfirmvehicle,
delTask,
sendTask,
confirmTask
confirm
}

317
wms_pro/qd/src/views/wms/stor_manage/out/GroupDickDialog.vue
View File

@@ -1,317 +0,0 @@
<template>
<el-dialog
append-to-body
:visible.sync="dialogVisible"
destroy-on-close
:show-close="false"
fullscreen
@open="open"
>
<span slot="title" class="dialog-footer">
<div class="crud-opts2">
<span class="el-dialog__title2">入库组盘分配</span>
<span class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left" />
<el-button slot="left" type="info" @click="dialogVisible = false">关闭</el-button>
</span>
</div>
</span>
<div class="crud-opts2">
<span class="role-span">入库明细项</span>
</div>
<el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
<!--表格渲染-->
<el-table
ref="dtl_table"
:data="this.form"
style="width: 100%;"
max-height="300"
border
highlight-current-row
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
@row-click="clickRow"
>
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column prop="bill_status" label="状态" align="center" width="110px">
<template slot-scope="scope">
<el-select
v-model="scope.row.bill_status"
class="filter-item"
:disabled="true"
>
<el-option
v-for="item in dict.IO_BILL_STATUS"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
<el-table-column show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
<el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
<el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="数量" align="center" />
<el-table-column show-overflow-tooltip prop="assign_qty" :formatter="crud.formatNum3" label="已分配数量" align="center" />
<el-table-column show-overflow-tooltip prop="unassign_qty" :formatter="crud.formatNum3" label="未分配数量" align="center" />
<el-table-column show-overflow-tooltip prop="qty_unit_name" label="单位" align="center" />
<el-table-column show-overflow-tooltip prop="base_bill_code" label="源单号" align="center" />
<el-table-column show-overflow-tooltip prop="base_bill_table" label="源单行号" align="center" />
</el-table>
</el-card>
<!-- <el-card class="box-card" shadow="never" :body-style="{padding:'20px 20px 0 20px'}">-->
<!-- <el-form ref="form2" :inline="true" :model="form" :rules="rules" size="mini">-->
<!-- <el-form-item label="载具号:" prop="vehicle_code">-->
<!-- <el-input v-model="form.vehicle_code" style="width: 200px" size="mini" clearable placeholder="载具号">-->
<!-- <el-button slot="append" @click="" >生成</el-button>-->
<!-- </el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="箱号:" prop="pageBox_code">-->
<!-- <el-input v-model="form.bucketunique" size="mini" style="width: 200px" disabled placeholder="箱号">-->
<!-- <el-button slot="append" icon="el-icon-plus" @click="" />-->
<!-- </el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="放入数量:" prop="storage_qty">-->
<!-- <el-input-number-->
<!-- v-model="form.storage_qty"-->
<!-- style="width: 200px"-->
<!-- size="mini"-->
<!-- :controls="false"-->
<!-- precision="3"-->
<!-- :min="0"-->
<!-- placeholder="数量"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="入库点:" prop="point_code">-->
<!-- <el-select-->
<!-- v-model="form.point_code"-->
<!-- size="mini"-->
<!-- clearable-->
<!-- placeholder="请选择"-->
<!-- class="filter-item"-->
<!-- style="width: 200px;"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in pointlist"-->
<!-- :key="item.point_code"-->
<!-- :label="item.point_name"-->
<!-- :value="item.point_code"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="载具超限类型:" prop="vehicle_overstruct_type">-->
<!-- <el-select-->
<!-- v-model="form.vehicle_overstruct_type"-->
<!-- size="mini"-->
<!-- placeholder="请选择"-->
<!-- class="filter-item"-->
<!-- style="width: 200px;"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in dict.VEHICLE_OVER_TYPE"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- </el-card>-->
<div class="crud-opts2">
<span class="role-span">载具物料明细</span>
<div class="crud-opts-form">
<el-form ref="form" :inline="true" :model="form" size="mini">
<el-form-item label="库区:" prop="gender5">
<el-cascader
placeholder="请选择"
:options="sects"
v-model="defaultList"
:props="{ checkStrictly: true }"
clearable
/>
</el-form-item>
<el-form-item prop="checked">
<el-checkbox v-model="form.checked">自动分配货位</el-checkbox>
</el-form-item>
</el-form>
</div>
<span class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left" />
<el-button
slot="left"
class="filter-item"
type="primary"
icon="el-icon-plus"
size="mini"
@click="groupConfim((crud.selections[0]))"
>
组盘确认
</el-button>
<el-button
slot="left"
class="filter-item"
type="primary"
icon="el-icon-plus"
size="mini"
>
取消组盘
</el-button>
</span>
</div>
<el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
<!--表格渲染-->
<el-table
ref="dis_table"
:data="form.tableMater"
style="width: 100%;"
max-height="300"
border
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
>
<el-table-column show-overflow-tooltip type="index" label="序号" align="center" />
<el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
<el-table-column show-overflow-tooltip prop="material_spec" label="物料规格" align="center" />
<el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
<el-table-column show-overflow-tooltip prop="storagevehicle_code" label="托盘号" align="center" />
<el-table-column show-overflow-tooltip prop="bucketunique" label="箱号" align="center" />
<el-table-column show-overflow-tooltip prop="qty" :formatter="crud.formatNum3" label="数量" align="center" />
<el-table-column show-overflow-tooltip prop="struct_code" label="货位" align="center" />
<el-table-column show-overflow-tooltip prop="point_code" label="入库点" align="center" />
<el-table-column show-overflow-tooltip prop="task_code" label="任务号" align="center" />
<el-table-column align="center" label="操作" width="170" fixed="right">
<template scope="scope">
<el-button
type="danger"
class="filter-item"
size="mini"
icon="el-icon-delete"
/>
</template>
</el-table-column>
</el-table>
</el-card>
<!-- <StructDiv ref="child" :stor-id="storId" :dialog-show.sync="structShow" :sect-prop="sectProp" @tableChanged="tableChanged" />-->
<!-- <AddBox ref="child" :dialog-show.sync="addBoxShow" :add-box-param="boxParam" @tableChanged2="tableChanged2" />-->
<GroupVehicleDialog
ref="groupVehicle"
@setMaterValue="setTableDis"
/>
</el-dialog>
</template>
<script>
import CRUD, { crud } from '@crud/crud'
import GroupVehicleDialog from '@/views/wms/md_manage/group_dick/GroupVehicleDialog'
import formstruc from '@/views/wms/config_manage/formStruc/formstruc'
// import StructDiv from '@/views/wms/storage_manage/product/productIn/StructDiv'
import crudProductIn from '@/views/wms/stor_manage/in/storinvin'
import crudPoint from '@/views/wms/stor_manage/in/storinvin'
// import AddBox from '@/views/wms/storage_manage/product/productIn/AddBox'
import crudSectattr from '@/api/wms/basedata/st/sectattr'
export default {
name: 'GroupDialog',
components: { formstruc, GroupVehicleDialog, crudProductIn },
mixins: [crud()],
dicts: ['IO_BILL_STATUS', 'VEHICLE_OVER_TYPE', 'PCS_SAL_TYPE'],
props: {
dialogShow: {
type: Boolean,
default: false
},
openParam: {
type: Array,
default: () => {
return []
}
},
storId: {
type: String,
default: null
}
},
data() {
return {
dialogVisible: false,
GroupShow: false,
click_Row: {},
id: '1528627995269533696',
sect_id: '1528631043496742912',
sectProp: null,
structShow: false,
bucketObj: null,
divBtn: false,
bucketShow: false,
addBoxShow: false,
bucketuniqueObj: null,
sects: [],
defaultList: ['1528627995269533696', '1528631043496742912'],
dis_row: null,
form: [],
storlist: [],
pointlist: [],
rules: {},
boxParam: {}
}
},
methods: {
open() {
// formstruc.getHeader('STOR_IN').then(res => {
// this.cols = res
// })
},
setForm(row) {
this.dialogVisible = true
crudProductIn.getIosInvDtl(row.id).then(res => {
this.form = res
})
},
clickRow(row) {
this.click_Row = row
},
groupConfim(){
if (this.click_Row !== null) {
this.$refs.groupVehicle.setForm(this.click_Row)
}
},
setTableDis(row){
console.log(row)
}
}
}
</script>
<style>
.crud-opts2 {
padding: 0;
display: -webkit-flex;
display: flex;
align-items: center;
}
.crud-opts2 .el-dialog__title2 {
line-height: 24px;
font-size: 20px;
color: #303133;
}
.crud-opts2 .role-span {
padding: 10px 0px 10px 0px;
}
.crud-opts2 .crud-opts-form {
padding: 10px 0px 0px 20px;
}
.input-with-select {
background-color: #fff;
}
</style>

4
wms_pro/qd/src/views/wms/stor_manage/out/TaskDialog.vue
View File

@@ -220,10 +220,10 @@ export default {
},
methods: {
open() {
formstruc.getHeader('st_ivt_iostorinv_out').then(res => {
formstruc.getHeader('st_ivt_iostorinv').then(res => {
this.cols = res
})
formstruc.getHeader('st_ivt_iostorinvdtl_out').then(res => {
formstruc.getHeader('st_ivt_iostorinvdtl').then(res => {
this.dtlCols = res
})
},

4
wms_pro/qd/src/views/wms/stor_manage/out/ViewDialog.vue
View File

@@ -191,10 +191,10 @@ export default {
},
methods: {
open() {
formstruc.getHeader('st_ivt_iostorinv_out').then(res => {
formstruc.getHeader('st_ivt_iostorinv').then(res => {
this.cols = res
})
formstruc.getHeader('st_ivt_iostorinvdtl_out').then(res => {
formstruc.getHeader('st_ivt_iostorinvdtl').then(res => {
this.dtlCols = res
})
},

72
wms_pro/qd/src/views/wms/stor_manage/out/index.vue
View File

@@ -76,41 +76,41 @@
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission">
<el-button
slot="right"
class="filter-item"
type="success"
icon="el-icon-position"
size="mini"
:disabled="dis_flag"
@click="disOpen"
>
分配
</el-button>
<el-button
slot="right"
class="filter-item"
type="success"
icon="el-icon-position"
size="mini"
:disabled="task_flag"
@click="taskOpen"
>
作业下发
</el-button>
<el-button
slot="right"
class="filter-item"
type="warning"
:disabled="confirm_flag"
icon="el-icon-check"
size="mini"
@click="confirm"
>
强制确认
</el-button>
</crudOperation>
<crudOperation :permission="permission">
<el-button
slot="right"
class="filter-item"
type="success"
icon="el-icon-position"
size="mini"
:disabled="dis_flag"
@click="disOpen"
>
分配
</el-button>
<el-button
slot="right"
class="filter-item"
type="success"
icon="el-icon-position"
size="mini"
:disabled="task_flag"
@click="taskOpen"
>
作业下发
</el-button>
<el-button
slot="right"
class="filter-item"
type="warning"
:disabled="confirm_flag"
icon="el-icon-check"
size="mini"
@click="confirm"
>
强制确认
</el-button>
</crudOperation>
<!--表格渲染-->
<el-table
ref="table"
@@ -155,7 +155,7 @@
:data="scope.row"
:permission="permission"
/>
</template>-->
</template>-->
</el-table-column>
</el-table>
<!--分页组件-->