diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/enums/StatusEnum.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/enums/StatusEnum.java index c8585ce6..7bb95e95 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/enums/StatusEnum.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/enums/StatusEnum.java @@ -29,13 +29,13 @@ public enum StatusEnum { /** * 出入库单据类型 */ - IOBILL_TYPE(MapOf.of("生产入库", "10", "生产出库", "20")), + IOBILL_TYPE_IN(MapOf.of("生产入库", "10", "调拨入库", "11", "退货入库", "12")), + IOBILL_TYPE_OUT(MapOf.of("销售出库", "20", "生产出库", "21", "调拨出库", "22")), /** * 任务类型 */ - TASK_TYPE_IN(MapOf.of("组盘入库","10")), - TASK_TYPE_OUT(MapOf.of("销售出","20")), + TASK_TYPE(MapOf.push(IOBILL_TYPE_IN.code,IOBILL_TYPE_OUT.code)), /** * 点位锁类型 */ diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/MapOf.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/MapOf.java index fc8dc01d..6b95f795 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/MapOf.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/MapOf.java @@ -3,6 +3,7 @@ package org.nl.common.utils; import java.io.Serializable; import java.util.HashMap; +import java.util.Map; /* * @author ZZQ @@ -17,4 +18,11 @@ public class MapOf implements Serializable { } return map; } + public static HashMap push(Map...item){ + HashMap map = new HashMap<>(); + for (int i = 0; i < (item.length & ~1); i=i+2) { + map.putAll(item[i]); + } + return map; + } } 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 9b571177..9e8e521b 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 @@ -37,12 +37,22 @@ public class StackingTaskHandler implements TaskHandler { @Override public JSONObject process(JSONObject from, JSONObject param) { + //区分出库还是入库 + Boolean in = StatusEnum.TASK_TYPE.check(param.getString("task_type")); String vehicle_code = from.getString("vehicle_code"); - String struct_code = from.getString("struct_code"); - String start_point = param.getString("start_point"); + String point_code1; + String point_code2; + if(in){ + point_code1 = from.getString("struct_code"); + point_code2 = param.getString("start_point"); + }else { + point_code2 = from.getString("struct_code"); + point_code1 = param.getString("start_point"); + } - if (StringUtils.isEmpty(vehicle_code) ||StringUtils.isEmpty(start_point)||StringUtils.isEmpty(struct_code)){ + + if (StringUtils.isEmpty(vehicle_code) ||StringUtils.isEmpty(point_code1)||StringUtils.isEmpty(point_code2)){ throw new BadRequestException("创建任务失败:StackingTaskHandler#process()方法请求参数不能为空"); } List list = taskService.list(new QueryWrapper().eq("vehicle_code", vehicle_code) @@ -60,8 +70,8 @@ public class StackingTaskHandler implements TaskHandler { task.setCreate_name(SecurityUtils.getCurrentNickName()); task.setTask_type(param.getString("task_type")); task.setVehicle_code(vehicle_code); - task.setPoint_code1(start_point); - task.setPoint_code2(struct_code); + task.setPoint_code1(point_code1); + task.setPoint_code2(point_code2); taskService.create(task); Boolean isSend = param.getBoolean("is_send"); if (isSend){ diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/model/ActDeModelController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/model/ActDeModelController.java index 4c1b9cb9..e52a994f 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/model/ActDeModelController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/model/ActDeModelController.java @@ -4,6 +4,7 @@ package org.nl.wms.flow_manage.flow.controller.model; import cn.dev33.satoken.annotation.SaIgnore; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; +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; @@ -65,33 +66,39 @@ public class ActDeModelController { } @PostMapping - public ResponseEntity add(@Validated @RequestBody ActDeModel dto) { - dto.setCreate_id(SecurityUtils.getCurrentUserId()); - dto.setCreate_time(DateUtil.now()); - dto.setId(IdUtil.getStringId()); - dto.setModel_key(IdUtil.getStringId()); - try { - JSONObject modelJson = JSONObject.parseObject(dto.getModel_editor_json()); - BpmnModel bpmnModel = bpmnJSONConverter.convertToBpmnModel(dto.getModel_key(),"null", modelJson); - }catch (Exception ex){ - ex.printStackTrace(); - throw new BadRequestException("模型配置不正确:"+ex.getMessage()); + public ResponseEntity add(@Validated @RequestBody JSONObject form) { + ActDeModel actDeModel = form.toJavaObject(ActDeModel.class); + + actDeModel.setCreate_id(SecurityUtils.getCurrentUserId()); + actDeModel.setCreate_time(DateUtil.now()); + actDeModel.setId(IdUtil.getStringId()); + actDeModel.setModel_key(IdUtil.getStringId()); + if (!StringUtils.isEmpty(actDeModel.getModel_editor_json())){ + try { + JSONObject modelJson = JSONObject.parseObject(actDeModel.getModel_editor_json()); + BpmnModel bpmnModel = bpmnJSONConverter.convertToBpmnModel(actDeModel.getModel_key(),"null", modelJson); + }catch (Exception ex){ + ex.printStackTrace(); + throw new BadRequestException("模型配置不正确:"+ex.getMessage()); + } } - modelService.save(dto); + modelService.save(actDeModel); return new ResponseEntity<>(HttpStatus.OK); } @PutMapping public ResponseEntity update(@Validated @RequestBody ActDeModel dto) { dto.setStatus(StatusEnum.MODEL_STATUS.code("未发布")); - dto.setUpdated_id(SecurityUtils.getCurrentUserId()); + dto.setUpdated_id(SecurityUtils.getCurrentNickName()); dto.setUpdate_time(DateUtil.now()); - try { - JSONObject modelJson = JSONObject.parseObject(dto.getModel_editor_json()); - BpmnModel bpmnModel = bpmnJSONConverter.convertToBpmnModel(dto.getModel_key(),"null", modelJson); - }catch (Exception ex){ - ex.printStackTrace(); - throw new BadRequestException("模型配置不正确:"+ex.getMessage()); + if (!StringUtils.isEmpty(dto.getModel_editor_json())){ + try { + JSONObject modelJson = JSONObject.parseObject(dto.getModel_editor_json()); + BpmnModel bpmnModel = bpmnJSONConverter.convertToBpmnModel(dto.getModel_key(),"null", modelJson); + }catch (Exception ex){ + ex.printStackTrace(); + throw new BadRequestException("模型配置不正确:"+ex.getMessage()); + } } modelService.updateById(dto); return new ResponseEntity<>(HttpStatus.OK); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/FormActivityBehavior.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/FormActivityBehavior.java index d0389a12..067b8007 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/FormActivityBehavior.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/FormActivityBehavior.java @@ -77,7 +77,7 @@ public class FormActivityBehavior extends FlowNodeActivityBehavior { mst_json.put("create_time",DateUtil.now()); mst_json.put("create_name",SecurityUtils.getCurrentNickName()); mst_json.put("status",StatusEnum.FORM_STATUS.code("生成")); - mst_json.put("bill_type",StatusEnum.IOBILL_TYPE.code("生产入库")); + mst_json.put("bill_type",StatusEnum.IOBILL_TYPE_IN.code("生产入库")); mst_json.put("code",CodeUtil.getNewCode("IO_CODE")); mst_json.put("source_form_type",handler.getString("source_form_type")); StIvtIostorinvIn mst = mst_json.toJavaObject(StIvtIostorinvIn.class); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/model/dao/ActDeModel.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/model/dao/ActDeModel.java index 2082f4ca..992cb7f3 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/model/dao/ActDeModel.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/model/dao/ActDeModel.java @@ -83,7 +83,7 @@ public class ActDeModel implements Serializable { /** * 模型类型 */ - private Integer model_type; + private String model_type; /** * 单据类型 diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/controller/StIvtIostorinvdtlController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/controller/StIvtIostorinvdtlController.java deleted file mode 100644 index 15dbd692..00000000 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/controller/StIvtIostorinvdtlController.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.nl.wms.stor_manage.io.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 出入库单明细表 前端控制器 - *

- * - * @author generator - * @since 2024-04-08 - */ -@RestController -@RequestMapping("/stIvtIostorinvdtl") -public class StIvtIostorinvdtlController { - -} - diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/controller/out/StIvtIostorinvOutController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/controller/out/StIvtIostorinvOutController.java new file mode 100644 index 00000000..11f7a980 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/controller/out/StIvtIostorinvOutController.java @@ -0,0 +1,60 @@ +package org.nl.wms.stor_manage.io.controller.out; + + +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.StorInvOutQuery; +import org.nl.wms.stor_manage.io.service.dto.StorInvQuery; +import org.nl.wms.stor_manage.io.service.in.iostor.dao.StIvtIostorinvIn; +import org.nl.wms.stor_manage.io.service.out.iostor.IStIvtIostorinvOutService; +import org.nl.wms.stor_manage.io.service.out.iostor.dao.StIvtIostorinvOut; +import org.nl.wms.stor_manage.io.service.out.iostor_dtl.IStIvtIostorinvdtlOutService; +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 IStIvtIostorinvOutService iStIvtIostorinvOutService; + @Autowired + private IStIvtIostorinvdtlOutService iStIvtIostorinvDtlOutService; + + + + @GetMapping + public ResponseEntity getAll(StorInvOutQuery query, PageQuery page) { + Page result = iStIvtIostorinvOutService.page(page.build(), query.build()); + return new ResponseEntity<>(TableDataInfo.build(result), HttpStatus.OK); + } + @PostMapping + public ResponseEntity save(@RequestBody JSONObject form) { + iStIvtIostorinvOutService.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); + } + +} + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/dto/StorInvOutQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/dto/StorInvOutQuery.java new file mode 100644 index 00000000..e5a7ebb0 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/dto/StorInvOutQuery.java @@ -0,0 +1,20 @@ +package org.nl.wms.stor_manage.io.service.dto; + +import lombok.Data; +import org.nl.common.domain.entity.BaseQuery; +import org.nl.wms.stor_manage.io.service.in.iostor.dao.StIvtIostorinvIn; +import org.nl.wms.stor_manage.io.service.out.iostor.dao.StIvtIostorinvOut; + +/* + * @author ZZQ + * @Date 2023/5/4 19:49 + */ +@Data +public class StorInvOutQuery extends BaseQuery{ + private String form_type; + private String code; + private String status; + private String bill_type; + private String product_code; + +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dis/IStIvtIostorinvdisService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dis/IStIvtIostorinvdisService.java deleted file mode 100644 index f6786d25..00000000 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dis/IStIvtIostorinvdisService.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.nl.wms.stor_manage.io.service.iostor_dis; - -import com.baomidou.mybatisplus.extension.service.IService; -import org.nl.wms.stor_manage.io.service.iostor_dis.dao.StIvtIostorinvdis; - -/** - *

- * 出入库单分配表 服务类 - *

- * - * @author generator - * @since 2024-04-29 - */ -public interface IStIvtIostorinvdisService extends IService { - -} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dis/dao/StIvtIostorinvdis.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dis/dao/StIvtIostorinvdis.java deleted file mode 100644 index ab6a7cf5..00000000 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dis/dao/StIvtIostorinvdis.java +++ /dev/null @@ -1,56 +0,0 @@ -package org.nl.wms.stor_manage.io.service.iostor_dis.dao; - -import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - *

- * 出入库单分配表 - *

- * - * @author generator - * @since 2024-04-29 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@TableName("st_ivt_iostorinvdis") -public class StIvtIostorinvdis implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 出入单分配标识 - */ - private String id; - - private String mst_id; - - /** - * 出入单明细标识 - */ - private String dtl_id; - - /** - * 点位编码 - */ - private String struct_code; - - /** - * 执行状态 - */ - private String status; - - /** - * 任务标识 - */ - private String task_code; - - /** - * 存储载具编码 - */ - private String vehicle_code; - - -} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dis/dao/mapper/StIvtIostorinvdisMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dis/dao/mapper/StIvtIostorinvdisMapper.java deleted file mode 100644 index d6da6020..00000000 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dis/dao/mapper/StIvtIostorinvdisMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.nl.wms.stor_manage.io.service.iostor_dis.dao.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.nl.wms.stor_manage.io.service.iostor_dis.dao.StIvtIostorinvdis; - -/** - *

- * 出入库单分配表 Mapper 接口 - *

- * - * @author generator - * @since 2024-04-29 - */ -public interface StIvtIostorinvdisMapper extends BaseMapper { - -} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dis/dao/mapper/xml/StIvtIostorinvdisMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dis/dao/mapper/xml/StIvtIostorinvdisMapper.xml deleted file mode 100644 index 94a6a1c0..00000000 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dis/dao/mapper/xml/StIvtIostorinvdisMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dis/impl/StIvtIostorinvdisServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dis/impl/StIvtIostorinvdisServiceImpl.java deleted file mode 100644 index 7af91c2a..00000000 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dis/impl/StIvtIostorinvdisServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.nl.wms.stor_manage.io.service.iostor_dis.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.nl.wms.stor_manage.io.service.iostor_dis.IStIvtIostorinvdisService; -import org.nl.wms.stor_manage.io.service.iostor_dis.dao.StIvtIostorinvdis; -import org.nl.wms.stor_manage.io.service.iostor_dis.dao.mapper.StIvtIostorinvdisMapper; -import org.springframework.stereotype.Service; - -/** - *

- * 出入库单分配表 服务实现类 - *

- * - * @author generator - * @since 2024-04-29 - */ -@Service -public class StIvtIostorinvdisServiceImpl extends ServiceImpl implements IStIvtIostorinvdisService { - -} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/dao/mapper/StIvtIostorinvOutMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/dao/mapper/StIvtIostorinvOutMapper.java index fd33b570..fd6b5f4f 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/dao/mapper/StIvtIostorinvOutMapper.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/dao/mapper/StIvtIostorinvOutMapper.java @@ -2,6 +2,7 @@ package org.nl.wms.stor_manage.io.service.out.iostor.dao.mapper; import org.nl.wms.stor_manage.io.service.in.iostor.dao.StIvtIostorinvIn; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.wms.stor_manage.io.service.out.iostor.dao.StIvtIostorinvOut; /** *

@@ -11,6 +12,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @author generator * @since 2024-03-28 */ -public interface StIvtIostorinvOutMapper extends BaseMapper { +public interface StIvtIostorinvOutMapper extends BaseMapper { } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/dao/mapper/xml/StIvtIostorinvOutMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/dao/mapper/xml/StIvtIostorinvOutMapper.xml index 1df581b6..b7534aec 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/dao/mapper/xml/StIvtIostorinvOutMapper.xml +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/dao/mapper/xml/StIvtIostorinvOutMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/impl/StIvtIostorinvOutServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/impl/StIvtIostorinvOutServiceImpl.java index f1e950ae..f7340663 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/impl/StIvtIostorinvOutServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/impl/StIvtIostorinvOutServiceImpl.java @@ -1,10 +1,26 @@ package org.nl.wms.stor_manage.io.service.out.iostor.impl; +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSONObject; +import org.nl.common.enums.StatusEnum; +import org.nl.common.utils.CodeUtil; +import org.nl.common.utils.IdUtil; +import org.nl.common.utils.SecurityUtils; import org.nl.wms.stor_manage.io.service.in.iostor.dao.StIvtIostorinvIn; import org.nl.wms.stor_manage.io.service.in.iostor.dao.mapper.StIvtIostorinvMapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.nl.wms.stor_manage.io.service.out.iostor.IStIvtIostorinvoutService; +import org.nl.wms.stor_manage.io.service.in.iostor_dtl.dao.StIvtIostorinvdtl; +import org.nl.wms.stor_manage.io.service.out.iostor.IStIvtIostorinvOutService; +import org.nl.wms.stor_manage.io.service.out.iostor.dao.StIvtIostorinvOut; +import org.nl.wms.stor_manage.io.service.out.iostor.dao.mapper.StIvtIostorinvOutMapper; +import org.nl.wms.stor_manage.io.service.out.iostor_dtl.IStIvtIostorinvdtlOutService; +import org.nl.wms.stor_manage.io.service.out.iostor_dtl.dao.StIvtIostorinvdtlOut; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Map; /** *

@@ -15,6 +31,33 @@ import org.springframework.stereotype.Service; * @since 2024-03-28 */ @Service -public class StIvtIostorinvOutServiceImpl extends ServiceImpl implements IStIvtIostorinvoutService { +public class StIvtIostorinvOutServiceImpl extends ServiceImpl implements IStIvtIostorinvOutService { + @Autowired + private IStIvtIostorinvdtlOutService iStIvtIostorinvDtlOutService; + + @Override + @Transactional + public void save(JSONObject form) { + if (form==null){ + return; + } + List dtls = (List) form.remove("item"); + StIvtIostorinvOut mst = form.toJavaObject(StIvtIostorinvOut.class); + mst.setId(IdUtil.getStringId()); + mst.setCreate_name(SecurityUtils.getCurrentNickName()); + mst.setCreate_time(DateUtil.now()); + mst.setCode(CodeUtil.getNewCode("IO_CODE")); + mst.setStatus(StatusEnum.FORM_STATUS.code("生成")); + if (dtls!=null && dtls.size()>0){ + for (int i = 0; i < dtls.size(); i++) { + StIvtIostorinvdtlOut dtl = new JSONObject(dtls.get(i)).toJavaObject(StIvtIostorinvdtlOut.class); + dtl.setId(IdUtil.getStringId()); + dtl.setInv_id(mst.getId()); + dtl.setStatus(StatusEnum.FORM_STATUS.code("生成")); + iStIvtIostorinvDtlOutService.save(dtl); + } + } + this.save(mst); + } } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor_dtl/IStIvtIostorinvdtlOutService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor_dtl/IStIvtIostorinvdtlOutService.java index f6010b2f..ac118e28 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor_dtl/IStIvtIostorinvdtlOutService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor_dtl/IStIvtIostorinvdtlOutService.java @@ -2,8 +2,10 @@ package org.nl.wms.stor_manage.io.service.out.iostor_dtl; import org.nl.wms.stor_manage.io.service.in.iostor_dtl.dao.StIvtIostorinvdtl; import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.wms.stor_manage.io.service.out.iostor_dtl.dao.StIvtIostorinvdtlOut; import java.util.List; +import java.util.Map; /** *

@@ -13,7 +15,10 @@ import java.util.List; * @author generator * @since 2024-03-29 */ -public interface IStIvtIostorinvdtlOutService extends IService { +public interface IStIvtIostorinvdtlOutService extends IService { - void batchInsert(List dtls); + void batchInsert(List dtls); + + + List getByInv(String inv_id); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor_dtl/dao/StIvtIostorinvdtlOut.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor_dtl/dao/StIvtIostorinvdtlOut.java index 660817e0..7ed63f11 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor_dtl/dao/StIvtIostorinvdtlOut.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor_dtl/dao/StIvtIostorinvdtlOut.java @@ -1,8 +1,13 @@ package org.nl.wms.stor_manage.io.service.out.iostor_dtl.dao; import java.math.BigDecimal; + +import cn.hutool.json.JSONObject; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; + +import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler; import lombok.Data; import lombok.EqualsAndHashCode; @@ -16,7 +21,7 @@ import lombok.EqualsAndHashCode; */ @Data @EqualsAndHashCode(callSuper = false) -@TableName("st_ivt_iostorinvdtl_in") +@TableName(value = "st_ivt_iostorinvdtl_out", autoResultMap = true) public class StIvtIostorinvdtlOut implements Serializable { private static final long serialVersionUID = 1L; @@ -24,87 +29,85 @@ public class StIvtIostorinvdtlOut implements Serializable { /** * 出入单明细标识 */ - private Long iostorinvdtl_id; + private String id; /** * 出入单标识 */ - private Long iostorinv_id; + private String inv_id; /** - * 明细序号 + * 源单号 */ - private BigDecimal seq_no; + private String source_form_id; + + /** + * 源单单据类型 + */ + private String source_form_type; + /** + * 单据明细状态 + */ + private String status; /** * 物料标识 */ - private Long material_id; + private String material_id; /** * 批次 */ private String pcsn; - /** - * 品质类型 - */ - private String quality_scode; - - /** - * 单据明细状态 - */ - private String bill_status; /** * 数量计量单位标识 */ - private Long qty_unit_id; + private String unit_id; /** - * 数量计量单位名称 - */ - private String qty_unit_name; - - /** - * 数量 + * 计划数量 */ private BigDecimal plan_qty; - /** - * 来源单据明细标识 - */ - private Long source_billdtl_id; /** - * 来源单据类型 + * 未分配数量(计划数量-载具物料数量) */ - private String source_bill_type; + private BigDecimal unassign_qty; /** - * 来源单编号 + * 分配数量 */ - private String source_bill_code; + private BigDecimal assign_qty; + /** + * 分配的载具 + */ + private String vehicle_code; /** - * 来源单表名 + * 仓库 */ - private String source_bill_table; + private String stor_code; + /** + * 仓位编码 + */ + private String struct_code; /** * 备注 */ private String remark; - /** - * 已分配数量 + * 操作时间 */ - private BigDecimal assign_qty; + private String update_time; + + + @TableField(typeHandler = FastjsonTypeHandler.class) + private JSONObject form_data; - /** - * 未分配数量 - */ - private BigDecimal unassign_qty; } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor_dtl/dao/mapper/StIvtIostorinvdtlOutMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor_dtl/dao/mapper/StIvtIostorinvdtlOutMapper.java index c9d5df87..03c29afe 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor_dtl/dao/mapper/StIvtIostorinvdtlOutMapper.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor_dtl/dao/mapper/StIvtIostorinvdtlOutMapper.java @@ -1,9 +1,15 @@ package org.nl.wms.stor_manage.io.service.out.iostor_dtl.dao.mapper; +import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler; +import org.apache.ibatis.annotations.Result; +import org.apache.ibatis.annotations.Results; +import org.apache.ibatis.annotations.Select; import org.nl.wms.stor_manage.io.service.in.iostor_dtl.dao.StIvtIostorinvdtl; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.wms.stor_manage.io.service.out.iostor_dtl.dao.StIvtIostorinvdtlOut; import java.util.List; +import java.util.Map; /** *

@@ -13,8 +19,23 @@ import java.util.List; * @author generator * @since 2024-03-29 */ -public interface StIvtIostorinvdtlOutMapper extends BaseMapper { +public interface StIvtIostorinvdtlOutMapper extends BaseMapper { - Integer batchInsert(List dtls); + Integer batchInsert(List dtls); + + @Select("SELECT\n" + + " sum(md_pb_vehicleMater.qty) as qty,\n" + + " st_ivt_iostorinvdtl_out.*,\n" + + " md_me_materialbase.material_code,\n" + + " md_me_materialbase.material_name,\n" + + " md_me_materialbase.material_spec\n" + + " FROM\n" + + " st_ivt_iostorinvdtl_out\n" + + " LEFT JOIN md_me_materialbase ON st_ivt_iostorinvdtl_out.material_id = md_me_materialbase.material_id\n" + + " LEFT JOIN md_pb_vehicleMater ON (st_ivt_iostorinvdtl_out.vehicle_code = md_pb_vehicleMater.vehicle_code\n" + + " and st_ivt_iostorinvdtl_out.material_id = md_pb_vehicleMater.material_id)\n" + + " where inv_id = #{inv_id} GROUP BY st_ivt_iostorinvdtl_out.id") + @Results({@Result(property = "form_data",column = "form_data",typeHandler = FastjsonTypeHandler.class)}) + List findByInv(String inv_id); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor_dtl/dao/mapper/xml/StIvtIostorinvdtlOutMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor_dtl/dao/mapper/xml/StIvtIostorinvdtlOutMapper.xml index 4455dad4..1aaf5e5b 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor_dtl/dao/mapper/xml/StIvtIostorinvdtlOutMapper.xml +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor_dtl/dao/mapper/xml/StIvtIostorinvdtlOutMapper.xml @@ -1,5 +1,9 @@ - + + + insert into st_ivt_iostorinvdtl_out() values + + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor_dtl/impl/StIvtIostorinvdtlOutServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor_dtl/impl/StIvtIostorinvdtlOutServiceImpl.java index 9f5c5920..3fff9305 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor_dtl/impl/StIvtIostorinvdtlOutServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor_dtl/impl/StIvtIostorinvdtlOutServiceImpl.java @@ -1,12 +1,17 @@ package org.nl.wms.stor_manage.io.service.out.iostor_dtl.impl; +import org.apache.commons.lang3.StringUtils; import org.nl.wms.stor_manage.io.service.in.iostor_dtl.dao.StIvtIostorinvdtl; import org.nl.wms.stor_manage.io.service.in.iostor_dtl.dao.mapper.StIvtIostorinvdtlMapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.nl.wms.stor_manage.io.service.out.iostor_dtl.IStIvtIostorinvdtlOutService; +import org.nl.wms.stor_manage.io.service.out.iostor_dtl.dao.StIvtIostorinvdtlOut; +import org.nl.wms.stor_manage.io.service.out.iostor_dtl.dao.mapper.StIvtIostorinvdtlOutMapper; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; +import java.util.Map; /** *

@@ -17,12 +22,19 @@ import java.util.List; * @since 2024-03-29 */ @Service -public class StIvtIostorinvdtlOutServiceImpl extends ServiceImpl implements IStIvtIostorinvdtlOutService { +public class StIvtIostorinvdtlOutServiceImpl extends ServiceImpl implements IStIvtIostorinvdtlOutService { @Override - public void batchInsert(List dtls) { + public void batchInsert(List dtls) { this.baseMapper.batchInsert(dtls); } + @Override + public List getByInv(String inv_id) { + if (StringUtils.isEmpty(inv_id)){ + return new ArrayList<>(); + } + return this.baseMapper.findByInv(inv_id); + } } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java index 4c423695..4bfaf560 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java @@ -43,7 +43,7 @@ public class StIvtStructattrServiceImpl extends ServiceImpl records = new ArrayList<>(); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dict/SysDictController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dict/SysDictController.java index 5b80d6f7..fb8c6455 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dict/SysDictController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dict/SysDictController.java @@ -119,10 +119,11 @@ public class SysDictController { return new ResponseEntity<>(TableDataInfo.build(dictService.getDictByName(code.getString("code"))),HttpStatus.OK); } - @GetMapping("/getStatusEnum/{type}") + @GetMapping("/getStatusEnum") @Log("获取acs任务类型列表") @SaIgnore - public ResponseEntity getAcsTaskType(@PathVariable String type) { + public ResponseEntity getAcsTaskType(@RequestParam Map criteria) { + Object type = criteria.get("code"); List items = new ArrayList<>(); for (StatusEnum value : StatusEnum.values()) { if (value.name().equals(type)){ diff --git a/wms_pro/qd/src/components/StatusEnum/StatusEnum.js b/wms_pro/qd/src/components/StatusEnum/StatusEnum.js new file mode 100644 index 00000000..685cb37d --- /dev/null +++ b/wms_pro/qd/src/components/StatusEnum/StatusEnum.js @@ -0,0 +1,29 @@ +import Vue from 'vue' +import { get as getEnumDetail } from '@/views/system/dict/enumDetail' + +export default class StatusEnum { + constructor(statusEnum) { + this.statusEnum = statusEnum + } + + async init(names, completeCallback) { + if (names === undefined || name === null) { + throw new Error('need StatusEnum names') + } + const ps = [] + names.forEach(n => { + Vue.set(this.statusEnum.statusEnum, n, {}) + Vue.set(this.statusEnum.label, n, {}) + Vue.set(this.statusEnum, n, []) + ps.push(getEnumDetail(n).then(data => { + this.statusEnum[n].splice(0, 0, ...data) + data.forEach(d => { + Vue.set(this.statusEnum.statusEnum[n], d.value, d) + Vue.set(this.statusEnum.label[n], d.value, d.label) + }) + })) + }) + await Promise.all(ps) + completeCallback() + } +} diff --git a/wms_pro/qd/src/components/StatusEnum/index.js b/wms_pro/qd/src/components/StatusEnum/index.js new file mode 100644 index 00000000..43cb2920 --- /dev/null +++ b/wms_pro/qd/src/components/StatusEnum/index.js @@ -0,0 +1,29 @@ +import StatusEnum from './StatusEnum' + +const install = function(Vue) { + Vue.mixin({ + data() { + if (this.$options.statusEnums instanceof Array) { + const statusEnum = { + statusEnum: {}, + label: {} + } + return { + statusEnum + } + } + return {} + }, + created() { + if (this.$options.statusEnums instanceof Array) { + new StatusEnum(this.statusEnum).init(this.$options.statusEnums, () => { + this.$nextTick(() => { + this.$emit('dictReady') + }) + }) + } + } + }) +} + +export default { install } diff --git a/wms_pro/qd/src/main.js b/wms_pro/qd/src/main.js index 3e11fd49..1747ac19 100644 --- a/wms_pro/qd/src/main.js +++ b/wms_pro/qd/src/main.js @@ -14,6 +14,8 @@ import 'mavon-editor/dist/css/index.css' // 数据字典 import dict from './components/Dict' +// 数据字典 +import statusEnum from './components/StatusEnum' import scroll from 'vue-seamless-scroll' // 权限指令 @@ -54,6 +56,7 @@ Vue.use(VueHighlightJS) Vue.use(mavonEditor) Vue.use(permission) Vue.use(dict) +Vue.use(statusEnum) Vue.use(VueBus) // 全局设置控件样式https://codeantenna.com/a/0IN5FMJk5h diff --git a/wms_pro/qd/src/views/system/dict/enumDetail.js b/wms_pro/qd/src/views/system/dict/enumDetail.js new file mode 100644 index 00000000..8e004511 --- /dev/null +++ b/wms_pro/qd/src/views/system/dict/enumDetail.js @@ -0,0 +1,14 @@ +import request from '@/utils/request' + +export function get(code) { + const params = { + code + } + return request({ + url: 'api/dict/getStatusEnum', + method: 'get', + params + }) +} + +export default { get } diff --git a/wms_pro/qd/src/views/wms/flow_manage/act/model/index.vue b/wms_pro/qd/src/views/wms/flow_manage/act/model/index.vue index 6e49520a..3d46f2e2 100644 --- a/wms_pro/qd/src/views/wms/flow_manage/act/model/index.vue +++ b/wms_pro/qd/src/views/wms/flow_manage/act/model/index.vue @@ -88,8 +88,8 @@ - - + +