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

add:出库功能

Browse Source
This commit is contained in:
zhangzq
2024-05-24 17:50:02 +08:00
parent 6f0c43b0d9
commit 92a9210dfe
38 changed files with 2220 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wms_pro/hd/nladmin-system/src/main/java/org/nl/common/enums/StatusEnum.java
View File

@@ -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)),
/**
* 点位锁类型
*/

8
wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/MapOf.java
View File

@@ -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 <K> 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;
}
}

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

@@ -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<SchBaseTask> list = taskService.list(new QueryWrapper<SchBaseTask>().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){

45
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/model/ActDeModelController.java
View File

@@ -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<Object> 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<Object> 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<Object> 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);

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/FormActivityBehavior.java
View File

@@ -77,7 +77,7 @@ public class FormActivityBehavior extends FlowNodeActivityBehavior<JSONObject> {
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);

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

@@ -83,7 +83,7 @@ public class ActDeModel implements Serializable {
/**
* 模型类型
*/
private Integer model_type;
private String model_type;
/**
* 单据类型

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

@@ -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;
/**
* <p>
* 出入库单明细表 前端控制器
* </p>
*
* @author generator
* @since 2024-04-08
*/
@RestController
@RequestMapping("/stIvtIostorinvdtl")
public class StIvtIostorinvdtlController {
}

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

@@ -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;
/**
* <p>
* 出入库单主表 前端控制器
* </p>
*
* @author generator
* @since 2024-03-28
*/
@RestController
@RequestMapping("api/stIvtIostorinvOut")
public class StIvtIostorinvOutController {
@Autowired
private IStIvtIostorinvOutService iStIvtIostorinvOutService;
@Autowired
private IStIvtIostorinvdtlOutService iStIvtIostorinvDtlOutService;
@GetMapping
public ResponseEntity<Object> getAll(StorInvOutQuery query, PageQuery page) {
Page<StIvtIostorinvOut> result = iStIvtIostorinvOutService.page(page.build(), query.build());
return new ResponseEntity<>(TableDataInfo.build(result), HttpStatus.OK);
}
@PostMapping
public ResponseEntity<Object> save(@RequestBody JSONObject form) {
iStIvtIostorinvOutService.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);
}
}

20
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/dto/StorInvOutQuery.java Normal file
View File

@@ -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<StIvtIostorinvOut>{
private String form_type;
private String code;
private String status;
private String bill_type;
private String product_code;
}

16
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dis/IStIvtIostorinvdisService.java
View File

@@ -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;
/**
* <p>
* 出入库单分配表 服务类
* </p>
*
* @author generator
* @since 2024-04-29
*/
public interface IStIvtIostorinvdisService extends IService<StIvtIostorinvdis> {
}

56
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dis/dao/StIvtIostorinvdis.java
View File

@@ -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;
/**
* <p>
* 出入库单分配表
* </p>
*
* @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;
}

16
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dis/dao/mapper/StIvtIostorinvdisMapper.java
View File

@@ -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;
/**
* <p>
* 出入库单分配表 Mapper 接口
* </p>
*
* @author generator
* @since 2024-04-29
*/
public interface StIvtIostorinvdisMapper extends BaseMapper<StIvtIostorinvdis> {
}

5
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dis/dao/mapper/xml/StIvtIostorinvdisMapper.xml
View File

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.nl.wms.stor_manage.io.service.iostor_dis.dao.mapper.StIvtIostorinvdisMapper">
</mapper>

20
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/iostor_dis/impl/StIvtIostorinvdisServiceImpl.java
View File

@@ -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;
/**
* <p>
* 出入库单分配表 服务实现类
* </p>
*
* @author generator
* @since 2024-04-29
*/
@Service
public class StIvtIostorinvdisServiceImpl extends ServiceImpl<StIvtIostorinvdisMapper, StIvtIostorinvdis> implements IStIvtIostorinvdisService {
}

3
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/dao/mapper/StIvtIostorinvOutMapper.java
View File

