From c00e04661224db3ce75bc4c46408299c8d65e212 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Wed, 15 May 2024 16:10:57 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E7=BB=84=E7=9B=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/IMdPbVehicleattrService.java | 17 -- .../service/IMdPbVehicleivtService.java | 16 -- .../vehicle/service/dao/MdPbVehicleattr.java | 116 --------- .../vehicle/service/dao/MdPbVehicleivt.java | 88 ------- .../dao/mapper/MdPbVehicleattrMapper.java | 16 -- .../dao/mapper/MdPbVehicleivtMapper.java | 16 -- .../impl/MdPbVehicleattrServiceImpl.java | 21 -- .../impl/MdPbVehicleivtServiceImpl.java | 21 -- .../controller/BmVehicleInfoController.java | 6 +- .../service/IBmVehicleInfoService.java | 6 +- .../service/dao/BmVehicleInfo.java | 3 +- .../dao/mapper/BmVehicleInfoMapper.java | 6 +- .../dao/mapper/xml/BmVehicleInfoMapper.xml | 4 +- .../service/dto/VehicleQuery.java | 4 +- .../impl/BmVehicleInfoServiceImpl.java | 13 +- .../MdPbStoragevehicleextController.java | 21 -- .../IMdPbStoragevehicleextService.java | 16 -- .../service/dao/MdPbStoragevehicleext.java | 70 ------ .../mapper/MdPbStoragevehicleextMapper.java | 16 -- .../xml/MdPbStoragevehicleextMapper.xml | 5 - .../MdPbStoragevehicleextServiceImpl.java | 20 -- .../controller/BmFormStrucController.java | 31 +-- .../service/IBmFormStrucService.java | 2 +- .../form_struc/service/dao/BmFormStruc.java | 5 - .../service/dto/FormStrucQuery.java | 3 +- .../service/impl/BmFormStrucServiceImpl.java | 49 ++-- .../impl/base/AlleyAveRuleHandler.java | 136 +++++------ .../handler/impl/base/ClusterRuleHandler.java | 120 +++++----- .../handler/impl/base/FIFORuleHandler.java | 120 +++++----- .../impl/base/LimitStorageRuleHandler.java | 16 +- .../handler/impl/base/NearbyRuleHandler.java | 119 +++++----- .../handler/impl/base/WeightRuleHandler.java | 126 +++++----- .../group_dick/service/dao/MdGruopDick.java | 68 ++---- .../service/dao/mapper/MdGroupMstMapper.java | 16 -- .../dao/mapper/xml/MdGruopDickMapper.xml | 7 +- .../service/impl/MdGruopDickServiceImpl.java | 9 +- .../wms/config_manage/formStruc/formstruc.js | 4 +- .../wms/config_manage/formStruc/index.vue | 9 +- .../act/execution/ViewCurrentFlowDesigner.vue | 1 + .../group_dick/group_config/index.vue | 41 ++-- .../views/wms/md_manage/group_dick/index.vue | 34 ++- .../group_dick/vechileViewDialog.vue | 79 ------ .../wms/md_manage/group_dick/viewDialog.vue | 224 ++++++++++++++++++ .../sync_manage/form_mapping/EditDialog.vue | 11 +- 44 files changed, 666 insertions(+), 1065 deletions(-) delete mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/IMdPbVehicleattrService.java delete mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/IMdPbVehicleivtService.java delete mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dao/MdPbVehicleattr.java delete mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dao/MdPbVehicleivt.java delete mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dao/mapper/MdPbVehicleattrMapper.java delete mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dao/mapper/MdPbVehicleivtMapper.java delete mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/impl/MdPbVehicleattrServiceImpl.java delete mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/impl/MdPbVehicleivtServiceImpl.java rename wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/{ => vehicleInfo}/controller/BmVehicleInfoController.java (92%) rename wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/{ => vehicleInfo}/service/IBmVehicleInfoService.java (89%) rename wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/{ => vehicleInfo}/service/dao/BmVehicleInfo.java (95%) rename wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/{ => vehicleInfo}/service/dao/mapper/BmVehicleInfoMapper.java (65%) rename wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/{ => vehicleInfo}/service/dao/mapper/xml/BmVehicleInfoMapper.xml (73%) rename wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/{ => vehicleInfo}/service/dto/VehicleQuery.java (82%) rename wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/{ => vehicleInfo}/service/impl/BmVehicleInfoServiceImpl.java (93%) delete mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicleext/controller/MdPbStoragevehicleextController.java delete mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicleext/service/IMdPbStoragevehicleextService.java delete mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicleext/service/dao/MdPbStoragevehicleext.java delete mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicleext/service/dao/mapper/MdPbStoragevehicleextMapper.java delete mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicleext/service/dao/mapper/xml/MdPbStoragevehicleextMapper.xml delete mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicleext/service/impl/MdPbStoragevehicleextServiceImpl.java delete mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/MdGroupMstMapper.java delete mode 100644 wms_pro/qd/src/views/wms/md_manage/group_dick/vechileViewDialog.vue create mode 100644 wms_pro/qd/src/views/wms/md_manage/group_dick/viewDialog.vue diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/IMdPbVehicleattrService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/IMdPbVehicleattrService.java deleted file mode 100644 index 7a67a242..00000000 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/IMdPbVehicleattrService.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.nl.wms.base_manage.vehicle.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import org.nl.wms.base_manage.vehicle.service.dao.MdPbVehicleattr; - - -/** - *

- * 载具信息表 服务类 - *

- * - * @author generator - * @since 2024-04-08 - */ -public interface IMdPbVehicleattrService extends IService { - -} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/IMdPbVehicleivtService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/IMdPbVehicleivtService.java deleted file mode 100644 index 9da2c130..00000000 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/IMdPbVehicleivtService.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.nl.wms.base_manage.vehicle.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import org.nl.wms.base_manage.vehicle.service.dao.MdPbVehicleivt; - -/** - *

- * 载具物料信息表 服务类 - *

- * - * @author generator - * @since 2024-04-08 - */ -public interface IMdPbVehicleivtService extends IService { - -} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dao/MdPbVehicleattr.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dao/MdPbVehicleattr.java deleted file mode 100644 index 2e72c8eb..00000000 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dao/MdPbVehicleattr.java +++ /dev/null @@ -1,116 +0,0 @@ -package org.nl.wms.base_manage.vehicle.service.dao; - -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.util.Date; - -/** - *

- * 载具信息表 - *

- * - * @author generator - * @since 2024-04-08 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@TableName("md_pb_vehicleattr") -public class MdPbVehicleattr implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 载具编码 - */ - private String vehicle_code; - - /** - * 载具名称 - */ - private String vehicle_name; - - /** - * 载具类型 - */ - private String vehicle_type; - - /** - * 一维码 - */ - private String one_code; - - /** - * 二维码 - */ - private String two_code; - - /** - * RFID编码 - */ - private String rfid_code; - - /** - * 修改人 - */ - private String update_id; - - /** - * 修改人姓名 - */ - private String update_name; - - /** - * 修改时间 - */ - private Date update_time; - - /** - * 是否启用 - */ - private Boolean is_used; - - /** - * 载具宽度 - */ - private Integer w; - - /** - * 载具长度 - */ - private Integer l; - - /** - * 载具高度 - */ - private Integer h; - - /** - * 载具重量 - */ - private Integer weight; - - /** - * 载具超限情况：0无1超w2h3l4W - */ - private String overstruct_type; - - /** - * 超限参数 - */ - private Integer occupystruct_qty; - - /** - * 扩展信息 - */ - private String ext_json; - - /** - * 备注 - */ - private String remark; - - -} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dao/MdPbVehicleivt.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dao/MdPbVehicleivt.java deleted file mode 100644 index e6f99bcb..00000000 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dao/MdPbVehicleivt.java +++ /dev/null @@ -1,88 +0,0 @@ -package org.nl.wms.base_manage.vehicle.service.dao; - -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; -import java.math.BigDecimal; - -/** - *

- * 载具物料信息表 - *

- * - * @author generator - * @since 2024-04-08 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@TableName("md_pb_vehicleivt") -public class MdPbVehicleivt implements Serializable { - - private static final long serialVersionUID = 1L; - - private String id; - - /** - * 载具编码 - */ - private String vehicle_code; - - /** - * 物料标识 - */ - private String material_id; - - /** - * 工序id - */ - private String workprocedure_id; - - /** - * 批次 - */ - private String pcsn; - - /** - * 数量 - */ - private BigDecimal qty; - - /** - * 数量计量单位标识 - */ - private String qty_unit_id; - - /** - * 备注 - */ - private String remark; - - /** - * 父容器 - */ - private String parent_id; - - /** - * 是否含子容器 - */ - private Boolean has_child; - - /** - * 扩展信息 - */ - private String ext_json; - - /** - * 物料关联单据 - */ - private String correlate_order; - - /** - * 修改时间 - */ - private String update_time; - - -} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dao/mapper/MdPbVehicleattrMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dao/mapper/MdPbVehicleattrMapper.java deleted file mode 100644 index b3d3084c..00000000 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dao/mapper/MdPbVehicleattrMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.nl.wms.base_manage.vehicle.service.dao.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.nl.wms.base_manage.vehicle.service.dao.MdPbVehicleattr; - -/** - *

- * 载具信息表 Mapper 接口 - *

- * - * @author generator - * @since 2024-04-08 - */ -public interface MdPbVehicleattrMapper extends BaseMapper { - -} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dao/mapper/MdPbVehicleivtMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dao/mapper/MdPbVehicleivtMapper.java deleted file mode 100644 index 32bdea6f..00000000 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dao/mapper/MdPbVehicleivtMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.nl.wms.base_manage.vehicle.service.dao.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.nl.wms.base_manage.vehicle.service.dao.MdPbVehicleivt; - -/** - *

- * 载具物料信息表 Mapper 接口 - *

- * - * @author generator - * @since 2024-04-08 - */ -public interface MdPbVehicleivtMapper extends BaseMapper { - -} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/impl/MdPbVehicleattrServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/impl/MdPbVehicleattrServiceImpl.java deleted file mode 100644 index c124a1a4..00000000 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/impl/MdPbVehicleattrServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.nl.wms.base_manage.vehicle.service.impl; - - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.nl.wms.base_manage.vehicle.service.IMdPbVehicleattrService; -import org.nl.wms.base_manage.vehicle.service.dao.MdPbVehicleattr; -import org.nl.wms.base_manage.vehicle.service.dao.mapper.MdPbVehicleattrMapper; -import org.springframework.stereotype.Service; - -/** - *

- * 载具信息表 服务实现类 - *

- * - * @author generator - * @since 2024-04-08 - */ -@Service -public class MdPbVehicleattrServiceImpl extends ServiceImpl implements IMdPbVehicleattrService { - -} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/impl/MdPbVehicleivtServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/impl/MdPbVehicleivtServiceImpl.java deleted file mode 100644 index 152edc18..00000000 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/impl/MdPbVehicleivtServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.nl.wms.base_manage.vehicle.service.impl; - - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.nl.wms.base_manage.vehicle.service.IMdPbVehicleivtService; -import org.nl.wms.base_manage.vehicle.service.dao.MdPbVehicleivt; -import org.nl.wms.base_manage.vehicle.service.dao.mapper.MdPbVehicleivtMapper; -import org.springframework.stereotype.Service; - -/** - *

- * 载具物料信息表 服务实现类 - *

- * - * @author generator - * @since 2024-04-08 - */ -@Service -public class MdPbVehicleivtServiceImpl extends ServiceImpl implements IMdPbVehicleivtService { - -} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/controller/BmVehicleInfoController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/controller/BmVehicleInfoController.java similarity index 92% rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/controller/BmVehicleInfoController.java rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/controller/BmVehicleInfoController.java index db7b7e7e..b40eb166 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/controller/BmVehicleInfoController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/controller/BmVehicleInfoController.java @@ -1,12 +1,12 @@ -package org.nl.wms.base_manage.vehicle.controller; +package org.nl.wms.base_manage.vehicle.vehicleInfo.controller; import com.alibaba.fastjson.JSONObject; import org.nl.common.TableDataInfo; import org.nl.common.anno.Log; import org.nl.common.domain.entity.PageQuery; -import org.nl.wms.base_manage.vehicle.service.IBmVehicleInfoService; -import org.nl.wms.base_manage.vehicle.service.dto.VehicleQuery; +import org.nl.wms.base_manage.vehicle.vehicleInfo.service.IBmVehicleInfoService; +import org.nl.wms.base_manage.vehicle.vehicleInfo.service.dto.VehicleQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/IBmVehicleInfoService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/service/IBmVehicleInfoService.java similarity index 89% rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/IBmVehicleInfoService.java rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/service/IBmVehicleInfoService.java index 19235292..f1c7a6f9 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/IBmVehicleInfoService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/service/IBmVehicleInfoService.java @@ -1,12 +1,12 @@ -package org.nl.wms.base_manage.vehicle.service; +package org.nl.wms.base_manage.vehicle.vehicleInfo.service; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.nl.common.domain.entity.PageQuery; -import org.nl.wms.base_manage.vehicle.service.dao.BmVehicleInfo; -import org.nl.wms.base_manage.vehicle.service.dto.VehicleQuery; +import org.nl.wms.base_manage.vehicle.vehicleInfo.service.dao.BmVehicleInfo; +import org.nl.wms.base_manage.vehicle.vehicleInfo.service.dto.VehicleQuery; import java.util.List; import java.util.Map; diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dao/BmVehicleInfo.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/service/dao/BmVehicleInfo.java similarity index 95% rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dao/BmVehicleInfo.java rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/service/dao/BmVehicleInfo.java index e85a5576..16d42cdd 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dao/BmVehicleInfo.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/service/dao/BmVehicleInfo.java @@ -1,4 +1,4 @@ -package org.nl.wms.base_manage.vehicle.service.dao; +package org.nl.wms.base_manage.vehicle.vehicleInfo.service.dao; import java.math.BigDecimal; @@ -6,7 +6,6 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.util.Date; import java.io.Serializable; import lombok.Data; diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dao/mapper/BmVehicleInfoMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/service/dao/mapper/BmVehicleInfoMapper.java similarity index 65% rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dao/mapper/BmVehicleInfoMapper.java rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/service/dao/mapper/BmVehicleInfoMapper.java index 2f94a75b..46f3c013 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dao/mapper/BmVehicleInfoMapper.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/service/dao/mapper/BmVehicleInfoMapper.java @@ -1,10 +1,8 @@ -package org.nl.wms.base_manage.vehicle.service.dao.mapper; +package org.nl.wms.base_manage.vehicle.vehicleInfo.service.dao.mapper; -import org.nl.wms.base_manage.vehicle.service.dao.BmVehicleInfo; +import org.nl.wms.base_manage.vehicle.vehicleInfo.service.dao.BmVehicleInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import java.util.Map; - /** *

* 载具信息表 Mapper 接口 diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dao/mapper/xml/BmVehicleInfoMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/service/dao/mapper/xml/BmVehicleInfoMapper.xml similarity index 73% rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dao/mapper/xml/BmVehicleInfoMapper.xml rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/service/dao/mapper/xml/BmVehicleInfoMapper.xml index 140186e0..7822961c 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dao/mapper/xml/BmVehicleInfoMapper.xml +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/service/dao/mapper/xml/BmVehicleInfoMapper.xml @@ -1,8 +1,8 @@ - + - select * from md_pb_storagevehicleinfo where md_pb_storagevehicleinfo.storagevehicle_code = #{vehicle_code} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dto/VehicleQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/service/dto/VehicleQuery.java similarity index 82% rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dto/VehicleQuery.java rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/service/dto/VehicleQuery.java index 6ca8f797..6678a393 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/dto/VehicleQuery.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/service/dto/VehicleQuery.java @@ -1,10 +1,10 @@ -package org.nl.wms.base_manage.vehicle.service.dto; +package org.nl.wms.base_manage.vehicle.vehicleInfo.service.dto; import lombok.Data; import org.nl.common.domain.entity.BaseQuery; import org.nl.common.domain.entity.QParam; import org.nl.common.enums.QueryTEnum; -import org.nl.wms.base_manage.vehicle.service.dao.BmVehicleInfo; +import org.nl.wms.base_manage.vehicle.vehicleInfo.service.dao.BmVehicleInfo; /* * @author ZZQ diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/impl/BmVehicleInfoServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/service/impl/BmVehicleInfoServiceImpl.java similarity index 93% rename from wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/impl/BmVehicleInfoServiceImpl.java rename to wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/service/impl/BmVehicleInfoServiceImpl.java index 54301e53..55b76f8f 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/service/impl/BmVehicleInfoServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleInfo/service/impl/BmVehicleInfoServiceImpl.java @@ -1,4 +1,4 @@ -package org.nl.wms.base_manage.vehicle.service.impl; +package org.nl.wms.base_manage.vehicle.vehicleInfo.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.map.MapUtil; @@ -8,16 +8,14 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.apache.commons.lang3.StringUtils; import org.nl.common.domain.entity.PageQuery; import org.nl.common.domain.exception.BadRequestException; import org.nl.common.utils.CodeUtil; -import org.nl.common.utils.IdUtil; import org.nl.common.utils.SecurityUtils; -import org.nl.wms.base_manage.vehicle.service.IBmVehicleInfoService; -import org.nl.wms.base_manage.vehicle.service.dao.BmVehicleInfo; -import org.nl.wms.base_manage.vehicle.service.dao.mapper.BmVehicleInfoMapper; -import org.nl.wms.base_manage.vehicle.service.dto.VehicleQuery; +import org.nl.wms.base_manage.vehicle.vehicleInfo.service.IBmVehicleInfoService; +import org.nl.wms.base_manage.vehicle.vehicleInfo.service.dao.BmVehicleInfo; +import org.nl.wms.base_manage.vehicle.vehicleInfo.service.dao.mapper.BmVehicleInfoMapper; +import org.nl.wms.base_manage.vehicle.vehicleInfo.service.dto.VehicleQuery; import org.nl.wms.system_manage.service.dict.ISysDictService; import org.nl.wms.system_manage.service.dict.dao.Dict; import org.springframework.beans.factory.annotation.Autowired; @@ -25,7 +23,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Arrays; -import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicleext/controller/MdPbStoragevehicleextController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicleext/controller/MdPbStoragevehicleextController.java deleted file mode 100644 index 03fd6647..00000000 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicleext/controller/MdPbStoragevehicleextController.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.nl.wms.base_manage.vehicleext.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - *

- * 载具扩展属性信息表 前端控制器 - *

- * - * @author generator - * @since 2024-04-09 - */ -@RestController -@RequestMapping("/mdPbStoragevehicleext") -public class MdPbStoragevehicleextController { - -} - diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicleext/service/IMdPbStoragevehicleextService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicleext/service/IMdPbStoragevehicleextService.java deleted file mode 100644 index 5ae051f2..00000000 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicleext/service/IMdPbStoragevehicleextService.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.nl.wms.base_manage.vehicleext.service; - -import org.nl.wms.base_manage.vehicleext.service.dao.MdPbStoragevehicleext; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - *

