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

add:增加单据管理

Browse Source
This commit is contained in:
gongbaoxiong
2025-06-27 13:58:32 +08:00
parent 137688272c
commit f01920b351
23 changed files with 737 additions and 538 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IStructattrService.java
View File

@@ -1,6 +1,5 @@
package org.nl.wms.basedata_manage.service;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -9,8 +8,6 @@ import org.nl.wms.basedata_manage.service.dao.Structattr;
import org.nl.wms.basedata_manage.service.dao.StructattrVechielDto;
import org.nl.wms.basedata_manage.service.dto.StrategyStructMaterialVO;
import org.nl.wms.basedata_manage.service.dto.StrategyStructParam;
import org.nl.wms.warehouse_management.service.dao.IOStorInv;
import org.springframework.data.domain.Pageable;
import java.util.List;
import java.util.Map;
@@ -108,7 +105,13 @@ public interface IStructattrService extends IService<Structattr> {
List<StructattrVechielDto> collectVechicle(Map query);
/**
* 出库规则
*/
List<StrategyStructMaterialVO> outBoundSectDiv(StrategyStructParam param);
/**
* 入库规则
*/
List<Structattr> inBoundSectDiv(StrategyStructParam param);
}

1
nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/dao/StSectStrategy.java
View File

@@ -47,6 +47,7 @@ public class StSectStrategy implements Serializable {
/**
* 策略类型
*/
@TableField(typeHandler = ListStrTypeHandler.class)
private List<String> strategy_type;
/**

2
nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/dao/mapper/xml/StStrategyConfigMapper.xml
View File

@@ -8,12 +8,10 @@
st_strategy_config
<where>
is_delete = "0"
<if test="query.strategy_name != null and query.strategy_name != ''">
and (strategy_name LIKE '%${query.strategy_name}%'
or strategy_code LIKE '%${query.strategy_name}%')
</if>
</where>
</select>

10
nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaIosInServiceImpl.java
View File

@@ -116,7 +116,7 @@ public class PdaIosInServiceImpl implements PdaIosInService {
MdPbMeasureunit unitDao = iMdPbMeasureunitService.getByCode(unit_code);
GroupPlate groupDao = iMdPbGroupplateService.getOne(
new QueryWrapper<GroupPlate>().lambda()
.eq(GroupPlate::getMaterial_id, materDao.getMaterial_id())
.eq(GroupPlate::getMaterial_code, materDao.getMaterial_code())
.eq(GroupPlate::getPcsn, pcsn)
.eq(GroupPlate::getQty, qty)
.eq(GroupPlate::getQty_unit_id, unitDao.getMeasure_unit_id())
@@ -129,7 +129,7 @@ public class PdaIosInServiceImpl implements PdaIosInService {
// 插入组盘记录表
groupDao = new GroupPlate();
groupDao.setGroup_id(IdUtil.getStringId());
groupDao.setMaterial_id(materDao.getMaterial_id());
groupDao.setMaterial_code(materDao.getMaterial_code());
groupDao.setPcsn(pcsn);
groupDao.setQty_unit_id(unitDao.getMeasure_unit_id());
groupDao.setQty_unit_name(unitDao.getUnit_name());
@@ -171,7 +171,7 @@ public class PdaIosInServiceImpl implements PdaIosInService {
);
if (ObjectUtil.isNotEmpty(plateDaoList)) {
boolean is_like = plateDaoList.stream()
.allMatch(row -> row.getMaterial_id().equals(groupDao.getMaterial_id()) &&
.allMatch(row -> row.getMaterial_code().equals(groupDao.getMaterial_code()) &&
row.getPcsn().equals(groupDao.getPcsn())
);
if (!is_like) {
@@ -264,12 +264,12 @@ public class PdaIosInServiceImpl implements PdaIosInService {
HashMap<String, String> dtl = new HashMap<>();
GroupPlate plateDao = plateDaoList.get(0);
dtl.put("storagevehicle_code", plateDao.getStoragevehicle_code());
dtl.put("material_id", plateDao.getMaterial_id());
dtl.put("material_id", plateDao.getMaterial_code());
dtl.put("pcsn", plateDao.getPcsn());
dtl.put("qty_unit_id", plateDao.getQty_unit_id());
dtl.put("qty_unit_name", plateDao.getQty_unit_name());
dtl.put("qty", String.valueOf(total_qty));
MdMeMaterialbase materDao = iMdMeMaterialbaseService.getById(plateDao.getMaterial_id());
MdMeMaterialbase materDao = iMdMeMaterialbaseService.getByCode(plateDao.getMaterial_code());
dtl.put("material_code", materDao.getMaterial_code());
dtl.put("material_name", materDao.getMaterial_name());
dtl.put("plan_qty", String.valueOf(total_qty));

34
nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java
View File

@@ -1,4 +1,5 @@
package org.nl.wms.pm_manage.form_data.controller;
import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONArray;
@@ -9,9 +10,11 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.commons.lang3.ObjectUtils;
import org.nl.common.base.TableDataInfo;
import org.nl.common.domain.query.PageQuery;
import org.nl.common.logging.annotation.Log;
import org.nl.common.utils.SecurityUtils;
import org.nl.wms.pm_manage.form_data.service.IPmFormDataService;
import org.nl.wms.pm_manage.form_data.service.dao.PmFormData;
import org.nl.wms.pm_manage.form_data.service.dao.dao.PmFormData;
import org.nl.wms.pm_manage.form_data.service.dao.dto.PmFormDataParam;
import org.nl.wms.pm_manage.form_data.service.dao.mapper.PmFormDataMapper;
import org.nl.wms.pm_manage.form_data.service.dto.FormDataQuery;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,9 +22,9 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import java.util.*;
import java.util.Set;
import java.util.stream.Collectors;
import org.nl.common.logging.annotation.Log;
/**
* <p>
* 表单信息表 前端控制器
@@ -47,6 +50,20 @@ public class PmFormDataController {
return new ResponseEntity<>(TableDataInfo.build(iPmFormDataService.queryTree(query, page)), HttpStatus.OK);
}
/**
* 新增数据
* @param params 实体对象
* @return 新增结果
*/
@PostMapping
@Log("新增表单信息表")
//@SaCheckPermission("@el.check(PmFormData:add")
public ResponseEntity<Object> create(@RequestBody PmFormDataParam params){
iPmFormDataService.create(params);
return new ResponseEntity<>(HttpStatus.OK);
}
@PutMapping()
@Log("修改单据结构")
@Transactional(rollbackFor = Exception.class)
@@ -56,11 +73,11 @@ public class PmFormDataController {
PmFormData pmFormData = JSONObject.parseObject(s, PmFormData.class, Feature.OrderedField);
//生产入库单存在报工数超过合格数，需要人工修改正确报工数=合格数，进行手动回传
String id = pmFormData.getId();
PmFormData pmFormData1 = iPmFormDataService.getById(id);
pmFormData1.setRemark(pmFormData.getRemark());
pmFormData1.setUpdate_name(SecurityUtils.getCurrentUserId());
pmFormData1.setUpdate_time(DateUtil.now());
iPmFormDataService.updateById(pmFormData1);
PmFormData entity = iPmFormDataService.getById(id);
entity.setRemark(pmFormData.getRemark());
entity.setUpdate_name(SecurityUtils.getCurrentUserId());
entity.setUpdate_time(DateUtil.now());
iPmFormDataService.updateById(entity);
return new ResponseEntity<>(HttpStatus.OK);
}
@@ -71,7 +88,6 @@ public class PmFormDataController {
public ResponseEntity<Object> delete(@RequestBody String[] ids) {
if (ids.length > 0) {
pFormDataMapper.delete(new LambdaUpdateWrapper<PmFormData>().in(PmFormData::getId, ids));
pFormDataMapper.delete(new LambdaUpdateWrapper<PmFormData>().in(PmFormData::getParent_id, ids));
}
return new ResponseEntity<>(HttpStatus.OK);
}

14
nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/IPmFormDataService.java
View File

@@ -1,12 +1,13 @@
package org.nl.wms.pm_manage.form_data.service;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.nl.common.domain.query.PageQuery;
import org.nl.wms.pm_manage.form_data.service.dao.PmFormData;
import com.baomidou.mybatisplus.extension.service.IService;
import org.nl.common.domain.query.PageQuery;
import org.nl.wms.pm_manage.form_data.service.dao.dao.PmFormData;
import org.nl.wms.pm_manage.form_data.service.dao.dto.PmFormDataParam;
import org.nl.wms.pm_manage.form_data.service.dto.FormDataQuery;
import org.nl.wms.pm_manage.form_data.service.dto.PmFormDataDto;
import java.util.List;
/**
@@ -22,6 +23,11 @@ public interface IPmFormDataService extends IService<PmFormData> {
Integer syncFormData(String type,String dataString);
/**
* 创建
* @param params 对象实体
*/
void create(PmFormDataParam params);
List<PmFormData> getByType(String from_type);

9
nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/FormDataIdCode.java
View File

@@ -1,9 +0,0 @@
package org.nl.wms.pm_manage.form_data.service.dao;
import lombok.Data;
@Data
public class FormDataIdCode {
private String id;
private String code;
}

371
nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/PmFormData.java
View File

@@ -1,371 +0,0 @@
package org.nl.wms.pm_manage.form_data.service.dao;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.nl.common.domain.handler.FastjsonSortTypeHandler;
import org.nl.wms.sch_manage.enums.StatusEnum;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* <p>
* 表单信息表
* </p>
*
* @author generator
* @since 2024-03-25
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName(value = "pm_form_data", autoResultMap = true)
public class PmFormData implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 业务单据单据id
*/
private String id;
/**
* 单据编码
*/
private String code;
/**
* 对应流程实例id
*/
private String proc_inst_id;
/**
* 业务单据编号
*/
private String source_form_id;
/**
* 业务单据编号
*/
private String source_form_type;
/**
* 业务单据日期
*/
private String source_form_date;
/**
* 单据类型
*/
private String form_type;
/**
* 业务单据状态
*/
private String status = StatusEnum.FORM_STATUS.code("生成");
/**
* 物料id
*/
private String material_id;
/**
* 对应明细：生产入库单-入库数量FRealQty/采购入库单-采购数量FRealQty
*/
private BigDecimal qty;
/**
* 数量
*/
private BigDecimal plan_qty;
/**
* 已分配数量
*/
private BigDecimal assign_qty;
/**
* 实际数量
*/
private BigDecimal actual_qty;
/**
* 单位
*/
private String unit_id;
/**
* 批次号
*/
private String pcsn;
/**
* 载具
*/
private String vehicle_code;
/**
* 载具组盘id
*/
private String vehicle_id;
/**
* 自定义表单字段
*/
@TableField(typeHandler = FastjsonSortTypeHandler.class)
private JSONObject form_data = new JSONObject();;
/**
* 关联上级表单id
*/
private String parent_id;
/**
* 创建id
*/
private String create_time;
/**
* 创建id
*/
private String create_name;
/**
* 创建id
*/
private String update_time;
/**
* 创建id
*/
private String update_name;
/**
* 备注说明
*/
private String remark;
/**
* 条码
*/
private String bar_code;
/**
* 对应表头：生产入库单-生产组织prdOrgId/采购入库单-采购组织FPurchaseOrgId
*/
@TableField(exist = false)
private String prdOrgId;
/**
* 对应表头：生产入库单-入库组织FStockOrgId/采购入库单-收料组织FStockOrgId
*/
@TableField(exist = false)
private String stockOrgId;
/**
* 拣选出库的载具
*/
@TableField(exist = false)
private String outVehicleCode;
/**
* 货主类型1
*/
@TableField(exist = false)
private String ownerTypeIdHead;
/**
* 对应表头：生产入库单-货主FOwnerId0
*/
@TableField(exist = false)
private String ownerIdHead_Id;
/**
* 物料名称
*/
@TableField(exist = false)
private String material_name;
/**
* 单重
*/
@TableField(exist = false)
private String net_weight;
/**
* 物料规格
*/
@TableField(exist = false)
private String material_spec;
/**
* 对应明细：生产入库单-关联物料编码FMaterialId/采购入库单-关联物料编码FMaterialId
*/
@TableField(exist = false)
private String material_code;
/**
* 对应明细：生产入库单,采购入库单-单位FUnitCode
*/
@TableField(exist = false)
private String unit_code;
/**
* 生产订单行号
*/
@TableField(exist = false)
private String moEntrySeq;
/**
* 单据编号
*/
@TableField(exist = false)
private String billNo;
/**
* 单位名称
*/
@TableField(exist = false)
private String unit_name;
/**
* 对应明细：生产入库单-货主类型FOwnerTypeId,默认(BD_OwnerOrg)
*/
@TableField(exist = false)
private String ownerTypeId;
/**
* 对应明细：生产入库单-货主FOwnerId
*/
@TableField(exist = false)
private String ownerId_Id;
/**
* 供应商
*/
@TableField(exist = false)
private String supplierId;
/**
* 计价单位
*/
@TableField(exist = false)
private String remainInStockUnitId;
/**
* 对应明细：生产入库单-关联订单号FMoBillNo/采购入库单-关联订单号FPoOrderNo
*/
@TableField(exist = false)
private String moNumber;
/**
* 对应明细：生产入库单-关联订单号Id-FMoId
*/
@TableField(exist = false)
private String moId;
/**
* 对应明细：生产入库单-关联订单号明细Id-FMoEntryId/采购入库单-关联订单号明细FPoOrderEntryId
*/
@TableField(exist = false)
private String moEntryId;
/**
* 对应明细：生产入库单-关联源头订单号明细Id-FSrcEntryId/采购入库单-关联源头订单号编号FSrcBillNo
*/
@TableField(exist = false)
private String srcBillNo;
/**
* 对应明细：生产入库单-生产车间FWorkShopId1
*/
@TableField(exist = false)
private String workShopId1;
/**
* 对应明细：生产入库单-应收数量FMustQty
*/
@TableField(exist = false)
private BigDecimal mustQty;
/**
* 对应明细：生产入库单-入库类型FInStockType,默认: 1
*/
@TableField(exist = false)
private String inStockType;
/**
* 对应明细：生产入库单-库存状态FStockStatusId,默认: 10000
*/
@TableField(exist = false)
private String stockStatusId;
/**
* 对应明细：生产入库单-ERP仓库FStockId
*/
@TableField(exist = false)
private String stockId;
/**
* 对应明细：生产入库单-保管者类型FKeeperTypeId,默认(BD_KeeperOrg)
*/
@TableField(exist = false)
private String keeperTypeId;
/**
* 对应明细：生产入库单-保管者FKeeperId
*/
@TableField(exist = false)
private String keeperId;
/**
* 对应表头：采购入库单-业务类型FBusinessType:默认(CG)
*/
@TableField(exist = false)
private String businessType;
/**
* 对应明细：采购入库单-采购员FPurchaserId
*/
@TableField(exist = false)
private String purchaserId;
/**
* 对应明细：生产入库单-含税价FTaxPrice
*/
@TableField(exist = false)
private String taxPrice;
/**
* 自定义表单字段
*/
@TableField(typeHandler = FastjsonSortTypeHandler.class)
private JSONObject erp_data = new JSONObject();
}

181
nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/dao/PmFormData.java Normal file
View File

@@ -0,0 +1,181 @@
package org.nl.wms.pm_manage.form_data.service.dao.dao;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* {@code @Description:} 表单信息表(PmFormData)实体类
* {@code @Author:} gbx
*
* @since 2025-06-27
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("pm_form_data")
public class PmFormData extends Model<PmFormData> {
private static final long serialVersionUID = -7739291296662381393L;
//@TableId(type = IdType.ASSIGN_ID)
/**
* 主键id
*/
@TableId(value = "id", type = IdType.NONE)
private String id;
/**
* 编号
*/
private String code;
/**
* 单据状态
*/
private String status;
/**
* 单据类型
*/
private String form_type;
/**
* 源单单据日期
*/
private String source_form_date;
/**
* 物料code
*/
private String material_code;
/**
* 批次号
*/
private String pcsn;
/**
* 计划数量
*/
private BigDecimal plan_qty;
/**
* 数量
*/
private BigDecimal qty;
/**
* 分配数量
*/
private BigDecimal assign_qty;
/**
* 实际数量
*/
private BigDecimal actual_qty;
/**
* 单据累计数量
*/
private BigDecimal total_qty;
/**
* 数量单位
*/
private String unit_id;
/**
* 单位名称
*/
private String unit_name;
/**
* 载具信息
*/
private String vehicle_code;
/**
* 载具组盘id
*/
private String vehicle_id;
/**
* 自定义表单字段
*/
private String form_data;
/**
* 创建id
*/
@TableField(fill = FieldFill.INSERT)
private String create_time;
/**
* 创建id
*/
private String create_name;
/**
* 修改时间
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
private String update_time;
/**
* 修改人
*/
private String update_name;
/**
* 说明
*/
private String remark;
/**
* 是否完结
*/
private Integer is_finish;
/**
* 获取主键值
*
* @return 主键值
*/
@Override
protected Serializable pkVal() {
return this.id;
}
}

123
nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/dto/PmFormDataDto.java Normal file
View File

@@ -0,0 +1,123 @@
package org.nl.wms.pm_manage.form_data.service.dao.dto;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* {@code @Description:} 表单信息表(PmFormData)数据传输类
* {@code @Author:} gbx
*
* @since 2025-06-27
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class PmFormDataDto implements Serializable {
private static final long serialVersionUID = -7739291296662381396L;
/**
* 主键
*/
private String id;
/**
* 编号
*/
private String code;
/**
* 单据状态
*/
private String status;
/**
* 单据类型
*/
private String form_type;
/**
* 源单单据日期
*/
private String source_form_date;
/**
* 物料code
*/
private String material_code;
/**
* 批次号
*/
private String pcsn;
/**
* 计划数量
*/
private BigDecimal plan_qty;
/**
* 数量
*/
private BigDecimal qty;
/**
* 分配数量
*/
private BigDecimal assign_qty;
/**
* 实际数量
*/
private BigDecimal actual_qty;
/**
* 单据累计数量
*/
private BigDecimal total_qty;
/**
* 数量单位
*/
private String unit_id;
/**
* 单位名称
*/
private String unit_name;
/**
* 载具信息
*/
private String vehicle_code;
/**
* 载具组盘id
*/
private String vehicle_id;
/**
* 自定义表单字段
*/
private String form_data;
/**
* 创建id
*/
private String create_time;
/**
* 创建id
*/
private String create_name;
/**
* 修改时间
*/
private String update_time;
/**
* 修改人
*/
private String update_name;
/**
* 说明
*/
private String remark;
/**
* 是否完结
*/
private Integer is_finish;
}

115
nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/dto/PmFormDataParam.java Normal file
View File

@@ -0,0 +1,115 @@
package org.nl.wms.pm_manage.form_data.service.dao.dto;
import lombok.*;
import org.nl.common.domain.query.BaseQuery;
import org.nl.wms.pm_manage.form_data.service.dao.dao.PmFormData;
import java.math.BigDecimal;
/**
* {@code @Description:} 表单信息表(PmFormData)查询参数类
* {@code @Author:} gbx
*
* @since 2025-06-27
*/
@Data
@Builder
@ToString
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode(callSuper = false)
public class PmFormDataParam extends BaseQuery<PmFormData> {
/**
* 主键
*/
private String id;
/**
* 编号
*/
private String code;
/**
* 单据状态
*/
private String status;
/**
* 单据类型
*/
private String form_type;
/**
* 源单单据日期
*/
private String source_form_date;
/**
* 物料code
*/
private String material_code;
/**
* 批次号
*/
private String pcsn;
/**
* 计划数量
*/
private BigDecimal plan_qty;
/**
* 数量
*/
private BigDecimal qty;
/**
* 分配数量
*/
private BigDecimal assign_qty;
/**
* 实际数量
*/
private BigDecimal actual_qty;
/**
* 单据累计数量
*/
private BigDecimal total_qty;
/**
* 数量单位
*/
private String unit_id;
/**
* 单位名称
*/
private String unit_name;
/**
* 载具信息
*/
private String vehicle_code;
/**
* 载具组盘id
*/
private String vehicle_id;
/**
* 自定义表单字段
*/
private String form_data;
/**
* 创建id
*/
private String create_time;
/**
* 创建id
*/
private String create_name;
/**
* 修改时间
*/
private String update_time;
/**
* 修改人
*/
private String update_name;
/**
* 说明
*/
private String remark;
/**
* 是否完结
*/
private Integer is_finish;
}

3
nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/PmFormDataMapper.java
View File

@@ -3,13 +3,12 @@ package org.nl.wms.pm_manage.form_data.service.dao.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Update;
import org.nl.wms.pm_manage.form_data.service.dao.PmFormData;
import org.nl.wms.pm_manage.form_data.service.dao.dao.PmFormData;
import org.nl.wms.pm_manage.form_data.service.dto.FormDataQuery;
import org.nl.wms.pm_manage.form_data.service.dto.PmFormDataDto;
import java.math.BigDecimal;
import java.util.List;
import java.util.Set;
/**
* <p>

70
nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml
View File

@@ -2,26 +2,31 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.nl.wms.pm_manage.form_data.service.dao.mapper.PmFormDataMapper">
<resultMap id="BaseResultMap" type="org.nl.wms.pm_manage.form_data.service.dao.PmFormData">
<result property="id" column="id"/>
<result property="code" column="code"/>
<result property="proc_inst_id" column="proc_inst_id"/>
<result property="source_form_type" column="source_form_type"/>
<result property="source_form_id" column="source_form_id"/>
<result property="source_form_date" column="source_form_date"/>
<result property="form_type" column="form_type"/>
<result property="status" column="status"/>
<result property="create_name" column="create_name"/>
<result property="create_time" column="create_time"/>
<result property="material_id" column="material_id"/>
<result property="qty" column="qty"/>
<result property="pcsn" column="pcsn"/>
<result property="vehicle_code" column="vehicle_code"/>
<result property="parent_id" column="parent_id"/>
<result property="form_data" column="form_data" typeHandler="org.nl.common.domain.handler.FastjsonSortTypeHandler"/>
<result property="unit_id" column="unit_id"/>
<resultMap id="BaseResultMap" type="org.nl.wms.pm_manage.form_data.service.dao.dao.PmFormData">
<result property="id" column="id"/>
<result property="code" column="code"/>
<result property="status" column="status"/>
<result property="form_type" column="form_type"/>
<result property="source_form_date" column="source_form_date"/>
<result property="material_code" column="material_code"/>
<result property="pcsn" column="pcsn"/>
<result property="plan_qty" column="plan_qty"/>
<result property="qty" column="qty"/>
<result property="assign_qty" column="assign_qty"/>
<result property="actual_qty" column="actual_qty"/>
<result property="total_qty" column="total_qty"/>
<result property="unit_id" column="unit_id"/>
<result property="unit_name" column="unit_name"/>
<result property="vehicle_code" column="vehicle_code"/>
<result property="vehicle_id" column="vehicle_id"/>
<result property="form_data" column="form_data"/>
<result property="create_time" column="create_time"/>
<result property="create_name" column="create_name"/>
<result property="update_time" column="update_time"/>
<result property="update_name" column="update_name"/>
<result property="remark" column="remark"/>
<result property="is_finish" column="is_finish"/>
</resultMap>
<resultMap id="dataDetail" type="org.nl.wms.pm_manage.form_data.service.dto.PmFormDataDto" >
<result property="id" column="id"/>
<result property="code" column="code"/>
@@ -79,7 +84,7 @@
md_me_materialbase.net_weight
FROM
pm_form_data
left join md_me_materialbase on pm_form_data.material_id = md_me_materialbase.material_id
left join md_me_materialbase on pm_form_data.remark = md_me_materialbase.material_code
<where>
<if test="query.form_type != null and query.form_type != ''">
and form_type = #{query.form_type}
@@ -90,9 +95,6 @@
#{status}
</foreach>
</if>
<if test="query.parent_id != null and query.parent_id != ''">
and parent_id = #{query.parent_id}
</if>
<if test="query.form_query != null and query.form_query.size() > 0">
<foreach collection="query.form_query" item="value" index="key" >
<if test="value != null and value != ''">
@@ -112,7 +114,7 @@
md_me_materialbase.net_weight
FROM
pm_form_data
left join md_me_materialbase on pm_form_data.material_id = md_me_materialbase.material_id
left join md_me_materialbase on pm_form_data.material_code = md_me_materialbase.material_code
<where>
<if test="query.search != null and query.search != ''">
and form_data LIKE '%${query.search}%'
@@ -144,9 +146,6 @@
#{status}
</foreach>
</if>
<if test="query.parent_id != null and query.parent_id != ''">
and parent_id = #{query.parent_id}
</if>
<if test="query.form_query != null and query.form_query.size() > 0">
<foreach collection="query.form_query" item="value" index="key">
<if test="value != null and value != ''">
@@ -162,7 +161,7 @@
SUM(pm_form_data.qty) as counts
FROM
pm_form_data
left join md_me_materialbase on pm_form_data.material_id = md_me_materialbase.material_id
left join md_me_materialbase on pm_form_data.material_code = md_me_materialbase.material_code
<where>
<if test="query.search != null and query.search != ''">
and form_data LIKE '%${query.search}%'
@@ -194,9 +193,6 @@
#{status}
</foreach>
</if>
<if test="query.parent_id != null and query.parent_id != ''">
and parent_id = #{query.parent_id}
</if>
<if test="query.form_query != null and query.form_query.size() > 0">
<foreach collection="query.form_query" item="value" index="key">
<if test="value != null and value != ''">
@@ -207,16 +203,6 @@
</where>
ORDER BY create_time DESC
</select>
<select id="selectChild" resultMap="dataDetail">
select
pm_form_data.*,
md_me_materialbase.material_code,
md_me_materialbase.material_name,
md_me_materialbase.material_spec,
md_me_materialbase.net_weight
from pm_form_data left join md_me_materialbase on pm_form_data.material_id = md_me_materialbase.material_id
where parent_id = #{id}
</select>
<select id="selectChilds" resultMap="dataDetail">
select
pm_form_data.*,
@@ -225,7 +211,7 @@
md_me_materialbase.material_spec,
md_me_materialbase.net_weight,
md_pb_measureunit.unit_name
from pm_form_data left join md_me_materialbase on pm_form_data.material_id = md_me_materialbase.material_id
from pm_form_data left join md_me_materialbase on pm_form_data.material_code = md_me_materialbase.material_code
left join md_pb_measureunit on pm_form_data.unit_id = md_pb_measureunit.measure_unit_id
where parent_id in
<foreach collection="parents" open="(" close=")" item="parent_id" separator=",">

3
nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/FormDataQuery.java
View File

@@ -4,7 +4,8 @@ import lombok.Data;
import org.nl.common.domain.query.BaseQuery;
import org.nl.common.domain.query.QParam;
import org.nl.common.enums.QueryTEnum;
import org.nl.wms.pm_manage.form_data.service.dao.PmFormData;
import org.nl.wms.pm_manage.form_data.service.dao.dao.PmFormData;
import java.util.Map;
/*

62
nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java
View File

@@ -1,8 +1,7 @@
package org.nl.wms.pm_manage.form_data.service.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.Page;
@@ -10,26 +9,31 @@ import com.github.pagehelper.PageHelper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.nl.common.base.TableDataInfo;
import org.nl.common.domain.constant.DictConstantPool;
import org.nl.common.domain.query.PageQuery;
import org.nl.common.exception.BadRequestException;
import org.nl.common.utils.CopyUtil;
import org.nl.common.utils.IdUtil;
import org.nl.common.utils.SecurityUtils;
import org.nl.wms.basedata_manage.service.IMdMeMaterialbaseService;
import org.nl.wms.basedata_manage.service.IStructattrService;
import org.nl.wms.pm_manage.form_data.service.IPmFormDataService;
import org.nl.wms.pm_manage.form_data.service.dao.PmFormData;
import org.nl.wms.pm_manage.form_data.service.dao.dao.PmFormData;
import org.nl.wms.pm_manage.form_data.service.dao.dto.PmFormDataParam;
import org.nl.wms.pm_manage.form_data.service.dao.mapper.PmFormDataMapper;
import org.nl.wms.pm_manage.form_data.service.dto.FormDataQuery;
import org.nl.wms.pm_manage.form_data.service.dto.PmFormDataDto;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -56,10 +60,8 @@ public class PmFormDataServiceImpl extends ServiceImpl<PmFormDataMapper, PmFormD
@Autowired
private IMdMeMaterialbaseService iMdMeMaterialbaseService;
@Lazy
@Autowired
IPmFormDataService iPmFormDataService;
@Resource
private PmFormDataMapper pmFormDataMapper;
@Autowired
private IStructattrService iStIvtStructattrService;
@@ -73,6 +75,19 @@ public class PmFormDataServiceImpl extends ServiceImpl<PmFormDataMapper, PmFormD
return null;
}
/**
* 创建
*
* @param params 对象实体
*/
@Override
public void create(PmFormDataParam params) {
pmFormDataMapper.insert(getBasicInfo(params, true));
}
@Override
public Object queryAll(FormDataQuery query, PageQuery pageQuery) {
@@ -84,7 +99,7 @@ public class PmFormDataServiceImpl extends ServiceImpl<PmFormDataMapper, PmFormD
Map<String, List<PmFormData>> childMap = new HashMap<>();
if (!CollectionUtils.isEmpty(ids)) {
List<PmFormData> childs = this.list(new QueryWrapper<PmFormData>().in("parent_id", ids));
childMap = childs.stream().collect(Collectors.groupingBy(PmFormData::getParent_id));
childMap = childs.stream().collect(Collectors.groupingBy(PmFormData::getId));
}
List<PmFormDataDto> list = new ArrayList<>();
for (PmFormData record : content) {
@@ -191,5 +206,30 @@ public class PmFormDataServiceImpl extends ServiceImpl<PmFormDataMapper, PmFormD
QueryWrapper<PmFormData> query = new QueryWrapper<PmFormData>().in("parent_id", parent_id);
return this.list(query);
}
@Override
public boolean save(PmFormData entity) {
return super.save(entity);
}
/**
* 获取实体基础信息
*
* @param params 对象实体
* @param isCreate 是否创建
*/
private PmFormData getBasicInfo(PmFormDataParam params, boolean isCreate) {
if (isCreate) {
params.setId(IdUtil.getStringId());
params.setCreate_name(SecurityUtils.getCurrentNickName());
params.setCreate_time(DateUtil.now());
}
params.setUpdate_name(SecurityUtils.getCurrentNickName());
params.setUpdate_time(DateUtil.now());
PmFormData pmFormData = new PmFormData();
BeanUtils.copyProperties(params, pmFormData);
return pmFormData;
}
}

4
nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/GroupPlate.java
View File

@@ -28,9 +28,9 @@ public class GroupPlate implements Serializable {
private String storagevehicle_code;
/**
* 物料标识
* 物料编码
*/
private String material_id;
private String material_code;
/**
* 批次

6
nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/IOStorInvDis.java
View File

@@ -72,6 +72,12 @@ public class IOStorInvDis implements Serializable {
*/
private String material_id;
/**
* 物料标识
*/
private String material_code;
/**
* 批次
*/

4
nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/OutBillServiceImpl.java
View File

@@ -1137,7 +1137,7 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
groupPlateMapper.update(new GroupPlate(),new LambdaUpdateWrapper<>(GroupPlate.class)
.set(GroupPlate::getStatus,IOSEnum.GROUP_PLATE_STATUS.code("出库"))
.eq(GroupPlate::getPcsn,ioStorInvDis.getPcsn())
.eq(GroupPlate::getMaterial_id,ioStorInvDis.getMaterial_id())
.eq(GroupPlate::getMaterial_code,ioStorInvDis.getMaterial_code())
.eq(GroupPlate::getStoragevehicle_code,ioStorInvDis.getStoragevehicle_code())
);
}
@@ -1221,7 +1221,7 @@ public class OutBillServiceImpl extends ServiceImpl<IOStorInvMapper,IOStorInv> i
groupPlateMapper.update(new GroupPlate(),new LambdaUpdateWrapper<>(GroupPlate.class)
.set(GroupPlate::getStatus,IOSEnum.GROUP_PLATE_STATUS.code("出库"))
.eq(GroupPlate::getPcsn,ioStorInvDis.getPcsn())
.eq(GroupPlate::getMaterial_id,ioStorInvDis.getMaterial_id())
.eq(GroupPlate::getMaterial_code,ioStorInvDis.getMaterial_code())
.eq(GroupPlate::getStoragevehicle_code,ioStorInvDis.getStoragevehicle_code())
);

4
nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/RawAssistIStorServiceImpl.java
View File

@@ -604,7 +604,7 @@ public class RawAssistIStorServiceImpl extends ServiceImpl<IOStorInvMapper, IOSt
groupPlateMapper.update(new GroupPlate(),new LambdaUpdateWrapper<>(GroupPlate.class)
.set(GroupPlate::getStatus,IOSEnum.GROUP_PLATE_STATUS.code("入库"))
.eq(GroupPlate::getPcsn,ioStorInvDis.getPcsn())
.eq(GroupPlate::getMaterial_id,ioStorInvDis.getMaterial_id())
.eq(GroupPlate::getMaterial_code,ioStorInvDis.getMaterial_code())
.eq(GroupPlate::getStoragevehicle_code,ioStorInvDis.getStoragevehicle_code())
);
}
@@ -668,7 +668,7 @@ public class RawAssistIStorServiceImpl extends ServiceImpl<IOStorInvMapper, IOSt
groupPlateMapper.update(new GroupPlate(),new LambdaUpdateWrapper<>(GroupPlate.class)
.set(GroupPlate::getStatus,IOSEnum.GROUP_PLATE_STATUS.code("入库"))
.eq(GroupPlate::getPcsn,ioStorInvDis.getPcsn())
.eq(GroupPlate::getMaterial_id,ioStorInvDis.getMaterial_id())
.eq(GroupPlate::getMaterial_code,ioStorInvDis.getMaterial_code())
.eq(GroupPlate::getStoragevehicle_code,ioStorInvDis.getStoragevehicle_code())
);