@@ -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;
/**
* <p>
@@ -11,6 +12,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* @author generator
* @since 2024-03-28
*/
public interface StIvtIostorinvOutMapper extends BaseMapper<StIvtIostorinvIn> {
public interface StIvtIostorinvOutMapper extends BaseMapper<StIvtIostorinvOut> {
}

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

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.nl.wms.stor_manage.io.service.in.iostor.dao.mapper.StIvtIostorinvMapper">
<mapper namespace="org.nl.wms.stor_manage.io.service.out.iostor.dao.mapper.StIvtIostorinvOutMapper">
</mapper>

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

@@ -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;
/**
* <p>
@@ -15,6 +31,33 @@ import org.springframework.stereotype.Service;
* @since 2024-03-28
*/
@Service
public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvMapper, StIvtIostorinvIn> implements IStIvtIostorinvoutService {
public class StIvtIostorinvOutServiceImpl extends ServiceImpl<StIvtIostorinvOutMapper, StIvtIostorinvOut> implements IStIvtIostorinvOutService {
@Autowired
private IStIvtIostorinvdtlOutService iStIvtIostorinvDtlOutService;
@Override
@Transactional
public void save(JSONObject form) {
if (form==null){
return;
}
List<Map> dtls = (List<Map>) 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);
}
}

9
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor_dtl/IStIvtIostorinvdtlOutService.java
View File

@@ -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;
/**
* <p>
@@ -13,7 +15,10 @@ import java.util.List;
* @author generator
* @since 2024-03-29
*/
public interface IStIvtIostorinvdtlOutService extends IService<StIvtIostorinvdtl> {
public interface IStIvtIostorinvdtlOutService extends IService<StIvtIostorinvdtlOut> {
void batchInsert(List<StIvtIostorinvdtl> dtls);
void batchInsert(List<StIvtIostorinvdtlOut> dtls);
List<Map> getByInv(String inv_id);
}

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

@@ -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;
}

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

@@ -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;
/**
* <p>
@@ -13,8 +19,23 @@ import java.util.List;
* @author generator
* @since 2024-03-29
*/
public interface StIvtIostorinvdtlOutMapper extends BaseMapper<StIvtIostorinvdtl> {
public interface StIvtIostorinvdtlOutMapper extends BaseMapper<StIvtIostorinvdtlOut> {
Integer batchInsert(List<StIvtIostorinvdtl> dtls);
Integer batchInsert(List<StIvtIostorinvdtlOut> 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<Map> findByInv(String inv_id);
}

6
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor_dtl/dao/mapper/xml/StIvtIostorinvdtlOutMapper.xml
View File

@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.nl.wms.stor_manage.io.service.in.iostor_dtl.dao.mapper.StIvtIostorinvdtlOutMapper">
<mapper namespace="org.nl.wms.stor_manage.io.service.out.iostor_dtl.dao.mapper.StIvtIostorinvdtlOutMapper">
<insert id="batchInsert">
insert into st_ivt_iostorinvdtl_out() values <foreach collection="dtls" open="(" close=")" item="item">
</foreach>
</insert>
</mapper>

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

@@ -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;
/**
* <p>
@@ -17,12 +22,19 @@ import java.util.List;
* @since 2024-03-29
*/
@Service
public class StIvtIostorinvdtlOutServiceImpl extends ServiceImpl<StIvtIostorinvdtlMapper, StIvtIostorinvdtl> implements IStIvtIostorinvdtlOutService {
public class StIvtIostorinvdtlOutServiceImpl extends ServiceImpl<StIvtIostorinvdtlOutMapper, StIvtIostorinvdtlOut> implements IStIvtIostorinvdtlOutService {
@Override
public void batchInsert(List<StIvtIostorinvdtl> dtls) {
public void batchInsert(List<StIvtIostorinvdtlOut> dtls) {
this.baseMapper.batchInsert(dtls);
}
@Override
public List<Map> getByInv(String inv_id) {
if (StringUtils.isEmpty(inv_id)){
return new ArrayList<>();
}
return this.baseMapper.findByInv(inv_id);
}
}

4
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/impl/StIvtStructattrServiceImpl.java
View File

@@ -43,7 +43,7 @@ public class StIvtStructattrServiceImpl extends ServiceImpl<StIvtStructattrMappe
public static void main(String[] args) {
Boolean in = StatusEnum.TASK_TYPE_IN.check("10");
Boolean in = StatusEnum.TASK_TYPE.check("10");
System.out.println(in);
}
@Override
@@ -53,7 +53,7 @@ public class StIvtStructattrServiceImpl extends ServiceImpl<StIvtStructattrMappe
.set("vehicle_code",vehicle_code)
.set("lock_type", StatusEnum.LOCK.code("无"))
.eq("struct_code",struct_code));
Boolean in = StatusEnum.TASK_TYPE_IN.check(task_type);
Boolean in = StatusEnum.TASK_TYPE.check(task_type);
String now = DateUtil.now();
List<StIvtStructivtflow> records = new ArrayList<>();

5
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/controller/dict/SysDictController.java
View File

@@ -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<Object> getAcsTaskType(@PathVariable String type) {
public ResponseEntity<Object> getAcsTaskType(@RequestParam Map criteria) {
Object type = criteria.get("code");
List<Map> items = new ArrayList<>();
for (StatusEnum value : StatusEnum.values()) {
if (value.name().equals(type)){