diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IStructattrService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IStructattrService.java index 16f8f8f..7ce29c0 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IStructattrService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/IStructattrService.java @@ -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 { List collectVechicle(Map query); + /** + * 出库规则 + */ List outBoundSectDiv(StrategyStructParam param); + /** + * 入库规则 + */ List inBoundSectDiv(StrategyStructParam param); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/dao/StSectStrategy.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/dao/StSectStrategy.java index 2026066..fe800dc 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/dao/StSectStrategy.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/sectStrategy/dao/StSectStrategy.java @@ -47,6 +47,7 @@ public class StSectStrategy implements Serializable { /** * 策略类型 */ + @TableField(typeHandler = ListStrTypeHandler.class) private List strategy_type; /** diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/dao/mapper/xml/StStrategyConfigMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/dao/mapper/xml/StStrategyConfigMapper.xml index 501c54e..4836953 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/dao/mapper/xml/StStrategyConfigMapper.xml +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/dao/mapper/xml/StStrategyConfigMapper.xml @@ -8,12 +8,10 @@ st_strategy_config is_delete = "0" - and (strategy_name LIKE '%${query.strategy_name}%' or strategy_code LIKE '%${query.strategy_name}%') - diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaIosInServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaIosInServiceImpl.java index 78d2637..179de43 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaIosInServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaIosInServiceImpl.java @@ -116,7 +116,7 @@ public class PdaIosInServiceImpl implements PdaIosInService { MdPbMeasureunit unitDao = iMdPbMeasureunitService.getByCode(unit_code); GroupPlate groupDao = iMdPbGroupplateService.getOne( new QueryWrapper().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 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)); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java index 19c4a17..41ec608 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java @@ -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; /** *

* 表单信息表 前端控制器 @@ -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 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 delete(@RequestBody String[] ids) { if (ids.length > 0) { pFormDataMapper.delete(new LambdaUpdateWrapper().in(PmFormData::getId, ids)); - pFormDataMapper.delete(new LambdaUpdateWrapper().in(PmFormData::getParent_id, ids)); } return new ResponseEntity<>(HttpStatus.OK); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/IPmFormDataService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/IPmFormDataService.java index 71fa9e6..6f62c21 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/IPmFormDataService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/IPmFormDataService.java @@ -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 { Integer syncFormData(String type,String dataString); + /** + * 创建 + * @param params 对象实体 + */ + void create(PmFormDataParam params); List getByType(String from_type); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/FormDataIdCode.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/FormDataIdCode.java deleted file mode 100644 index 022b14e..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/FormDataIdCode.java +++ /dev/null @@ -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; -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/PmFormData.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/PmFormData.java deleted file mode 100644 index 6ca279f..0000000 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/PmFormData.java +++ /dev/null @@ -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; - -/** - *

- * 表单信息表 - *

- * - * @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(); - - -} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/dao/PmFormData.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/dao/PmFormData.java new file mode 100644 index 0000000..cd4e92d --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/dao/PmFormData.java @@ -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 { + + 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; + } + +} + + + diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/dto/PmFormDataDto.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/dto/PmFormDataDto.java new file mode 100644 index 0000000..0b2a5f5 --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/dto/PmFormDataDto.java @@ -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; + +} + + + diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/dto/PmFormDataParam.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/dto/PmFormDataParam.java new file mode 100644 index 0000000..4aadf1e --- /dev/null +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/dto/PmFormDataParam.java @@ -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 { + /** + * 主键 + */ + 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; +} diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/PmFormDataMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/PmFormDataMapper.java index f9d0414..051241f 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/PmFormDataMapper.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/PmFormDataMapper.java @@ -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; /** *

diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml index fa678e5..5a9a1d3 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml @@ -2,26 +2,31 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - @@ -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 and form_type = #{query.form_type} @@ -90,9 +95,6 @@ #{status} - - and parent_id = #{query.parent_id} - @@ -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 and form_data LIKE '%${query.search}%' @@ -144,9 +146,6 @@ #{status} - - and parent_id = #{query.parent_id} - @@ -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 and form_data LIKE '%${query.search}%' @@ -194,9 +193,6 @@ #{status} - - and parent_id = #{query.parent_id} - @@ -207,16 +203,6 @@ ORDER BY create_time DESC -