- * 载具扩展属性信息表 服务类 - *

- * - * @author generator - * @since 2024-04-09 - */ -public interface IMdPbStoragevehicleextService extends IService { - -} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicleext/service/dao/MdPbStoragevehicleext.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicleext/service/dao/MdPbStoragevehicleext.java deleted file mode 100644 index 2e405763..00000000 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicleext/service/dao/MdPbStoragevehicleext.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.nl.wms.base_manage.vehicleext.service.dao; - -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - *

- * 载具扩展属性信息表 - *

- * - * @author generator - * @since 2024-04-09 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@TableName("md_pb_storagevehicleext") -public class MdPbStoragevehicleext implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 载具编码 - */ - private String storagevehicle_code; - - /** - * 物料标识 - */ - private String material_id; - - /** - * 批次 - */ - private String pcsn; - - /** - * 数量 - */ - private BigDecimal qty; - - /** - * 重量 - */ - private BigDecimal weight; - - /** - * 修改时间 - */ - private String update_time; - - /** - * 数量计量单位标识 - */ - private String qty_unit_id; - - /** - * 备注 - */ - private String remark; - - /** - * 入库时间 - */ - private String insert_time; - - -} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicleext/service/dao/mapper/MdPbStoragevehicleextMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicleext/service/dao/mapper/MdPbStoragevehicleextMapper.java deleted file mode 100644 index 12653619..00000000 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicleext/service/dao/mapper/MdPbStoragevehicleextMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.nl.wms.base_manage.vehicleext.service.dao.mapper; - -import org.nl.wms.base_manage.vehicleext.service.dao.MdPbStoragevehicleext; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 载具扩展属性信息表 Mapper 接口 - *

