From cb35636d6f8257b59a5138d7415256aad73fd5c5 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Thu, 6 Jun 2024 09:41:39 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E4=BF=AE=E6=94=B9=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../applyTask/impl/ApplyFlowTask.java | 16 +- .../service/dao/StStrategyConfig.java | 2 +- .../handler/impl/StackingTaskHandler.java | 1 + .../task/service/dao/SchBaseTask.java | 4 + .../dao/mapper/xml/SchBaseTaskMapper.xml | 2 +- .../service/execution/dao/ActRuExecution.java | 2 +- .../service/history/dao/ActHiExecution.java | 2 +- .../controller/MdGruopDickController.java | 2 +- .../service/IMdGruopDickService.java | 6 +- .../group_dick/service/dao/MdGruopDick.java | 3 +- .../service/dao/mapper/MdGruopDickMapper.java | 2 - .../dao/mapper/xml/MdGruopDickMapper.xml | 2 +- .../group_dick/service/dto/MdGruopDtlVo.java | 20 - .../{MdGruopDtlDto.java => MdGruopVo.java} | 51 ++- .../service/impl/MdGruopDickServiceImpl.java | 41 +- .../service/IMdPbVehicleMaterService.java | 1 + .../service/dao/MdPbVehicleMater.java | 9 +- .../dao/mapper/xml/MdPbVehicleivtMapper.xml | 1 + .../impl/MdPbVehicleMaterServiceImpl.java | 3 +- .../form_data/service/dao/PmFormData.java | 2 +- .../controller/StIvtIostorinvController.java | 39 +- .../StIvtIostorinvOutController.java | 96 ++++ .../iostor/IStIvtIostorinvService.java | 19 +- .../io/service/iostor/dao/StIvtIostorinv.java | 2 +- .../impl/StIvtIostorinvServiceImpl.java | 128 +++++- .../iostor_dtl/dao/StIvtIostorinvdtl.java | 3 +- .../dao/mapper/StIvtIostorinvdtlMapper.java | 2 +- .../impl/StIvtIostorinvdtlServiceImpl.java | 2 - .../service/dto/StructattrVechielDto.java | 3 +- .../views/wms/dispatch_manage/task/index.vue | 9 +- .../wms/md_manage/group_dick/AddDialog.vue | 46 +- .../wms/md_manage/group_dick/ViewDialog.vue | 7 +- .../views/wms/md_manage/group_dick/index.vue | 10 +- .../wms/pm_manage/form_data/FormDialog.vue | 21 +- .../views/wms/stor_manage/in/AddDialog.vue | 431 +++++++----------- .../src/views/wms/stor_manage/in/AddDtl.vue | 203 --------- .../views/wms/stor_manage/in/DivDialog.vue | 2 - .../wms/stor_manage/in/GroupDickDialog.vue | 317 ------------- .../views/wms/stor_manage/in/TaskDialog.vue | 50 +- .../views/wms/stor_manage/in/ViewDialog.vue | 38 +- .../qd/src/views/wms/stor_manage/in/index.vue | 198 ++++---- .../src/views/wms/stor_manage/in/storinvin.js | 49 +- .../wms/stor_manage/out/GroupDickDialog.vue | 317 ------------- .../views/wms/stor_manage/out/TaskDialog.vue | 4 +- .../views/wms/stor_manage/out/ViewDialog.vue | 4 +- .../src/views/wms/stor_manage/out/index.vue | 72 +-- 46 files changed, 780 insertions(+), 1464 deletions(-) delete mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/MdGruopDtlVo.java rename wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/{MdGruopDtlDto.java => MdGruopVo.java} (52%) create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/controller/StIvtIostorinvOutController.java delete mode 100644 wms_pro/qd/src/views/wms/stor_manage/in/AddDtl.vue delete mode 100644 wms_pro/qd/src/views/wms/stor_manage/in/GroupDickDialog.vue delete mode 100644 wms_pro/qd/src/views/wms/stor_manage/out/GroupDickDialog.vue diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/applyTask/impl/ApplyFlowTask.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/applyTask/impl/ApplyFlowTask.java index d5a1d1f5..f07006bc 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/applyTask/impl/ApplyFlowTask.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/applyTask/impl/ApplyFlowTask.java @@ -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().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) ); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/service/dao/StStrategyConfig.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/service/dao/StStrategyConfig.java index 0d1df344..b930d94c 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/service/dao/StStrategyConfig.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/service/dao/StStrategyConfig.java @@ -59,7 +59,7 @@ public class StStrategyConfig implements Serializable { *限定参数 */ @TableField(typeHandler = FastjsonTypeHandler.class) - private JSONObject form_data; + private JSONObject form_data = new JSONObject();; /** * 描述 */ diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/StackingTaskHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/StackingTaskHandler.java index c9f220a3..db2c9c2a 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/StackingTaskHandler.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/StackingTaskHandler.java @@ -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()); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/SchBaseTask.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/SchBaseTask.java index 778dd1f3..b4d26442 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/SchBaseTask.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/SchBaseTask.java @@ -84,6 +84,10 @@ public class SchBaseTask implements Serializable { * 载具编码1 */ private String vehicle_code; + /** + * 载具组盘id + */ + private String source_form_id; /** * 优先级 diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/mapper/xml/SchBaseTaskMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/mapper/xml/SchBaseTaskMapper.xml index f5108185..ff83d580 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/mapper/xml/SchBaseTaskMapper.xml +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/mapper/xml/SchBaseTaskMapper.xml @@ -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 #{vehicle_code} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dao/ActRuExecution.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dao/ActRuExecution.java index b83113ea..81778962 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dao/ActRuExecution.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dao/ActRuExecution.java @@ -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 children = new ArrayList<>(); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/history/dao/ActHiExecution.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/history/dao/ActHiExecution.java index 45084a06..8d6b8f47 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/history/dao/ActHiExecution.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/history/dao/ActHiExecution.java @@ -70,7 +70,7 @@ public class ActHiExecution implements Serializable { * 业务数据 */ @TableField(typeHandler = FastjsonTypeHandler.class) - private JSONObject form_data; + private JSONObject form_data = new JSONObject();; } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/controller/MdGruopDickController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/controller/MdGruopDickController.java index d23b0e65..72473dba 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/controller/MdGruopDickController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/controller/MdGruopDickController.java @@ -47,7 +47,7 @@ public class MdGruopDickController { } @GetMapping("getVehicleMater/{code}") public ResponseEntity vehicleInfo(@PathVariable String code) { - return new ResponseEntity<>(TableDataInfo.build(iMdGruopDickService.getGroupDtl(code)), HttpStatus.OK); + return new ResponseEntity<>(iMdGruopDickService.getGroupDtl(code), HttpStatus.OK); } @PutMapping("/updategroup") diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/IMdGruopDickService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/IMdGruopDickService.java index 2ce82bb3..6840594f 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/IMdGruopDickService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/IMdGruopDickService.java @@ -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 { /** * 查询组盘明细 - * @param dick_id + * @param vehicle * @return */ - List getGroupDtl(String dick_id); + List getGroupDtl(String vehicle); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/MdGruopDick.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/MdGruopDick.java index 3c24c873..d0ed2ee4 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/MdGruopDick.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/MdGruopDick.java @@ -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(); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/MdGruopDickMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/MdGruopDickMapper.java index b936e055..9965268e 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/MdGruopDickMapper.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/MdGruopDickMapper.java @@ -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; /** *

diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/xml/MdGruopDickMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/xml/MdGruopDickMapper.xml index 7ac1e8fd..7948e9f4 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/xml/MdGruopDickMapper.xml +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/xml/MdGruopDickMapper.xml @@ -5,7 +5,7 @@ - + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/MdGruopDtlVo.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/MdGruopDtlVo.java deleted file mode 100644 index 83da78fb..00000000 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/MdGruopDtlVo.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.nl.wms.md_manage.group_dick.service.dto; - -import lombok.Data; - -/** - *

- * 载具物料组盘表 - *

- * - * @author generator - * @since 2024-04-24 - */ -@Data -public class MdGruopDtlVo extends MdGruopDtlDto { - - private String material_name; - private String material_spec; - private String material_code; - -} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/MdGruopDtlDto.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/MdGruopVo.java similarity index 52% rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/MdGruopDtlDto.java rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/MdGruopVo.java index 818101b0..b3c0fdb7 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/MdGruopDtlDto.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/MdGruopVo.java @@ -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; + + } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java index f2beb30c..9f02f657 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java @@ -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; /** *

@@ -51,6 +56,9 @@ public class MdGruopDickServiceImpl extends ServiceImpl page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); @@ -74,8 +82,11 @@ public class MdGruopDickServiceImpl extends ServiceImpl 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 tmpCount2= this.list(new QueryWrapper().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().in("vehicle_code", map.keySet())); + if (tmpCount tmpCount1 = iMdPbVehicleMaterService.list(new QueryWrapper().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 getGroupDtl(String dick_id) { - List result = new ArrayList<>(); - if (StringUtils.isEmpty(dick_id)){ + public List getGroupDtl(String vehicle_code) { + if (StringUtils.isEmpty(vehicle_code)){ return new ArrayList<>(); } - List groupDtl = this.baseMapper.getGroupDtl(dick_id); - for (JSONObject json : groupDtl) { - result.add(json.toJavaObject(MdGruopDtlVo.class)); - } - return result; + return iMdPbVehicleMaterService.getVehicleMaters(vehicle_code); } } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/IMdPbVehicleMaterService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/IMdPbVehicleMaterService.java index c5259e49..4d25f856 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/IMdPbVehicleMaterService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/IMdPbVehicleMaterService.java @@ -18,6 +18,7 @@ import java.util.Map; public interface IMdPbVehicleMaterService extends IService { Integer getQtySumByMaterial(String material_id); + MdPbVehicleMater getGroupMst(String vehicle_code); List getVehicleMaters(String vehicle_code); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/dao/MdPbVehicleMater.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/dao/MdPbVehicleMater.java index b15cf22d..112e78d1 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/dao/MdPbVehicleMater.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/dao/MdPbVehicleMater.java @@ -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(); /** * 修改时间 diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/dao/mapper/xml/MdPbVehicleivtMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/dao/mapper/xml/MdPbVehicleivtMapper.xml index 5ec127af..9a0278a5 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/dao/mapper/xml/MdPbVehicleivtMapper.xml +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/dao/mapper/xml/MdPbVehicleivtMapper.xml @@ -5,6 +5,7 @@ + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/impl/MdPbVehicleMaterServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/impl/MdPbVehicleMaterServiceImpl.java index 4bf65234..8411f62b 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/impl/MdPbVehicleMaterServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/vehicleMater/service/impl/MdPbVehicleMaterServiceImpl.java @@ -31,7 +31,8 @@ public class MdPbVehicleMaterServiceImpl extends ServiceImpl().eq("vehicle_code",vehicle_code)); + return this.getOne(new QueryWrapper() + .eq("vehicle_code",vehicle_code)); } @Override diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/PmFormData.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/PmFormData.java index 80c65acc..5396b984 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/PmFormData.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/PmFormData.java @@ -109,7 +109,7 @@ public class PmFormData implements Serializable { * 自定义表单字段 */ @TableField(typeHandler = FastjsonTypeHandler.class) - private JSONObject form_data; + private JSONObject form_data = new JSONObject();; /** * 关联上级表单id diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/controller/StIvtIostorinvController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/controller/StIvtIostorinvController.java index 57986096..f359c1b0 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/controller/StIvtIostorinvController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/controller/StIvtIostorinvController.java @@ -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 getDtl(@RequestBody String inv_id) { - List mapList = iStIvtIostorinvDtlOutService.getByInv(inv_id); + List mapList = iStIvtIostorinvDtlService.getByInv(inv_id); return new ResponseEntity<>(mapList,HttpStatus.OK); } /** - * 出库分配 + * 入库分配 * @param dtl * @return */ - @PostMapping("/outDecision") - public ResponseEntity outDecision(@RequestBody JSONObject dtl) { - String struct_code = iStIvtIostorinvService.dispense(dtl); - return new ResponseEntity<>(struct_code,HttpStatus.OK); - } - - /** - * 取消分配 - * @param dtl - * @return - */ - @PostMapping("/cancelDecision") - public ResponseEntity cancelDecision(@RequestBody JSONObject dtl) { - iStIvtIostorinvService.canceldispense(dtl); + @PostMapping("/inDecision") + @Log("分配载具") + public ResponseEntity inDecision(@RequestBody JSONObject dtl) { + iStIvtIostorinvService.inDecision(dtl); return new ResponseEntity<>(HttpStatus.OK); } - - @PostMapping("/divDis") - public ResponseEntity divDis(@RequestBody JSONObject dtl) { - List dis = iSchBaseTaskService.getByVehicle(dtl.getString("vehicle_code")); - return new ResponseEntity<>(TableDataInfo.build(dis),HttpStatus.OK); - } - - @PostMapping("/taskOpen") - public ResponseEntity taskOpen(@RequestBody JSONObject dtl) { - iStIvtIostorinvService.taskOpen(dtl); + @PostMapping("/cancelDecision") + @Log("取消分配载具") + public ResponseEntity cancelDecision(@RequestBody JSONObject dtl) { + iStIvtIostorinvService.cancelVehicle(dtl); return new ResponseEntity<>(HttpStatus.OK); } } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/controller/StIvtIostorinvOutController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/controller/StIvtIostorinvOutController.java new file mode 100644 index 00000000..43bfb9e6 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/controller/StIvtIostorinvOutController.java @@ -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; + +/** + *

+ * 出入库单主表 前端控制器 + *

+ * + * @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 getAll(StorInvQuery query, PageQuery page) { + Page result = iStIvtIostorinvService.page(page.build(), query.build()); + return new ResponseEntity<>(TableDataInfo.build(result), HttpStatus.OK); + } + @PostMapping("delete") + public ResponseEntity delete(@RequestBody List ids) { + iStIvtIostorinvService.removeByIds(ids); + return new ResponseEntity<>(HttpStatus.OK); + } + @PostMapping + public ResponseEntity save(@RequestBody JSONObject form) { + iStIvtIostorinvService.save(form); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PostMapping("getIosInvDtl") + public ResponseEntity getDtl(@RequestBody String inv_id) { + List mapList = iStIvtIostorinvDtlOutService.getByInv(inv_id); + return new ResponseEntity<>(mapList,HttpStatus.OK); + } + + /** + * 出库分配 + * @param dtl + * @return + */ + @PostMapping("/outDecision") + public ResponseEntity outDecision(@RequestBody JSONObject dtl) { + String struct_code = iStIvtIostorinvService.outDispense(dtl); + return new ResponseEntity<>(struct_code,HttpStatus.OK); + } + + /** + * 取消分配 + * @param dtl + * @return + */ + @PostMapping("/cancelDecision") + public ResponseEntity cancelDecision(@RequestBody JSONObject dtl) { + iStIvtIostorinvService.canceldispense(dtl); + return new ResponseEntity<>(HttpStatus.OK); + } + + @PostMapping("/divDis") + public ResponseEntity divDis(@RequestBody JSONObject dtl) { + List dis = iSchBaseTaskService.getByVehicle(dtl.getString("vehicle_code")); + return new ResponseEntity<>(TableDataInfo.build(dis),HttpStatus.OK); + } + + @PostMapping("/taskOpen") + public ResponseEntity taskOpen(@RequestBody JSONObject dtl) { + iStIvtIostorinvService.taskOpen(dtl); + return new ResponseEntity<>(HttpStatus.OK); + } +} + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/IStIvtIostorinvService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/IStIvtIostorinvService.java index c47fb873..dca627a8 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/IStIvtIostorinvService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/IStIvtIostorinvService.java @@ -16,7 +16,24 @@ public interface IStIvtIostorinvService extends IService { 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); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/dao/StIvtIostorinv.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/dao/StIvtIostorinv.java index 4d03570c..42c11723 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/dao/StIvtIostorinv.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/dao/StIvtIostorinv.java @@ -95,7 +95,7 @@ public class StIvtIostorinv implements Serializable { * 自定义映射数据 */ @TableField(typeHandler = FastjsonTypeHandler.class) - private JSONObject form_data; + private JSONObject form_data = new JSONObject();; /** * 是否为入库单 diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/impl/StIvtIostorinvServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/impl/StIvtIostorinvServiceImpl.java index 5b211b53..46aaf57e 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/impl/StIvtIostorinvServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor/impl/StIvtIostorinvServiceImpl.java @@ -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 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 vehicleMaters = groupVehicle(form, (List) tmpItemO, dtl); + iStIvtIostorinvDtlService.update(new UpdateWrapper() + .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() + .eq("inv_id", dtl.getInv_id()).isNull("vehicle_code")); + if (count == 0){ + this.update(new UpdateWrapper() + .set("status",StatusEnum.FORM_STATUS.code("已分配")) + .set("update_time", now).set("update_name",SecurityUtils.getCurrentNickName()) + .eq("id",dtl.getInv_id())); + } + } + + private List groupVehicle(JSONObject form, List tmpItemO, StIvtIostorinvdtl dtl) { + String now = DateUtil.now(); + String user = SecurityUtils.getCurrentNickName(); + List vehicleMaters = new ArrayList<>(); + List gruops = new ArrayList<>(); + List 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 collect = vehicleMaters.stream().map(MdPbVehicleMater::getVehicle_code).collect(Collectors.toSet()); + int tmpCount = iBmVehicleInfoService.count(new QueryWrapper().in("vehicle_code", collect)); + if (tmpCount tmpCount1 = iMdPbVehicleMaterService.list(new QueryWrapper().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().in("vehicle_code",Arrays.asList(vehicles))); + iMdGruopDickService.remove(new QueryWrapper().in("vehicle_code",Arrays.asList(vehicles))); + iStIvtIostorinvDtlService.update(new UpdateWrapper() + .set("update_time",DateUtil.now()) + .set("vehicle_code",null) + .eq("id",dtl.getId()) + ); + this.update(new UpdateWrapper() + .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 desicion = iStIvtStructattrService.desicion(form, Boolean.FALSE); if (CollectionUtils.isEmpty(desicion)){ throw new BadRequestException("分配失败,当前出库分配无可用货位"); } - iStIvtIostorinvDtlOutService.update(new UpdateWrapper() + iStIvtIostorinvDtlService.update(new UpdateWrapper() .set("vehicle_code",desicion.stream().map(StIvtStructattr::getVehicle_code).collect(Collectors.joining(","))) .eq("id",form.getString("id"))); - int count = iStIvtIostorinvDtlOutService.count(new QueryWrapper() + int count = iStIvtIostorinvDtlService.count(new QueryWrapper() .eq("inv_id", form.getString("inv_id")).isNull("vehicle_code")); if (count == 0){ this.update(new UpdateWrapper() @@ -104,7 +208,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl() .set("lock_type", StatusEnum.LOCK.code("无")) .in("vehicle_code", Arrays.asList(split))); - iStIvtIostorinvDtlOutService.update(new UpdateWrapper() + iStIvtIostorinvDtlService.update(new UpdateWrapper() .set("vehicle_code",null) .eq("id",form.getString("id"))); @@ -121,7 +225,7 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl dtls = iStIvtIostorinvDtlOutService.list(new QueryWrapper().eq("inv_id", iostorinv.getId())); + List dtls = iStIvtIostorinvDtlService.list(new QueryWrapper().eq("inv_id", iostorinv.getId())); List dtlJson = new ArrayList<>(); if (!CollectionUtils.isEmpty(dtls)){ for (StIvtIostorinvdtl dtl : dtls) { diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dtl/dao/StIvtIostorinvdtl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dtl/dao/StIvtIostorinvdtl.java index 625f2256..11cc3ce4 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dtl/dao/StIvtIostorinvdtl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dtl/dao/StIvtIostorinvdtl.java @@ -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();; diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dtl/dao/mapper/StIvtIostorinvdtlMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dtl/dao/mapper/StIvtIostorinvdtlMapper.java index baa5d864..cf90c63b 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dtl/dao/mapper/StIvtIostorinvdtlMapper.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dtl/dao/mapper/StIvtIostorinvdtlMapper.java @@ -23,7 +23,7 @@ public interface StIvtIostorinvdtlMapper extends BaseMapper { Integer batchInsert(List 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" + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dtl/impl/StIvtIostorinvdtlServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dtl/impl/StIvtIostorinvdtlServiceImpl.java index e94570f1..519e9d43 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dtl/impl/StIvtIostorinvdtlServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dtl/impl/StIvtIostorinvdtlServiceImpl.java @@ -52,9 +52,7 @@ public class StIvtIostorinvdtlServiceImpl extends ServiceImpla.getQty().intValue()).sum(); map.put("struct_code",structs); - map.put("qty",qty); } } return byInv; diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dto/StructattrVechielDto.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dto/StructattrVechielDto.java index ad1a5756..ff02f386 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dto/StructattrVechielDto.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dto/StructattrVechielDto.java @@ -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; /** diff --git a/wms_pro/qd/src/views/wms/dispatch_manage/task/index.vue b/wms_pro/qd/src/views/wms/dispatch_manage/task/index.vue index af8d4ed1..5f3a516c 100644 --- a/wms_pro/qd/src/views/wms/dispatch_manage/task/index.vue +++ b/wms_pro/qd/src/views/wms/dispatch_manage/task/index.vue @@ -125,11 +125,15 @@ - + + + @@ -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: '任务管理', diff --git a/wms_pro/qd/src/views/wms/md_manage/group_dick/AddDialog.vue b/wms_pro/qd/src/views/wms/md_manage/group_dick/AddDialog.vue index 656740f8..ee39fed2 100644 --- a/wms_pro/qd/src/views/wms/md_manage/group_dick/AddDialog.vue +++ b/wms_pro/qd/src/views/wms/md_manage/group_dick/AddDialog.vue @@ -28,9 +28,6 @@ - - - @@ -86,14 +83,25 @@ border :header-cell-style="{background:'#f5f7fa',color:'#606266'}" > + - - - - - - + + + + @@ -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(){ diff --git a/wms_pro/qd/src/views/wms/pm_manage/form_data/FormDialog.vue b/wms_pro/qd/src/views/wms/pm_manage/form_data/FormDialog.vue index a072c0af..e6915d98 100644 --- a/wms_pro/qd/src/views/wms/pm_manage/form_data/FormDialog.vue +++ b/wms_pro/qd/src/views/wms/pm_manage/form_data/FormDialog.vue @@ -25,7 +25,7 @@ @change="crud.toQuery()" > 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) { diff --git a/wms_pro/qd/src/views/wms/stor_manage/in/AddDialog.vue b/wms_pro/qd/src/views/wms/stor_manage/in/AddDialog.vue index 65ce5750..da2664d2 100644 --- a/wms_pro/qd/src/views/wms/stor_manage/in/AddDialog.vue +++ b/wms_pro/qd/src/views/wms/stor_manage/in/AddDialog.vue @@ -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 @@ - - - - - - + + - - - - - + + - - - - + + - - - + + + + + - - - - - - - - + -
- + 添加物料 - 新增一行 + 添加单据 @@ -141,48 +94,27 @@ - - - - - + - - + + + - + + + + - - - diff --git a/wms_pro/qd/src/views/wms/stor_manage/in/DivDialog.vue b/wms_pro/qd/src/views/wms/stor_manage/in/DivDialog.vue index 22e7c64a..582904fb 100644 --- a/wms_pro/qd/src/views/wms/stor_manage/in/DivDialog.vue +++ b/wms_pro/qd/src/views/wms/stor_manage/in/DivDialog.vue @@ -258,8 +258,6 @@ - - diff --git a/wms_pro/qd/src/views/wms/stor_manage/in/TaskDialog.vue b/wms_pro/qd/src/views/wms/stor_manage/in/TaskDialog.vue index b0753f20..6dd0a893 100644 --- a/wms_pro/qd/src/views/wms/stor_manage/in/TaskDialog.vue +++ b/wms_pro/qd/src/views/wms/stor_manage/in/TaskDialog.vue @@ -63,7 +63,7 @@
- 出库明细 + 入库明细 @@ -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 > @@ -107,9 +107,10 @@ - + + @@ -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 = [] diff --git a/wms_pro/qd/src/views/wms/stor_manage/in/ViewDialog.vue b/wms_pro/qd/src/views/wms/stor_manage/in/ViewDialog.vue index 00cecd40..cdea0f7d 100644 --- a/wms_pro/qd/src/views/wms/stor_manage/in/ViewDialog.vue +++ b/wms_pro/qd/src/views/wms/stor_manage/in/ViewDialog.vue @@ -110,14 +110,14 @@ - - + + - + - - + + @@ -144,9 +144,8 @@ - - - + + @@ -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] }, diff --git a/wms_pro/qd/src/views/wms/stor_manage/in/index.vue b/wms_pro/qd/src/views/wms/stor_manage/in/index.vue index 0fa44663..5a95afa8 100644 --- a/wms_pro/qd/src/views/wms/stor_manage/in/index.vue +++ b/wms_pro/qd/src/views/wms/stor_manage/in/index.vue @@ -31,33 +31,13 @@ @change="crud.toQuery" > - - - - - - - - - - - - - - - - - - - - - - - +
+ + 分配 + + + 作业下发 + 强制确认 @@ -155,7 +143,7 @@ - + @@ -166,13 +154,8 @@ - - - - --> + --> @@ -180,42 +163,61 @@
- - + - - diff --git a/wms_pro/qd/src/views/wms/stor_manage/out/TaskDialog.vue b/wms_pro/qd/src/views/wms/stor_manage/out/TaskDialog.vue index 8dc6866c..ce773f19 100644 --- a/wms_pro/qd/src/views/wms/stor_manage/out/TaskDialog.vue +++ b/wms_pro/qd/src/views/wms/stor_manage/out/TaskDialog.vue @@ -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 }) }, diff --git a/wms_pro/qd/src/views/wms/stor_manage/out/ViewDialog.vue b/wms_pro/qd/src/views/wms/stor_manage/out/ViewDialog.vue index 0cee6d04..64c1bfca 100644 --- a/wms_pro/qd/src/views/wms/stor_manage/out/ViewDialog.vue +++ b/wms_pro/qd/src/views/wms/stor_manage/out/ViewDialog.vue @@ -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 }) }, diff --git a/wms_pro/qd/src/views/wms/stor_manage/out/index.vue b/wms_pro/qd/src/views/wms/stor_manage/out/index.vue index dc5aba5a..f3b2a9be 100644 --- a/wms_pro/qd/src/views/wms/stor_manage/out/index.vue +++ b/wms_pro/qd/src/views/wms/stor_manage/out/index.vue @@ -76,41 +76,41 @@ - - - 分配 - - - 作业下发 - - - 强制确认 - - + + + 分配 + + + 作业下发 + + + 强制确认 + + - --> + -->