From b3d0777fc8ea7e15917a12f7d604aa2f56e8e2ce Mon Sep 17 00:00:00 2001 From: zhangzq Date: Wed, 18 Dec 2024 19:02:56 +0800 Subject: [PATCH] =?UTF-8?q?add:=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IPdmBiSlittingproductionplanService.java | 7 +- .../dao/PdmBiSlittingproductionplan.java | 3 +- .../PdmBiSlittingproductionplanMapper.java | 4 + .../PdmBiSlittingproductionplanMapper.xml | 53 +++++ .../dto/PdmBiSlittingproductionplanQuery.java | 17 +- ...dmBiSlittingproductionplanServiceImpl.java | 27 ++- .../dao/PdmBiSubpackagerelation.java | 4 - .../main/java/org/nl/config/WebMvcConfig.java | 6 + .../service/quartz/config/JobRunner.java | 2 +- .../wms/ext/mes/service/MesToLmsService.java | 4 +- .../mes/service/impl/MesToLmsServiceImpl.java | 220 +++++++----------- .../SlittingproductionplanController.java | 10 +- .../src/main/resources/logback-spring.xml | 3 +- 13 files changed, 195 insertions(+), 165 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java index b96d695..dccb2d1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/IPdmBiSlittingproductionplanService.java @@ -2,7 +2,9 @@ package org.nl.b_lms.pdm.bi.slittingproductionplan.service; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; +import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dto.PdmBiSlittingproductionplanQuery; import org.nl.b_lms.sch.tasks.slitter.mapper.dto.SlitterPlanDistinctDto; +import org.nl.common.TableDataInfo; import org.nl.common.domain.query.PageQuery; import com.baomidou.mybatisplus.extension.service.IService; import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan; @@ -20,11 +22,12 @@ public interface IPdmBiSlittingproductionplanService extends IService */ - IPage queryAll(Map whereJson, PageQuery pageable); + TableDataInfo queryAll(PdmBiSlittingproductionplanQuery query, PageQuery pageable); /** * 创建 diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/PdmBiSlittingproductionplan.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/PdmBiSlittingproductionplan.java index 70c0f31..6f066e3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/PdmBiSlittingproductionplan.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/PdmBiSlittingproductionplan.java @@ -3,8 +3,7 @@ package org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; -import lombok.EqualsAndHashCode; +import lombok.*; import java.io.Serializable; import java.math.BigDecimal; diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.java index 2accf52..330d2bd 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.java @@ -2,9 +2,11 @@ package org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan; +import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dto.PdmBiSlittingproductionplanQuery; import org.nl.b_lms.sch.tasks.slitter.mapper.dto.SlitterPlanDistinctDto; import java.util.List; +import java.util.Map; /** * @author lyd @@ -17,4 +19,6 @@ public interface PdmBiSlittingproductionplanMapper extends BaseMapper getAllHalfPlan(List qzzs); List getCurrentPlanInfos(SlitterPlanDistinctDto dto); + + List queryAll(PdmBiSlittingproductionplanQuery query); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml index c5a6884..ad80ecd 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/mapper/PdmBiSlittingproductionplanMapper.xml @@ -150,4 +150,57 @@ AND (p.parent_container_name = #{parent_container_name} OR restruct_container_name = #{parent_container_name}) AND p.split_group ]]> #{split_group} + diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dto/PdmBiSlittingproductionplanQuery.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dto/PdmBiSlittingproductionplanQuery.java index 54efa85..f4aad0a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dto/PdmBiSlittingproductionplanQuery.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dto/PdmBiSlittingproductionplanQuery.java @@ -1,5 +1,7 @@ package org.nl.b_lms.pdm.bi.slittingproductionplan.service.dto; +import cn.hutool.core.util.ObjectUtil; +import lombok.Data; import org.nl.common.domain.query.BaseQuery; import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan; @@ -7,6 +9,19 @@ import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingprodu * @author lyd * @date 2024-02-26 **/ +@Data public class PdmBiSlittingproductionplanQuery extends BaseQuery { - + private String order_type; + private String product_area; + private String status; + private String begin_time; + private String is_parent_ok; + private String is_child_tz_ok; + private String is_child_ps_ok; + private String is_call; + private String resource_name; + private String parent_container_name; + private String container_name; + private String qzzno; + private String in_area_id; } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java index d7fc6fe..c3c68f6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/impl/PdmBiSlittingproductionplanServiceImpl.java @@ -1,6 +1,7 @@ package org.nl.b_lms.pdm.bi.slittingproductionplan.service.impl; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONArray; @@ -10,24 +11,30 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; import lombok.extern.slf4j.Slf4j; import org.nl.b_lms.pdm.bi.slittingproductionplan.service.IPdmBiSlittingproductionplanService; import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan; import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.mapper.PdmBiSlittingproductionplanMapper; +import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dto.PdmBiSlittingproductionplanQuery; import org.nl.b_lms.sch.tasks.slitter.mapper.dto.SlitterPlanDistinctDto; import org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil; import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; +import org.nl.common.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.utils.SecurityUtils; import org.nl.common.utils.TaskUtils; import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.wql.WQL; +import org.nl.modules.wql.util.WqlUtil; +import org.nl.wms.basedata.st.userarea.service.IUserAreaPermissionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.stream.Collectors; /** * @description 服务实现 @@ -38,15 +45,21 @@ import java.util.stream.Collectors; @Service public class PdmBiSlittingproductionplanServiceImpl extends ServiceImpl implements IPdmBiSlittingproductionplanService { - @Autowired + @Resource private PdmBiSlittingproductionplanMapper pdmBiSlittingproductionplanMapper; + @Autowired + private IUserAreaPermissionService userAreaPermissionService; + @Override - public IPage queryAll(Map whereJson, PageQuery page){ - LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); - IPage pages = new Page<>(page.getPage() + 1, page.getSize()); - pdmBiSlittingproductionplanMapper.selectPage(pages, lam); - return pages; + public TableDataInfo queryAll(PdmBiSlittingproductionplanQuery query, PageQuery pageQuery){ + String in_area_id = userAreaPermissionService.getInArea(); + query.setIn_area_id(in_area_id); + com.github.pagehelper.Page page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); + List mapList = this.baseMapper.queryAll(query); + TableDataInfo build = TableDataInfo.build(mapList); + build.setTotalElements(page.getTotal()); + return build; } @Override diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/PdmBiSubpackagerelation.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/PdmBiSubpackagerelation.java index 2316ab1..f9db0f6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/PdmBiSubpackagerelation.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/PdmBiSubpackagerelation.java @@ -3,12 +3,8 @@ package org.nl.b_lms.pdm.subpackagerelation.dao; import java.math.BigDecimal; import java.io.Serializable; -import jdk.nashorn.internal.ir.annotations.Ignore; -import lombok.*; import lombok.Data; -import lombok.Builder; import lombok.EqualsAndHashCode; -import lombok.AllArgsConstructor; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; diff --git a/lms/nladmin-system/src/main/java/org/nl/config/WebMvcConfig.java b/lms/nladmin-system/src/main/java/org/nl/config/WebMvcConfig.java index 6da8a9c..ab0d5e6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/config/WebMvcConfig.java +++ b/lms/nladmin-system/src/main/java/org/nl/config/WebMvcConfig.java @@ -1,11 +1,13 @@ package org.nl.config; +import org.nl.common.language.InitLocaleResolver; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.support.ConversionServiceFactoryBean; import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.converter.Converter; +import org.springframework.web.servlet.LocaleResolver; import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; import java.util.HashSet; @@ -29,4 +31,8 @@ public class WebMvcConfig extends WebMvcConfigurerAdapter { return factoryBean.getObject(); } + @Bean + public LocaleResolver localeResolver(){ + return new InitLocaleResolver(); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/quartz/config/JobRunner.java b/lms/nladmin-system/src/main/java/org/nl/system/service/quartz/config/JobRunner.java index 1041e14..1ca5d22 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/service/quartz/config/JobRunner.java +++ b/lms/nladmin-system/src/main/java/org/nl/system/service/quartz/config/JobRunner.java @@ -17,7 +17,7 @@ import org.springframework.stereotype.Component; import java.util.List; -@Component +//@Component @RequiredArgsConstructor @Order(100) public class JobRunner implements ApplicationRunner { diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/MesToLmsService.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/MesToLmsService.java index 4998f11..cf1b08f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/MesToLmsService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/MesToLmsService.java @@ -3,6 +3,8 @@ package org.nl.wms.ext.mes.service; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import java.util.Map; + public interface MesToLmsService { /** * 母卷批次创建信息发送智能物流（MES生箔工序Move In） @@ -27,7 +29,7 @@ public interface MesToLmsService { /** * 分切包装段：分切计划（单表，包含母卷/改制子卷-包装箱号、空包装箱物料、纸筒/FRP管）MES下发智能物流 */ - JSONObject cutPlanTransfer(JSONObject param); + Map cutPlanTransfer(JSONObject param); /** * 分切即将完成，呼叫配送下一个母卷/改制子卷，MES传智能物流 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java index 9be2c11..127b152 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java @@ -32,10 +32,8 @@ import org.nl.b_lms.sch.tasks.first_floor_area.GzqTask; import org.nl.b_lms.sch.tasks.slitter.constant.SlitterConstant; import org.nl.b_lms.sch.tasks.slitter.service.SlitterService; import org.nl.common.enums.PackageInfoIvtEnum; -import org.nl.common.utils.SecurityUtils; -import org.nl.common.utils.TaskUtils; +import org.nl.common.utils.*; import org.nl.modules.common.exception.BadRequestException; -import org.nl.common.utils.CodeUtil; import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; @@ -68,6 +66,7 @@ import javax.annotation.Resource; import java.util.HashMap; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; @Service @@ -565,10 +564,8 @@ public class MesToLmsServiceImpl implements MesToLmsService { * @return */ @Override - @Transactional(rollbackFor = Exception.class) - public JSONObject cutPlanTransfer(JSONObject param) { + public Map cutPlanTransfer(JSONObject param) { log.info("cutPlanTransfer接口输入参数为：-------------------" + param.toString()); - String orderType = param.getString("OrderType"); // 分切订单类型 String ContainerName = param.getString("ContainerName"); // 子卷号 String ProductName = param.getString("ProductName"); // 产品编码 @@ -588,67 +585,24 @@ public class MesToLmsServiceImpl implements MesToLmsService { String Attribute4 = param.getString("Attribute4"); // 位置左右 String Attribute5 = param.getString("Attribute5"); // 是否套轴 String Attribute6 = param.getString("Attribute6"); // 是否套轴 - - WQLObject tab = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan"); - - JSONObject result = new JSONObject(); + String parentContainerName = param.getString("ParentContainerName"); + String restructContainerName = param.getString("RestructContainerName"); try { // 基础校验 - if (ObjectUtil.isEmpty(orderType)) { - throw new BadRequestException("分切订单类型不能为空"); - } - if (ObjectUtil.isEmpty(ContainerName)) { - throw new BadRequestException("子卷号不能为空"); - } - if (ObjectUtil.isEmpty(ProductName)) { - throw new BadRequestException("产品编码不能为空"); - } - if (ObjectUtil.isEmpty(Description)) { - throw new BadRequestException("产品名称不能为空"); - } - if (ObjectUtil.isEmpty(Warehouse)) { - throw new BadRequestException("来源卷位置不能为空"); - } - if (ObjectUtil.isEmpty(ResourceName)) { - throw new BadRequestException("分切机台编码不能为空"); - } - if (ObjectUtil.isEmpty(SplitGroup)) { - throw new BadRequestException("分切组不能为空"); - } - if (ObjectUtil.isEmpty(ManufactureSort)) { - throw new BadRequestException("生产顺序不能为空"); - } - if (ObjectUtil.isEmpty(MfgOrderName)) { - throw new BadRequestException("生产订单不能为空"); - } - if (ObjectUtil.isEmpty(ManufactureDate)) { - throw new BadRequestException("生产日期不能为空"); - } - if (ObjectUtil.isEmpty(PaperTubeOrFRP)) { - throw new BadRequestException("管件类型不能为空"); - } - if (ObjectUtil.isEmpty(SplitBreadth)) { - throw new BadRequestException("子卷幅宽不能为空"); - } - if (ObjectUtil.isEmpty(SplitHeight)) { - throw new BadRequestException("子卷理论长度不能为空"); - } - if (ObjectUtil.isEmpty(SplitWeight)) { - throw new BadRequestException("子卷理论重量不能为空"); - } - + AssertNullUtils.batch(MapOf.of( + "orderType",orderType,"ContainerName",ContainerName,"ProductName",ProductName, + "Description",Description,"Warehouse",Warehouse,"ResourceName",ResourceName + ,"SplitGroup",SplitGroup,"ManufactureSort",ManufactureSort,"MfgOrderName",MfgOrderName + ,"ManufactureDate",ManufactureDate,"PaperTubeOrFRP",PaperTubeOrFRP,"SplitBreadth",SplitBreadth + ,"SplitHeight",SplitHeight,"SplitWeight",SplitWeight)); /* orderType * 1.当订单类型为1（常规）时 ParentContainerName 来源母卷号不能为空 * 2.当订单类型为2（改制）时 RestructContainerName 改制来源子卷号、PackageBoxSN 子卷立库木箱号 不能为空 */ if (StrUtil.equals(orderType, "1")) { - if (ObjectUtil.isEmpty(param.getString("ParentContainerName"))) { - throw new BadRequestException("来源母卷号不能为空"); - } + AssertNullUtils.batch(MapOf.of("parentContainerName", parentContainerName)); } else { - if (ObjectUtil.isEmpty(param.getString("RestructContainerName"))) { - throw new BadRequestException("改制来源子卷号不能为空"); - } + AssertNullUtils.batch(MapOf.of("restructContainerName", restructContainerName)); } /* PaperTubeOrFRP * 1.当管件类型为1（纸筒）时 PaperTubeMaterial 纸筒物料编码、PaperTubeDescription 纸筒物料描述、PaperTubeModel 纸筒规格 不能为空 @@ -657,15 +611,10 @@ public class MesToLmsServiceImpl implements MesToLmsService { String qzz_generation = "0"; String qzz_size = "0"; if (StrUtil.equals(PaperTubeOrFRP, "1")) { - if (ObjectUtil.isEmpty(param.getString("PaperTubeMaterial"))) { - throw new BadRequestException("纸筒物料编码不能为空"); - } - if (ObjectUtil.isEmpty(param.getString("PaperTubeDescription"))) { - throw new BadRequestException("纸筒物料描述不能为空"); - } - if (ObjectUtil.isEmpty(param.getString("PaperTubeModel"))) { - throw new BadRequestException("纸筒规格不能为空"); - } + AssertNullUtils.batch(MapOf.of( + "PaperTubeMaterial", param.getString("PaperTubeMaterial"), + "PaperTubeDescription",param.getString("PaperTubeDescription"), + "PaperTubeModel",param.getString("PaperTubeModel"))); if (param.getString("PaperTubeDescription").contains("3.12")) { qzz_generation = "4"; } else if (param.getString("PaperTubeDescription").contains("3.15")) { @@ -673,21 +622,15 @@ public class MesToLmsServiceImpl implements MesToLmsService { } else { qzz_generation = "4"; } - // 解析描述数组 String[] tubeArray = param.getString("PaperTubeDescription").split("\\|"); // 定义尺寸与长度 qzz_size = Character.toString(tubeArray[2].charAt(0)); } else { - if (ObjectUtil.isEmpty(param.getString("FRPMaterial"))) { - throw new BadRequestException("FRP管物料编码不能为空"); - } - if (ObjectUtil.isEmpty(param.getString("FRPDescription"))) { - throw new BadRequestException("FRP管物料描述不能为空"); - } - if (ObjectUtil.isEmpty(param.getString("FRPModel"))) { - throw new BadRequestException("FRP管规格不能为空"); - } + AssertNullUtils.batch(MapOf.of( + "FRPMaterial", param.getString("FRPMaterial"), + "FRPDescription",param.getString("FRPDescription"), + "FRP管规格不能为空",param.getString("FRP管规格不能为空"))); if (param.getString("FRPDescription").contains("3.12")) { qzz_generation = "4"; } else if (param.getString("FRPDescription").contains("3.15")) { @@ -695,78 +638,71 @@ public class MesToLmsServiceImpl implements MesToLmsService { } else { qzz_generation = "4"; } - // 解析描述数组 String[] tubeArray = param.getString("FRPDescription").split("\\|"); // 定义尺寸与长度 qzz_size = Character.toString(tubeArray[2].charAt(0)); } - JSONObject json = new JSONObject(); - json.put("workorder_id", IdUtil.getSnowflake(1, 1).nextId()); - json.put("order_type", orderType); - json.put("container_name", ContainerName); - json.put("product_name", ProductName); - json.put("description", Description); - json.put("parent_container_name", param.getString("ParentContainerName")); - json.put("restruct_container_name", param.getString("RestructContainerName")); - json.put("package_box_sn", param.getString("PackageBoxSN")); - json.put("ware_house", Warehouse); - json.put("resource_name", ResourceName); - json.put("split_group", SplitGroup); - json.put("manufacture_sort", ManufactureSort); - json.put("mfg_order_name", MfgOrderName); - json.put("manufacture_date", ManufactureDate); - json.put("paper_tube_or_FRP", PaperTubeOrFRP); - json.put("paper_tube_material", param.getString("PaperTubeMaterial")); - json.put("paper_tube_description", param.getString("PaperTubeDescription")); - json.put("paper_tube_model", param.getString("PaperTubeModel")); - json.put("FRP_material", param.getString("FRPMaterial")); - json.put("FRP_description", param.getString("FRPDescription")); - json.put("FRP_model", param.getString("FRPModel")); - json.put("split_breadth", SplitBreadth); - json.put("split_height", SplitHeight); - json.put("split_weight", SplitWeight); - if (Attribute3.equals("U")) { - json.put("up_or_down", "1"); - } else { - json.put("up_or_down", "2"); - } - if (Attribute4.equals("L")) { - json.put("left_or_right", "1"); - } else { - json.put("left_or_right", "2"); - } - json.put("qzz_size", qzz_size); - if (ResourceName.startsWith("B5") || ResourceName.startsWith("B6")) { - json.put("is_paper_ok", "1"); - } - if (Attribute5.equals("0")) { - json.put("is_paper_ok", "2"); - } - json.put("sale_order_name", Attribute2); - json.put("material_type", Attribute6); - json.put("start_time", DateUtil.now()); - json.put("status", "01"); - json.put("qzz_generation", qzz_generation); - json.put("is_parent_ok", "0"); - json.put("is_child_tz_ok", "0"); - json.put("is_child_ps_ok", "0"); - json.put("is_delete", "0"); - tab.insert(json); - - result.put("RTYPE", "S"); - result.put("RTMSG", "操作成功!"); - result.put("RTOAL", 1); - result.put("RTDAT", null); + packageDo:{ + json.put("workorder_id", IdUtil.getSnowflake(1, 1).nextId()); + json.put("order_type", orderType); + json.put("container_name", ContainerName); + json.put("product_name", ProductName); + json.put("description", Description); + json.put("parent_container_name", param.getString("ParentContainerName")); + json.put("restruct_container_name", param.getString("RestructContainerName")); + json.put("package_box_sn", param.getString("PackageBoxSN")); + json.put("ware_house", Warehouse); + json.put("resource_name", ResourceName); + json.put("split_group", SplitGroup); + json.put("manufacture_sort", ManufactureSort); + json.put("mfg_order_name", MfgOrderName); + json.put("manufacture_date", ManufactureDate); + json.put("paper_tube_or_FRP", PaperTubeOrFRP); + json.put("paper_tube_material", param.getString("PaperTubeMaterial")); + json.put("paper_tube_description", param.getString("PaperTubeDescription")); + json.put("paper_tube_model", param.getString("PaperTubeModel")); + json.put("FRP_material", param.getString("FRPMaterial")); + json.put("FRP_description", param.getString("FRPDescription")); + json.put("FRP_model", param.getString("FRPModel")); + json.put("split_breadth", SplitBreadth); + json.put("split_height", SplitHeight); + json.put("split_weight", SplitWeight); + if (Attribute3.equals("U")) { + json.put("up_or_down", "1"); + } else { + json.put("up_or_down", "2"); + } + if (Attribute4.equals("L")) { + json.put("left_or_right", "1"); + } else { + json.put("left_or_right", "2"); + } + json.put("qzz_size", qzz_size); + if (ResourceName.startsWith("B5") || ResourceName.startsWith("B6")) { + json.put("is_paper_ok", "1"); + } + if (Attribute5.equals("0")) { + json.put("is_paper_ok", "2"); + } + json.put("sale_order_name", Attribute2); + json.put("material_type", Attribute6); + json.put("start_time", DateUtil.now()); + json.put("status", "01"); + json.put("qzz_generation", qzz_generation); + json.put("is_parent_ok", "0"); + json.put("is_child_tz_ok", "0"); + json.put("is_child_ps_ok", "0"); + json.put("is_delete", "0"); + } + PdmBiSlittingproductionplan slittingproductionplan = json.toJavaObject(PdmBiSlittingproductionplan.class); + slittingproductionplanService.save(slittingproductionplan); + return MapOf.of("RTYPE", "S","RTMSG", "操作成功!","RTOAL", 1,"RTDAT", null); } catch (Exception e) { - result.put("RTYPE", "E"); - result.put("RTMSG", "操作失败!" + e.getMessage()); - result.put("RTOAL", 0); - result.put("RTDAT", null); + log.info("MES下发分切计划保存下发失败：-------------------" + e.getMessage()); + return MapOf.of("RTYPE", "E","RTMSG", "操作失败!" + e.getMessage(),"RTOAL", 0,"RTDAT", null); } - log.info("cutPlanTransfer接口输出参数为：-------------------" + result.toString()); - return result; } /** diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/SlittingproductionplanController.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/SlittingproductionplanController.java index d362729..4e46b07 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/SlittingproductionplanController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/rest/SlittingproductionplanController.java @@ -5,6 +5,9 @@ import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.b_lms.pdm.bi.slittingproductionplan.service.IPdmBiSlittingproductionplanService; +import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dto.PdmBiSlittingproductionplanQuery; +import org.nl.common.TableDataInfo; +import org.nl.common.domain.query.PageQuery; import org.nl.modules.logging.annotation.Log; import org.nl.wms.pdm.service.SlittingproductionplanService; import org.nl.wms.pdm.service.dto.SlittingproductionplanDto; @@ -33,10 +36,9 @@ public class SlittingproductionplanController { @GetMapping @Log("查询分切计划") - - //@SaCheckPermission("@el.check('slittingproductionplan:list')") - public ResponseEntity query(@RequestParam Map whereJson, Pageable page) { - return new ResponseEntity<>(slittingproductionplanService.queryAll(whereJson, page), HttpStatus.OK); + public ResponseEntity query(PdmBiSlittingproductionplanQuery query, PageQuery page) { + TableDataInfo queryAll = biSlittingproductionplanService.queryAll(query, page); + return new ResponseEntity<>(queryAll,HttpStatus.OK); } @PostMapping diff --git a/lms/nladmin-system/src/main/resources/logback-spring.xml b/lms/nladmin-system/src/main/resources/logback-spring.xml index 2382fa5..8b4cff3 100644 --- a/lms/nladmin-system/src/main/resources/logback-spring.xml +++ b/lms/nladmin-system/src/main/resources/logback-spring.xml @@ -98,8 +98,9 @@ https://juejin.cn/post/6844903775631572999 - + +