- * - * @author generator - * @since 2024-04-09 - */ -public interface MdPbStoragevehicleextMapper extends BaseMapper { - -} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicleext/service/dao/mapper/xml/MdPbStoragevehicleextMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicleext/service/dao/mapper/xml/MdPbStoragevehicleextMapper.xml deleted file mode 100644 index 0dbedb9b..00000000 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicleext/service/dao/mapper/xml/MdPbStoragevehicleextMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicleext/service/impl/MdPbStoragevehicleextServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicleext/service/impl/MdPbStoragevehicleextServiceImpl.java deleted file mode 100644 index 00317609..00000000 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/base_manage/vehicleext/service/impl/MdPbStoragevehicleextServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.nl.wms.base_manage.vehicleext.service.impl; - -import org.nl.wms.base_manage.vehicleext.service.dao.MdPbStoragevehicleext; -import org.nl.wms.base_manage.vehicleext.service.dao.mapper.MdPbStoragevehicleextMapper; -import org.nl.wms.base_manage.vehicleext.service.IMdPbStoragevehicleextService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - *

- * 载具扩展属性信息表 服务实现类 - *

- * - * @author generator - * @since 2024-04-09 - */ -@Service -public class MdPbStoragevehicleextServiceImpl extends ServiceImpl implements IMdPbStoragevehicleextService { - -} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/controller/BmFormStrucController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/controller/BmFormStrucController.java index 214826e0..d6f8bdf5 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/controller/BmFormStrucController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/controller/BmFormStrucController.java @@ -5,7 +5,6 @@ import cn.dev33.satoken.annotation.SaIgnore; import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.nl.common.TableDataInfo; import org.nl.common.domain.entity.PageQuery; import org.nl.common.domain.exception.BadRequestException; @@ -22,11 +21,8 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; +import java.util.stream.Collectors; /** *

@@ -60,7 +56,7 @@ public class BmFormStrucController { public ResponseEntity queryAll(FormStrucQuery query, PageQuery pageQuery){ //参数判读，参数解析，调用参数入库 //Page page = iBmFormStrucService.page(pageQuery.build(), query.build()); - return new ResponseEntity<>(iBmFormStrucService.queryAll(query,pageQuery),HttpStatus.OK); + return new ResponseEntity<>(iBmFormStrucService.queryTree(query,pageQuery),HttpStatus.OK); } @PostMapping @@ -73,23 +69,28 @@ public class BmFormStrucController { iBmFormStrucService.save(formStruc); return new ResponseEntity<>(HttpStatus.OK); } - @GetMapping("/delete") - public ResponseEntity delete(List types){ + @DeleteMapping + public ResponseEntity delete(@RequestBody Long[] ids){ //参数判读，参数解析，调用参数入库 - int dataCount = iPmFormDataService.count(new QueryWrapper().in("form_type", types)); - if (dataCount>0){ - throw new BadRequestException("当前表单存在业务数据,不允许删除"); + if (ids.length>0){ + List pmFormData = iPmFormDataService.listByIds(Arrays.asList(ids)); + Set collect = pmFormData.stream().map(PmFormData::getForm_type).collect(Collectors.toSet()); + int dataCount = iPmFormDataService.count(new QueryWrapper().in("form_type", collect)); + if (dataCount>0){ + throw new BadRequestException("当前表单存在业务数据,不允许删除"); + } + iBmFormStrucService.removeByIds(Arrays.asList(ids)); } - iBmFormStrucService.remove(new QueryWrapper().in("form_type", types)); return new ResponseEntity<>(HttpStatus.OK); } @GetMapping("/getTypes") public ResponseEntity getTypes(){ //参数判读，参数解析，调用参数入库 - List> select = iBmFormStrucService.listMaps(new QueryWrapper().select("form_type", "form_name").groupBy("form_type")); + List> select = iBmFormStrucService.listMaps(new QueryWrapper() + .select("form_type", "form_name","id")); List list = new ArrayList<>(); for (Map map : select) { - list.add(MapOf.of("lable",map.get("form_name"),"value",map.get("form_type"))); + list.add(MapOf.of("lable",map.get("form_name"),"value",map.get("form_type"),"id",map.get("id"))); } return new ResponseEntity<>(list,HttpStatus.OK); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/IBmFormStrucService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/IBmFormStrucService.java index 7248e384..19ba7fea 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/IBmFormStrucService.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/IBmFormStrucService.java @@ -17,6 +17,6 @@ public interface IBmFormStrucService extends IService { BmFormStruc getFormType(String form_type); - Object queryAll(FormStrucQuery query, PageQuery pageQuery); + Object queryTree(FormStrucQuery query, PageQuery pageQuery); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dao/BmFormStruc.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dao/BmFormStruc.java index c0ec2046..0b914f51 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dao/BmFormStruc.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dao/BmFormStruc.java @@ -123,10 +123,5 @@ public class BmFormStruc implements Serializable { */ private String parent_id; - @TableField(exist = false) - private List children = new ArrayList<>(); - - @TableField(exist = false) - private Boolean hasChildren = false; } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dto/FormStrucQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dto/FormStrucQuery.java index dbbab3f6..ec5a1e3b 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dto/FormStrucQuery.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dto/FormStrucQuery.java @@ -31,8 +31,7 @@ public class FormStrucQuery extends BaseQuery { @Override public void paramMapping() { - // this.doP.put("parent_id", QParam.builder().k(new String[]{"parent_id"}).type(QueryTEnum.NULL_OR_EMPTY).build()); - this.doP.put("form_type", QParam.builder().k(new String[]{"form_type"}).type(QueryTEnum.LK).build()); + this.doP.put("search", QParam.builder().k(new String[]{"form_name"}).type(QueryTEnum.LK).build()); } } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/impl/BmFormStrucServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/impl/BmFormStrucServiceImpl.java index fd7a1cbf..7752aaed 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/impl/BmFormStrucServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/impl/BmFormStrucServiceImpl.java @@ -1,8 +1,6 @@ package org.nl.wms.config_manage.form_struc.service.impl; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -10,15 +8,20 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang3.StringUtils; import org.nl.common.TableDataInfo; import org.nl.common.domain.entity.PageQuery; +import org.nl.common.utils.CopyUtil; import org.nl.wms.config_manage.form_struc.service.dao.BmFormStruc; import org.nl.wms.config_manage.form_struc.service.dao.mapper.BmFormStrucMapper; import org.nl.wms.config_manage.form_struc.service.IBmFormStrucService; +import org.nl.wms.config_manage.form_struc.service.dto.BmFormStrucDto; import org.nl.wms.config_manage.form_struc.service.dto.FormStrucQuery; -import org.nl.wms.flow_manage.flow.service.deployment.dao.ActReProcdef; -import org.nl.wms.flow_manage.flow.service.execution.dao.ActRuExecution; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; +import java.util.ArrayList; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -40,25 +43,33 @@ public class BmFormStrucServiceImpl extends ServiceImpl lqw = new LambdaQueryWrapper<>(); - lqw.isNull(BmFormStruc::getParent_id); - Page executionPage = this.page(page.build(), lqw); - List records = executionPage.getRecords(); - this.findChildren(records); + public Object queryTree(FormStrucQuery query, PageQuery page) { + QueryWrapper build = (QueryWrapper)query.build(); + build.isNull("parent_id"); + Page executionPage = this.page(page.build(), build); + executionPage.setRecords(this.findChildren(executionPage.getRecords())); return TableDataInfo.build(executionPage); } - private void findChildren(List records) { - for (BmFormStruc record : records) { - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(BmFormStruc::getParent_id, record.getId()); - List list = this.list(lambdaQueryWrapper); - if (CollectionUtil.isNotEmpty(list)) { - record.setHasChildren(true); - record.setChildren(list); - this.findChildren(list); + private List findChildren(List records) { + List list = new ArrayList<>(); + if (!CollectionUtils.isEmpty(records)){ + List ids = records.stream().filter(BmFormStruc::getHas_child).map(BmFormStruc::getId).collect(Collectors.toList()); + List childs = this.list(new QueryWrapper().in("parent_id", ids)); + Map> childMap = childs.stream().collect(Collectors.groupingBy(BmFormStruc::getParent_id)); + for (BmFormStruc record : records) { + BmFormStrucDto strucDto = new BmFormStrucDto(); + BeanUtils.copyProperties(record, strucDto); + list.add(strucDto); + if (record.getHas_child()){ + List childList = childMap.get(strucDto.getId()); + if (CollectionUtil.isNotEmpty(childList)) { + strucDto.setHasChildren(true); + strucDto.setChildren(CopyUtil.copyList(childList,BmFormStrucDto.class)); + } + } } } + return list; } } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/impl/base/AlleyAveRuleHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/impl/base/AlleyAveRuleHandler.java index 2fa41ca2..e51412e4 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/impl/base/AlleyAveRuleHandler.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/impl/base/AlleyAveRuleHandler.java @@ -8,8 +8,6 @@ import org.nl.common.domain.exception.BadRequestException; import org.nl.wms.base_manage.struct.service.IStIvtStructattrService; import org.nl.wms.base_manage.struct.service.dao.StIvtStructattr; import org.nl.wms.base_manage.struct.service.dto.StructattrQuery; -import org.nl.wms.base_manage.vehicleext.service.IMdPbStoragevehicleextService; -import org.nl.wms.base_manage.vehicleext.service.dao.MdPbStoragevehicleext; import org.nl.wms.decision_manage.handler.Decisioner; import org.nl.wms.pm_manage.form_data.service.dao.PmFormData; import org.nl.wms.stor_manage.service.in.iostor_dtl.IStIvtIostorinvdtlInService; @@ -41,12 +39,6 @@ public class AlleyAveRuleHandler extends Decisioner private IStIvtStructattrService iStIvtStructattrService; - /** - * 载具扩展属性服务服务 - */ - @Autowired - private IMdPbStoragevehicleextService iMdPbStoragevehicleextService; - /** * 巷道均衡策略 * @param list ：仓位集合 @@ -139,70 +131,70 @@ public class AlleyAveRuleHandler extends Decisioner * @param jsonParam：iostorinvdtlId ： 出入库明细标识（此方法只根据明细物料匹配） * @return List ：需出库仓位集合 */ - private List outHandler(List attrList, JSONObject jsonParam) { - - // 查询对应的出入库明细 - StIvtIostorinvdtlIn dtlDao = iStIvtIostorinvdtlService.getById(jsonParam.getString("iostorinvdtlId")); - - // 查询传入仓位物料中的数量是否满足明细中的数量 - List vehicleCodeIn = attrList.stream() - .map(StIvtStructattr::getVehicle_code) - .distinct() - .collect(Collectors.toList()); - - List extList = iMdPbStoragevehicleextService.list( - new QueryWrapper().lambda() - .in(MdPbStoragevehicleext::getStoragevehicle_code, vehicleCodeIn) - ); - - double attrQty = extList.stream() - .map(MdPbStoragevehicleext::getQty) - .reduce(BigDecimal.ZERO, BigDecimal::add) - .doubleValue(); - - if (dtlDao.getUnassign_qty().doubleValue() > attrQty) { - // 说明不满足所需重量则全部返回 - return attrList; - } - - // 需返回仓位物料集合 - List resultList = new ArrayList<>(); - // 满足所需数量: 根据巷道进行平均分配 - double unAssingQty = dtlDao.getUnassign_qty().doubleValue(); - - while (unAssingQty > 0) { - // 找出物料最多的巷道 - int blockNum = getMaxMaterial(attrList); - - // 匹配此巷道对应的仓位物料 - StIvtStructattr attrDao = attrList.stream() - .filter(row -> row.getBlock_num().intValue() == blockNum) - .findFirst().orElse(null); - - if (ObjectUtil.isEmpty(attrDao)) { - continue; - } - - // 添加需返回的仓位物料 - resultList.add(attrDao); - - // 减去未分配重量 - MdPbStoragevehicleext extDao = extList.stream() - .filter(row -> row.getStoragevehicle_code().equals(attrDao.getVehicle_code())) - .findFirst().orElse(null); - - if (ObjectUtil.isEmpty(extDao)) { - throw new BadRequestException("未查询到载具对应的物料【"+attrDao.getVehicle_code()+"】"); - } - - unAssingQty = NumberUtil.sub(unAssingQty,extDao.getQty().doubleValue()); - - // 移出此仓位物料,方便下一轮进行匹配 - attrList.remove(attrDao); - } - - return resultList; - } +// private List outHandler(List attrList, JSONObject jsonParam) { +// +// // 查询对应的出入库明细 +// StIvtIostorinvdtlIn dtlDao = iStIvtIostorinvdtlService.getById(jsonParam.getString("iostorinvdtlId")); +// +// // 查询传入仓位物料中的数量是否满足明细中的数量 +// List vehicleCodeIn = attrList.stream() +// .map(StIvtStructattr::getVehicle_code) +// .distinct() +// .collect(Collectors.toList()); +// +// List extList = iMdPbStoragevehicleextService.list( +// new QueryWrapper().lambda() +// .in(MdPbStoragevehicleext::getStoragevehicle_code, vehicleCodeIn) +// ); +// +// double attrQty = extList.stream() +// .map(MdPbStoragevehicleext::getQty) +// .reduce(BigDecimal.ZERO, BigDecimal::add) +// .doubleValue(); +// +// if (dtlDao.getUnassign_qty().doubleValue() > attrQty) { +// // 说明不满足所需重量则全部返回 +// return attrList; +// } +// +// // 需返回仓位物料集合 +// List resultList = new ArrayList<>(); +// // 满足所需数量: 根据巷道进行平均分配 +// double unAssingQty = dtlDao.getUnassign_qty().doubleValue(); +// +// while (unAssingQty > 0) { +// // 找出物料最多的巷道 +// int blockNum = getMaxMaterial(attrList); +// +// // 匹配此巷道对应的仓位物料 +// StIvtStructattr attrDao = attrList.stream() +// .filter(row -> row.getBlock_num().intValue() == blockNum) +// .findFirst().orElse(null); +// +// if (ObjectUtil.isEmpty(attrDao)) { +// continue; +// } +// +// // 添加需返回的仓位物料 +// resultList.add(attrDao); +// +// // 减去未分配重量 +// MdPbStoragevehicleext extDao = extList.stream() +// .filter(row -> row.getStoragevehicle_code().equals(attrDao.getVehicle_code())) +// .findFirst().orElse(null); +// +// if (ObjectUtil.isEmpty(extDao)) { +// throw new BadRequestException("未查询到载具对应的物料【"+attrDao.getVehicle_code()+"】"); +// } +// +// unAssingQty = NumberUtil.sub(unAssingQty,extDao.getQty().doubleValue()); +// +// // 移出此仓位物料,方便下一轮进行匹配 +// attrList.remove(attrDao); +// } +// +// return resultList; +// } /** * 出库策略 - 查询物料最多的巷道 diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/impl/base/ClusterRuleHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/impl/base/ClusterRuleHandler.java index 13ae7aeb..86d70d89 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/impl/base/ClusterRuleHandler.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/impl/base/ClusterRuleHandler.java @@ -1,18 +1,13 @@ package org.nl.wms.decision_manage.handler.impl.base; -import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.nl.common.domain.exception.BadRequestException; import org.nl.common.utils.ListOf; import org.nl.wms.base_manage.struct.service.IStIvtStructattrService; import org.nl.wms.base_manage.struct.service.dao.StIvtStructattr; -import org.nl.wms.base_manage.vehicleext.service.IMdPbStoragevehicleextService; -import org.nl.wms.base_manage.vehicleext.service.dao.MdPbStoragevehicleext; import org.nl.wms.decision_manage.handler.Decisioner; import org.nl.wms.stor_manage.service.in.iostor_dtl.IStIvtIostorinvdtlInService; -import org.nl.wms.stor_manage.service.in.iostor_dtl.dao.StIvtIostorinvdtlIn; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -41,11 +36,6 @@ public class ClusterRuleHandler extends Decisioner { @Autowired private IStIvtIostorinvdtlInService iStIvtIostorinvdtlService; - /** - * 载具扩展属性服务服务 - */ - @Autowired - private IMdPbStoragevehicleextService iMdPbStoragevehicleextService; /** * 同类物品集中原则 @@ -76,7 +66,7 @@ public class ClusterRuleHandler extends Decisioner { break; case "2": // 出库策略 - resultList = outHandler(list,jsonParam); +// resultList = outHandler(list,jsonParam); break; case "3": // 通用策略 @@ -125,58 +115,58 @@ public class ClusterRuleHandler extends Decisioner { * @param jsonParam：iostorinvdtlId ： 出入库明细标识（此方法只根据明细物料匹配） * @return List ：需出库仓位集合 */ - private List outHandler(List attrList, JSONObject jsonParam) { - - // 查询对应的出入库明细 - StIvtIostorinvdtlIn dtlDao = iStIvtIostorinvdtlService.getById(jsonParam.getString("iostorinvdtlId")); - - // 查询传入仓位物料中的数量是否满足明细中的数量 - List vehicleCodeIn = attrList.stream() - .map(StIvtStructattr::getVehicle_code) - .distinct() - .collect(Collectors.toList()); - - List extList = iMdPbStoragevehicleextService.list( - new QueryWrapper().lambda() - .in(MdPbStoragevehicleext::getStoragevehicle_code, vehicleCodeIn) - ); - - double attrQty = extList.stream() - .map(MdPbStoragevehicleext::getQty) - .reduce(BigDecimal.ZERO, BigDecimal::add) - .doubleValue(); - - if (dtlDao.getUnassign_qty().doubleValue() > attrQty) { - // 说明不满足所需重量则全部返回 - return attrList; - } - - // 需返回仓位物料集合 - List resultList = new ArrayList<>(); - // 满足所需数量: 根据巷道进行平均分配 - double unAssingQty = dtlDao.getUnassign_qty().doubleValue(); - - while (unAssingQty > 0) { - - // 添加需返回的仓位物料 - StIvtStructattr attrDao = attrList.get(0); - resultList.add(attrDao); - - // 减去未分配重量 - MdPbStoragevehicleext extDao = extList.stream() - .filter(row -> row.getStoragevehicle_code().equals(attrDao.getVehicle_code())) - .findFirst().orElse(null); - - if (ObjectUtil.isEmpty(extDao)) { - throw new BadRequestException("未查询到载具对应的物料【"+attrDao.getVehicle_code()+"】"); - } - - unAssingQty = NumberUtil.sub(unAssingQty,extDao.getQty().doubleValue()); - - // 移出此仓位物料,方便下一轮进行匹配 - attrList.remove(attrDao); - } - - return resultList; - } +// private List outHandler(List attrList, JSONObject jsonParam) { +// +// // 查询对应的出入库明细 +// StIvtIostorinvdtlIn dtlDao = iStIvtIostorinvdtlService.getById(jsonParam.getString("iostorinvdtlId")); +// +// // 查询传入仓位物料中的数量是否满足明细中的数量 +// List vehicleCodeIn = attrList.stream() +// .map(StIvtStructattr::getVehicle_code) +// .distinct() +// .collect(Collectors.toList()); +// +// List extList = iMdPbStoragevehicleextService.list( +// new QueryWrapper().lambda() +// .in(MdPbStoragevehicleext::getStoragevehicle_code, vehicleCodeIn) +// ); +// +// double attrQty = extList.stream() +// .map(MdPbStoragevehicleext::getQty) +// .reduce(BigDecimal.ZERO, BigDecimal::add) +// .doubleValue(); +// +// if (dtlDao.getUnassign_qty().doubleValue() > attrQty) { +// // 说明不满足所需重量则全部返回 +// return attrList; +// } +// +// // 需返回仓位物料集合 +// List resultList = new ArrayList<>(); +// // 满足所需数量: 根据巷道进行平均分配 +// double unAssingQty = dtlDao.getUnassign_qty().doubleValue(); +// +// while (unAssingQty > 0) { +// +// // 添加需返回的仓位物料 +// StIvtStructattr attrDao = attrList.get(0); +// resultList.add(attrDao); +// +// // 减去未分配重量 +// MdPbStoragevehicleext extDao = extList.stream() +// .filter(row -> row.getStoragevehicle_code().equals(attrDao.getVehicle_code())) +// .findFirst().orElse(null); +// +// if (ObjectUtil.isEmpty(extDao)) { +// throw new BadRequestException("未查询到载具对应的物料【"+attrDao.getVehicle_code()+"】"); +// } +// +// unAssingQty = NumberUtil.sub(unAssingQty,extDao.getQty().doubleValue()); +// +// // 移出此仓位物料,方便下一轮进行匹配 +// attrList.remove(attrDao); +// } +// +// return resultList; +// } } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/impl/base/FIFORuleHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/impl/base/FIFORuleHandler.java index 94b4e5cf..6d9d2c37 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/impl/base/FIFORuleHandler.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/impl/base/FIFORuleHandler.java @@ -6,8 +6,6 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.nl.common.domain.exception.BadRequestException; import org.nl.wms.base_manage.struct.service.dao.StIvtStructattr; -import org.nl.wms.base_manage.vehicleext.service.IMdPbStoragevehicleextService; -import org.nl.wms.base_manage.vehicleext.service.dao.MdPbStoragevehicleext; import org.nl.wms.decision_manage.handler.Decisioner; import org.nl.wms.stor_manage.service.in.iostor_dtl.IStIvtIostorinvdtlInService; import org.nl.wms.stor_manage.service.in.iostor_dtl.dao.StIvtIostorinvdtlIn; @@ -36,8 +34,8 @@ public class FIFORuleHandler extends Decisioner { /** * 载具扩展属性服务服务 */ - @Autowired - private IMdPbStoragevehicleextService iMdPbStoragevehicleextService; +// @Autowired +// private IMdPbStoragevehicleextService iMdPbStoragevehicleextService; /** * 巷道均衡策略 @@ -68,7 +66,7 @@ public class FIFORuleHandler extends Decisioner { break; case "2": // 出库策略 - resultList = outHandler(list,jsonParam); +// resultList = outHandler(list,jsonParam); break; case "3": // 通用策略 @@ -96,60 +94,60 @@ public class FIFORuleHandler extends Decisioner { * @param jsonParam：iostorinvdtlId ： 出入库明细标识（此方法只根据时间匹配） * @return List ：需出库仓位集合 */ - private List outHandler(List attrList, JSONObject jsonParam) { - - // 查询对应的出入库明细 - StIvtIostorinvdtlIn dtlDao = iStIvtIostorinvdtlService.getById(jsonParam.getString("iostorinvdtlId")); - - // 查询传入仓位物料中的数量是否满足明细中的数量 - List vehicleCodeIn = attrList.stream() - .map(StIvtStructattr::getVehicle_code) - .distinct() - .collect(Collectors.toList()); - - // 查询对应的载具物料，根据入库时间升序（先进先出规则） - List extList = iMdPbStoragevehicleextService.list( - new QueryWrapper().lambda() - .in(MdPbStoragevehicleext::getStoragevehicle_code, vehicleCodeIn) - .orderByAsc(MdPbStoragevehicleext::getInsert_time) - ); - - double attrQty = extList.stream() - .map(MdPbStoragevehicleext::getQty) - .reduce(BigDecimal.ZERO, BigDecimal::add) - .doubleValue(); - - if (dtlDao.getUnassign_qty().doubleValue() > attrQty) { - // 说明不满足所需重量则全部返回 - return attrList; - } - - // 需返回仓位物料集合 - List resultList = new ArrayList<>(); - // 满足所需数量: 根据巷道进行平均分配 - double unAssingQty = dtlDao.getUnassign_qty().doubleValue(); - - while (unAssingQty > 0) { - - // 添加需返回的仓位物料 - StIvtStructattr attrDao = attrList.get(0); - resultList.add(attrDao); - - // 减去未分配重量 - MdPbStoragevehicleext extDao = extList.stream() - .filter(row -> row.getStoragevehicle_code().equals(attrDao.getVehicle_code())) - .findFirst().orElse(null); - - if (ObjectUtil.isEmpty(extDao)) { - throw new BadRequestException("未查询到载具对应的物料【"+attrDao.getVehicle_code()+"】"); - } - - unAssingQty = NumberUtil.sub(unAssingQty,extDao.getQty().doubleValue()); - - // 移出此仓位物料,方便下一轮进行匹配 - attrList.remove(attrDao); - } - - return resultList; - } +// private List outHandler(List attrList, JSONObject jsonParam) { +// +// // 查询对应的出入库明细 +// StIvtIostorinvdtlIn dtlDao = iStIvtIostorinvdtlService.getById(jsonParam.getString("iostorinvdtlId")); +// +// // 查询传入仓位物料中的数量是否满足明细中的数量 +// List vehicleCodeIn = attrList.stream() +// .map(StIvtStructattr::getVehicle_code) +// .distinct() +// .collect(Collectors.toList()); +// +// // 查询对应的载具物料，根据入库时间升序（先进先出规则） +// List extList = iMdPbStoragevehicleextService.list( +// new QueryWrapper().lambda() +// .in(MdPbStoragevehicleext::getStoragevehicle_code, vehicleCodeIn) +// .orderByAsc(MdPbStoragevehicleext::getInsert_time) +// ); +// +// double attrQty = extList.stream() +// .map(MdPbStoragevehicleext::getQty) +// .reduce(BigDecimal.ZERO, BigDecimal::add) +// .doubleValue(); +// +// if (dtlDao.getUnassign_qty().doubleValue() > attrQty) { +// // 说明不满足所需重量则全部返回 +// return attrList; +// } +// +// // 需返回仓位物料集合 +// List resultList = new ArrayList<>(); +// // 满足所需数量: 根据巷道进行平均分配 +// double unAssingQty = dtlDao.getUnassign_qty().doubleValue(); +// +// while (unAssingQty > 0) { +// +// // 添加需返回的仓位物料 +// StIvtStructattr attrDao = attrList.get(0); +// resultList.add(attrDao); +// +// // 减去未分配重量 +// MdPbStoragevehicleext extDao = extList.stream() +// .filter(row -> row.getStoragevehicle_code().equals(attrDao.getVehicle_code())) +// .findFirst().orElse(null); +// +// if (ObjectUtil.isEmpty(extDao)) { +// throw new BadRequestException("未查询到载具对应的物料【"+attrDao.getVehicle_code()+"】"); +// } +// +// unAssingQty = NumberUtil.sub(unAssingQty,extDao.getQty().doubleValue()); +// +// // 移出此仓位物料,方便下一轮进行匹配 +// attrList.remove(attrDao); +// } +// +// return resultList; +// } } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/impl/base/LimitStorageRuleHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/impl/base/LimitStorageRuleHandler.java index 9b7dcc60..b259b586 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/impl/base/LimitStorageRuleHandler.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/impl/base/LimitStorageRuleHandler.java @@ -1,28 +1,16 @@ package org.nl.wms.decision_manage.handler.impl.base; -import cn.hutool.core.util.NumberUtil; -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 org.nl.common.domain.exception.BadRequestException; -import org.nl.common.utils.ListOf; -import org.nl.common.utils.SpringContextHolder; import org.nl.wms.base_manage.struct.service.dao.StIvtStructattr; -import org.nl.wms.base_manage.vehicle.service.IBmVehicleInfoService; -import org.nl.wms.base_manage.vehicle.service.dao.BmVehicleInfo; -import org.nl.wms.base_manage.vehicleext.service.IMdPbStoragevehicleextService; -import org.nl.wms.base_manage.vehicleext.service.dao.MdPbStoragevehicleext; +import org.nl.wms.base_manage.vehicle.vehicleInfo.service.IBmVehicleInfoService; +import org.nl.wms.base_manage.vehicle.vehicleInfo.service.dao.BmVehicleInfo; import org.nl.wms.decision_manage.handler.Decisioner; -import org.nl.wms.decision_manage.service.IStStrategyConfigService; -import org.nl.wms.decision_manage.service.dao.StStrategyConfig; import org.nl.wms.stor_manage.service.in.iostor_dtl.IStIvtIostorinvdtlInService; import org.nl.wms.stor_manage.service.in.iostor_dtl.dao.StIvtIostorinvdtlIn; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.math.BigDecimal; -import java.util.ArrayList; import java.util.List; import java.util.function.Predicate; import java.util.stream.Collectors; diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/impl/base/NearbyRuleHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/impl/base/NearbyRuleHandler.java index 0062120e..704ccf3d 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/impl/base/NearbyRuleHandler.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/impl/base/NearbyRuleHandler.java @@ -7,8 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.nl.common.domain.exception.BadRequestException; import org.nl.common.utils.SpringContextHolder; import org.nl.wms.base_manage.struct.service.dao.StIvtStructattr; -import org.nl.wms.base_manage.vehicleext.service.IMdPbStoragevehicleextService; -import org.nl.wms.base_manage.vehicleext.service.dao.MdPbStoragevehicleext; import org.nl.wms.decision_manage.handler.Decisioner; import org.nl.wms.decision_manage.service.IStStrategyConfigService; import org.nl.wms.decision_manage.service.dao.StStrategyConfig; @@ -42,8 +40,7 @@ public class NearbyRuleHandler extends Decisioner ：需出库仓位集合 */ - private List outHandler(List attrList, JSONObject jsonParam) { - - // 先进行顺序排序 - - // 查询对应的出入库明细 - StIvtIostorinvdtlIn dtlDao = iStIvtIostorinvdtlService.getById(jsonParam.getString("iostorinvdtlId")); - - // 查询传入仓位物料中的数量是否满足明细中的数量 - List vehicleCodeIn = attrList.stream() - .map(StIvtStructattr::getVehicle_code) - .distinct() - .collect(Collectors.toList()); - - // 查询对应的载具物料 - List extList = iMdPbStoragevehicleextService.list( - new QueryWrapper().lambda() - .in(MdPbStoragevehicleext::getStoragevehicle_code, vehicleCodeIn) - ); - - double attrQty = extList.stream() - .map(MdPbStoragevehicleext::getQty) - .reduce(BigDecimal.ZERO, BigDecimal::add) - .doubleValue(); - - if (dtlDao.getUnassign_qty().doubleValue() > attrQty) { - // 说明不满足所需重量则全部返回 - return attrList; - } - - // 需返回仓位物料集合 - List resultList = new ArrayList<>(); - // 满足所需数量: 根据巷道进行平均分配 - double unAssingQty = dtlDao.getUnassign_qty().doubleValue(); - - while (unAssingQty > 0) { - - // 添加需返回的仓位物料 - StIvtStructattr attrDao = attrList.get(0); - resultList.add(attrDao); - - // 减去未分配重量 - MdPbStoragevehicleext extDao = extList.stream() - .filter(row -> row.getStoragevehicle_code().equals(attrDao.getVehicle_code())) - .findFirst().orElse(null); - - if (ObjectUtil.isEmpty(extDao)) { - throw new BadRequestException("未查询到载具对应的物料【"+attrDao.getVehicle_code()+"】"); - } - - unAssingQty = NumberUtil.sub(unAssingQty,extDao.getQty().doubleValue()); - - // 移出此仓位物料,方便下一轮进行匹配 - attrList.remove(attrDao); - } - - return resultList; - } +// private List outHandler(List attrList, JSONObject jsonParam) { +// +// // 先进行顺序排序 +// +// // 查询对应的出入库明细 +// StIvtIostorinvdtlIn dtlDao = iStIvtIostorinvdtlService.getById(jsonParam.getString("iostorinvdtlId")); +// +// // 查询传入仓位物料中的数量是否满足明细中的数量 +// List vehicleCodeIn = attrList.stream() +// .map(StIvtStructattr::getVehicle_code) +// .distinct() +// .collect(Collectors.toList()); +// +// // 查询对应的载具物料 +// List extList = iMdPbStoragevehicleextService.list( +// new QueryWrapper().lambda() +// .in(MdPbStoragevehicleext::getStoragevehicle_code, vehicleCodeIn) +// ); +// +// double attrQty = extList.stream() +// .map(MdPbStoragevehicleext::getQty) +// .reduce(BigDecimal.ZERO, BigDecimal::add) +// .doubleValue(); +// +// if (dtlDao.getUnassign_qty().doubleValue() > attrQty) { +// // 说明不满足所需重量则全部返回 +// return attrList; +// } +// +// // 需返回仓位物料集合 +// List resultList = new ArrayList<>(); +// // 满足所需数量: 根据巷道进行平均分配 +// double unAssingQty = dtlDao.getUnassign_qty().doubleValue(); +// +// while (unAssingQty > 0) { +// +// // 添加需返回的仓位物料 +// StIvtStructattr attrDao = attrList.get(0); +// resultList.add(attrDao); +// +// // 减去未分配重量 +// MdPbStoragevehicleext extDao = extList.stream() +// .filter(row -> row.getStoragevehicle_code().equals(attrDao.getVehicle_code())) +// .findFirst().orElse(null); +// +// if (ObjectUtil.isEmpty(extDao)) { +// throw new BadRequestException("未查询到载具对应的物料【"+attrDao.getVehicle_code()+"】"); +// } +// +// unAssingQty = NumberUtil.sub(unAssingQty,extDao.getQty().doubleValue()); +// +// // 移出此仓位物料,方便下一轮进行匹配 +// attrList.remove(attrDao); +// } +// +// return resultList; +// } } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/impl/base/WeightRuleHandler.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/impl/base/WeightRuleHandler.java index 3c844af9..82b29263 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/impl/base/WeightRuleHandler.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/decision_manage/handler/impl/base/WeightRuleHandler.java @@ -1,19 +1,12 @@ package org.nl.wms.decision_manage.handler.impl.base; -import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.nl.common.domain.exception.BadRequestException; -import org.nl.common.utils.SpringContextHolder; import org.nl.wms.base_manage.struct.service.dao.StIvtStructattr; -import org.nl.wms.base_manage.vehicleext.service.IMdPbStoragevehicleextService; -import org.nl.wms.base_manage.vehicleext.service.dao.MdPbStoragevehicleext; import org.nl.wms.decision_manage.handler.Decisioner; -import org.nl.wms.decision_manage.service.IStStrategyConfigService; import org.nl.wms.decision_manage.service.dao.StStrategyConfig; import org.nl.wms.stor_manage.service.in.iostor_dtl.IStIvtIostorinvdtlInService; -import org.nl.wms.stor_manage.service.in.iostor_dtl.dao.StIvtIostorinvdtlIn; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -30,19 +23,12 @@ import java.util.stream.Collectors; */ @Service("weight") public class WeightRuleHandler extends Decisioner { - //每个策略的配置信息 - private static StStrategyConfig stStrategyConfig; /** * 出入库明细服务 */ @Autowired private IStIvtIostorinvdtlInService iStIvtIostorinvdtlService; - /** - * 载具扩展属性服务服务 - */ - @Autowired - private IMdPbStoragevehicleextService iMdPbStoragevehicleextService; /** * 轻上重下策略：根据物品的重量 @@ -73,7 +59,7 @@ public class WeightRuleHandler extends Decisioner { break; case "2": // 出库策略 - resultList = outHandler(list,jsonParam); +// resultList = outHandler(list,jsonParam); break; case "3": // 通用策略 @@ -104,59 +90,59 @@ public class WeightRuleHandler extends Decisioner { * @param jsonParam：iostorinvdtlId ： 出入库明细标识（此方法只根据时间匹配） * @return List ：需出库仓位集合 */ - private List outHandler(List attrList, JSONObject jsonParam) { - - // 查询对应的出入库明细 - StIvtIostorinvdtlIn dtlDao = iStIvtIostorinvdtlService.getById(jsonParam.getString("iostorinvdtlId")); - - // 查询传入仓位物料中的数量是否满足明细中的数量 - List vehicleCodeIn = attrList.stream() - .map(StIvtStructattr::getVehicle_code) - .distinct() - .collect(Collectors.toList()); - - // 查询对应的载具物料 - List extList = iMdPbStoragevehicleextService.list( - new QueryWrapper().lambda() - .in(MdPbStoragevehicleext::getStoragevehicle_code, vehicleCodeIn) - ); - - double attrQty = extList.stream() - .map(MdPbStoragevehicleext::getQty) - .reduce(BigDecimal.ZERO, BigDecimal::add) - .doubleValue(); - - if (dtlDao.getUnassign_qty().doubleValue() > attrQty) { - // 说明不满足所需重量则全部返回 - return attrList; - } - - // 需返回仓位物料集合 - List resultList = new ArrayList<>(); - // 满足所需数量: 根据巷道进行平均分配 - double unAssingQty = dtlDao.getUnassign_qty().doubleValue(); - - while (unAssingQty > 0) { - - // 添加需返回的仓位物料 - StIvtStructattr attrDao = attrList.get(0); - resultList.add(attrDao); - - // 减去未分配重量 - MdPbStoragevehicleext extDao = extList.stream() - .filter(row -> row.getStoragevehicle_code().equals(attrDao.getVehicle_code())) - .findFirst().orElse(null); - - if (ObjectUtil.isEmpty(extDao)) { - throw new BadRequestException("未查询到载具对应的物料【"+attrDao.getVehicle_code()+"】"); - } - - unAssingQty = NumberUtil.sub(unAssingQty,extDao.getQty().doubleValue()); - - // 移出此仓位物料,方便下一轮进行匹配 - attrList.remove(attrDao); - } - - return resultList; - } +// private List outHandler(List attrList, JSONObject jsonParam) { +// +// // 查询对应的出入库明细 +// StIvtIostorinvdtlIn dtlDao = iStIvtIostorinvdtlService.getById(jsonParam.getString("iostorinvdtlId")); +// +// // 查询传入仓位物料中的数量是否满足明细中的数量 +// List vehicleCodeIn = attrList.stream() +// .map(StIvtStructattr::getVehicle_code) +// .distinct() +// .collect(Collectors.toList()); +// +// // 查询对应的载具物料 +// List extList = iMdPbStoragevehicleextService.list( +// new QueryWrapper().lambda() +// .in(MdPbStoragevehicleext::getStoragevehicle_code, vehicleCodeIn) +// ); +// +// double attrQty = extList.stream() +// .map(MdPbStoragevehicleext::getQty) +// .reduce(BigDecimal.ZERO, BigDecimal::add) +// .doubleValue(); +// +// if (dtlDao.getUnassign_qty().doubleValue() > attrQty) { +// // 说明不满足所需重量则全部返回 +// return attrList; +// } +// +// // 需返回仓位物料集合 +// List resultList = new ArrayList<>(); +// // 满足所需数量: 根据巷道进行平均分配 +// double unAssingQty = dtlDao.getUnassign_qty().doubleValue(); +// +// while (unAssingQty > 0) { +// +// // 添加需返回的仓位物料 +// StIvtStructattr attrDao = attrList.get(0); +// resultList.add(attrDao); +// +// // 减去未分配重量 +// MdPbStoragevehicleext extDao = extList.stream() +// .filter(row -> row.getStoragevehicle_code().equals(attrDao.getVehicle_code())) +// .findFirst().orElse(null); +// +// if (ObjectUtil.isEmpty(extDao)) { +// throw new BadRequestException("未查询到载具对应的物料【"+attrDao.getVehicle_code()+"】"); +// } +// +// unAssingQty = NumberUtil.sub(unAssingQty,extDao.getQty().doubleValue()); +// +// // 移出此仓位物料,方便下一轮进行匹配 +// attrList.remove(attrDao); +// } +// +// return resultList; +// } } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/MdGruopDick.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/MdGruopDick.java index d66764d4..23321d6e 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/MdGruopDick.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/MdGruopDick.java @@ -35,22 +35,7 @@ public class MdGruopDick implements Serializable { /** * 主表id */ - private String mst_id; - - /** - * 载具编码 - */ - private String vehicle_code; - - /** - * 子否含有子载具 - */ - private Boolean has_child; - - /** - * 组盘状态 - */ - private String status; + private String code; /** * 父载具 @@ -58,49 +43,22 @@ public class MdGruopDick implements Serializable { private String parent_vehicle_code; /** - * 物料id + * 组盘状态 */ - private String material_id; - - /** - * 物料编码 - */ - private String material_code; - - /** - * 物料名称 - */ - private String material_name; - - /** - * 物料规格 - */ - private String material_spec; - - /** - * 批次 - */ - private String pcsn; - - /** - * 数量计量单位标识 - */ - private String qty_unit_id; - - /** - * 数量计量单位名称 - */ - private String qty_unit_name; - - /** - * 数量 - */ - private BigDecimal qty; + private String status; /** * 备注 */ private String remark; + /** + * 源单 + */ + private String source_form_type; + /** + * 源单id + */ + private String source_form_id; /** * 修改人 @@ -111,6 +69,10 @@ public class MdGruopDick implements Serializable { * 修改时间 */ private String update_time; + /** + * 修改时间 + */ + private String create_time; /** * 自定义字段 diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/MdGroupMstMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/MdGroupMstMapper.java deleted file mode 100644 index 1b4237e1..00000000 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/MdGroupMstMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.nl.wms.md_manage.group_dick.service.dao.mapper; - -import org.nl.wms.md_manage.group_dick.service.dao.MdGroupMst; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - *

- * 载具组盘主表 Mapper 接口 - *

- * - * @author generator - * @since 2024-04-28 - */ -public interface MdGroupMstMapper extends BaseMapper { - -} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/xml/MdGruopDickMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/xml/MdGruopDickMapper.xml index 4cf456a9..27ea1340 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/xml/MdGruopDickMapper.xml +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/xml/MdGruopDickMapper.xml @@ -25,11 +25,10 @@