add:国际化

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<PdmBiSlitt
 
     /**
      * 查询数据分页
-     * @param whereJson 条件
+     *
+     * @param query    条件
      * @param pageable 分页参数
      * @return IPage<PdmBiSlittingproductionplan>
      */
-    IPage<PdmBiSlittingproductionplan> queryAll(Map whereJson, PageQuery pageable);
+    TableDataInfo<Map> queryAll(PdmBiSlittingproductionplanQuery query, PageQuery pageable);
 
     /**
      * 创建

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.*;
-import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
 import java.math.BigDecimal;

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<PdmBiSlitt
     List<SlitterPlanDistinctDto> getAllHalfPlan(List<String> qzzs);
 
     List<PdmBiSlittingproductionplan> getCurrentPlanInfos(SlitterPlanDistinctDto dto);
+
+    List<Map> queryAll(PdmBiSlittingproductionplanQuery query);
 }

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 <![CDATA[ <> ]]> #{split_group}
     </select>
+    <select id="queryAll" resultType="java.util.Map">
+        SELECT
+        plan.*,
+        ivt.product_area,
+        ivt.point_code,
+        '0' as show_edit
+        FROM
+        PDM_BI_SlittingProductionPlan plan
+        LEFT JOIN ST_IVT_CutPointIvt ivt ON ivt.ext_code = plan.resource_name
+        WHERE plan.is_delete = '0'
+        <if test="in_area_id != null and in_area_id != ''">
+           and ivt.product_area in ${in_area_id}
+        </if>
+        <if test="order_type != null and order_type != ''">
+            and plan.order_type = #{order_type}
+        </if>
+        <if test="product_area != null and product_area != ''">
+            and ivt.product_area = #{product_area}
+        </if>
+        <if test="status != null and status != ''">
+            and plan.status = #{status}
+        </if>
+        <if test="resource_name != null and resource_name != ''">
+            and plan.resource_name LIKE '%${resource_name}%'
+        </if>
+        <if test="parent_container_name != null and parent_container_name != ''">
+            and plan.parent_container_name LIKE '%${parent_container_name}%'
+        </if>
+        <if test="container_name != null and container_name != ''">
+            and plan.container_name LIKE '%${container_name}%'
+        </if>
+        <if test="qzzno != null and qzzno != ''">
+            and plan.qzzno LIKE '%${qzzno}%'
+        </if>
+        <if test="is_parent_ok != null and is_parent_ok != ''">
+            and plan.is_parent_ok  = #{is_parent_ok}
+        </if>
+        <if test="is_child_tz_ok != null and is_child_tz_ok != ''">
+            and plan.is_child_tz_ok  = #{is_child_tz_ok}
+        </if>
+        <if test="is_child_ps_ok != null and is_child_ps_ok != ''">
+            and plan.is_child_ps_ok  = #{is_child_ps_ok}
+        </if>
+        <if test="is_call != null and is_call != ''">
+            and plan.is_call  = #{is_call}
+        </if>
+        <if test="begin_time != null and begin_time != ''">
+            and plan.manufacture_date  >= #{begin_time}
+        </if>
+        <if test="end_time != null and end_time != ''">
+            and #{begin_time} >=  plan.manufacture_date
+        </if>
+    </select>
 </mapper>

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<PdmBiSlittingproductionplan> {
-
+    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;
 }

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<PdmBiSlittingproductionplanMapper, PdmBiSlittingproductionplan> implements IPdmBiSlittingproductionplanService {
 
-    @Autowired
+    @Resource
     private PdmBiSlittingproductionplanMapper pdmBiSlittingproductionplanMapper;
 
+    @Autowired
+    private IUserAreaPermissionService userAreaPermissionService;
+
     @Override
-    public IPage<PdmBiSlittingproductionplan> queryAll(Map whereJson, PageQuery page){
+    public TableDataInfo<Map> queryAll(PdmBiSlittingproductionplanQuery query, PageQuery pageQuery){
-        LambdaQueryWrapper<PdmBiSlittingproductionplan> lam = new LambdaQueryWrapper<>();
+        String in_area_id = userAreaPermissionService.getInArea();
-        IPage<PdmBiSlittingproductionplan> pages = new Page<>(page.getPage() + 1, page.getSize());
+        query.setIn_area_id(in_area_id);
-        pdmBiSlittingproductionplanMapper.selectPage(pages, lam);
+        com.github.pagehelper.Page<Object> page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize());
-        return pages;
+        List<Map> mapList = this.baseMapper.queryAll(query);
+        TableDataInfo<Map> build = TableDataInfo.build(mapList);
+        build.setTotalElements(page.getTotal());
+        return build;
     }
 
     @Override

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;

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();
+    }
 }

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 {

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传智能物流

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.*;
-import org.nl.common.utils.TaskUtils;
 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 Map cutPlanTransfer(JSONObject param) {
-    public JSONObject 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"); // 是否套轴
-
+        String parentContainerName = param.getString("ParentContainerName");
-        WQLObject tab = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan");
+        String restructContainerName = param.getString("RestructContainerName");
-
-        JSONObject result = new JSONObject();
         try {
             // 基础校验
-            if (ObjectUtil.isEmpty(orderType)) {
+            AssertNullUtils.batch(MapOf.of(
-                throw new BadRequestException("分切订单类型不能为空");
+                    "orderType",orderType,"ContainerName",ContainerName,"ProductName",ProductName,
-            }
+                    "Description",Description,"Warehouse",Warehouse,"ResourceName",ResourceName
-            if (ObjectUtil.isEmpty(ContainerName)) {
+                    ,"SplitGroup",SplitGroup,"ManufactureSort",ManufactureSort,"MfgOrderName",MfgOrderName
-                throw new BadRequestException("子卷号不能为空");
+                    ,"ManufactureDate",ManufactureDate,"PaperTubeOrFRP",PaperTubeOrFRP,"SplitBreadth",SplitBreadth
-            }
+                    ,"SplitHeight",SplitHeight,"SplitWeight",SplitWeight));
-            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("子卷理论重量不能为空");
-            }
-
             /*  orderType
              *  1.当订单类型为1（常规）时 ParentContainerName 来源母卷号不能为空
              *  2.当订单类型为2（改制）时 RestructContainerName 改制来源子卷号、PackageBoxSN 子卷立库木箱号 不能为空
              */
             if (StrUtil.equals(orderType, "1")) {
-                if (ObjectUtil.isEmpty(param.getString("ParentContainerName"))) {
+                AssertNullUtils.batch(MapOf.of("parentContainerName", parentContainerName));
-                    throw new BadRequestException("来源母卷号不能为空");
-                }
             } else {
-                if (ObjectUtil.isEmpty(param.getString("RestructContainerName"))) {
+                AssertNullUtils.batch(MapOf.of("restructContainerName", restructContainerName));
-                    throw new BadRequestException("改制来源子卷号不能为空");
-                }
             }
             /*  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"))) {
+                AssertNullUtils.batch(MapOf.of(
-                    throw new BadRequestException("纸筒物料编码不能为空");
+                        "PaperTubeMaterial", param.getString("PaperTubeMaterial"),
-                }
+                        "PaperTubeDescription",param.getString("PaperTubeDescription"),
-                if (ObjectUtil.isEmpty(param.getString("PaperTubeDescription"))) {
+                        "PaperTubeModel",param.getString("PaperTubeModel")));
-                    throw new BadRequestException("纸筒物料描述不能为空");
-                }
-                if (ObjectUtil.isEmpty(param.getString("PaperTubeModel"))) {
-                    throw new BadRequestException("纸筒规格不能为空");
-                }
                 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"))) {
+                AssertNullUtils.batch(MapOf.of(
-                    throw new BadRequestException("FRP管物料编码不能为空");
+                        "FRPMaterial", param.getString("FRPMaterial"),
-                }
+                        "FRPDescription",param.getString("FRPDescription"),
-                if (ObjectUtil.isEmpty(param.getString("FRPDescription"))) {
+                        "FRP管规格不能为空",param.getString("FRP管规格不能为空")));
-                    throw new BadRequestException("FRP管物料描述不能为空");
-                }
-                if (ObjectUtil.isEmpty(param.getString("FRPModel"))) {
-                    throw new BadRequestException("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());
+            packageDo:{
-            json.put("order_type", orderType);
+                json.put("workorder_id", IdUtil.getSnowflake(1, 1).nextId());
-            json.put("container_name", ContainerName);
+                json.put("order_type", orderType);
-            json.put("product_name", ProductName);
+                json.put("container_name", ContainerName);
-            json.put("description", Description);
+                json.put("product_name", ProductName);
-            json.put("parent_container_name", param.getString("ParentContainerName"));
+                json.put("description", Description);
-            json.put("restruct_container_name", param.getString("RestructContainerName"));
+                json.put("parent_container_name", param.getString("ParentContainerName"));
-            json.put("package_box_sn", param.getString("PackageBoxSN"));
+                json.put("restruct_container_name", param.getString("RestructContainerName"));
-            json.put("ware_house", Warehouse);
+                json.put("package_box_sn", param.getString("PackageBoxSN"));
-            json.put("resource_name", ResourceName);
+                json.put("ware_house", Warehouse);
-            json.put("split_group", SplitGroup);
+                json.put("resource_name", ResourceName);
-            json.put("manufacture_sort", ManufactureSort);
+                json.put("split_group", SplitGroup);
-            json.put("mfg_order_name", MfgOrderName);
+                json.put("manufacture_sort", ManufactureSort);
-            json.put("manufacture_date", ManufactureDate);
+                json.put("mfg_order_name", MfgOrderName);
-            json.put("paper_tube_or_FRP", PaperTubeOrFRP);
+                json.put("manufacture_date", ManufactureDate);
-            json.put("paper_tube_material", param.getString("PaperTubeMaterial"));
+                json.put("paper_tube_or_FRP", PaperTubeOrFRP);
-            json.put("paper_tube_description", param.getString("PaperTubeDescription"));
+                json.put("paper_tube_material", param.getString("PaperTubeMaterial"));
-            json.put("paper_tube_model", param.getString("PaperTubeModel"));
+                json.put("paper_tube_description", param.getString("PaperTubeDescription"));
-            json.put("FRP_material", param.getString("FRPMaterial"));
+                json.put("paper_tube_model", param.getString("PaperTubeModel"));
-            json.put("FRP_description", param.getString("FRPDescription"));
+                json.put("FRP_material", param.getString("FRPMaterial"));
-            json.put("FRP_model", param.getString("FRPModel"));
+                json.put("FRP_description", param.getString("FRPDescription"));
-            json.put("split_breadth", SplitBreadth);
+                json.put("FRP_model", param.getString("FRPModel"));
-            json.put("split_height", SplitHeight);
+                json.put("split_breadth", SplitBreadth);
-            json.put("split_weight", SplitWeight);
+                json.put("split_height", SplitHeight);
-            if (Attribute3.equals("U")) {
+                json.put("split_weight", SplitWeight);
-                json.put("up_or_down", "1");
+                if (Attribute3.equals("U")) {
-            } else {
+                    json.put("up_or_down", "1");
-                json.put("up_or_down", "2");
+                } else {
-            }
+                    json.put("up_or_down", "2");
-            if (Attribute4.equals("L")) {
+                }
-                json.put("left_or_right", "1");
+                if (Attribute4.equals("L")) {
-            } else {
+                    json.put("left_or_right", "1");
-                json.put("left_or_right", "2");
+                } else {
-            }
+                    json.put("left_or_right", "2");
-            json.put("qzz_size", qzz_size);
+                }
-            if (ResourceName.startsWith("B5") || ResourceName.startsWith("B6")) {
+                json.put("qzz_size", qzz_size);
-                json.put("is_paper_ok", "1");
+                if (ResourceName.startsWith("B5") || ResourceName.startsWith("B6")) {
-            }
+                    json.put("is_paper_ok", "1");
-            if (Attribute5.equals("0")) {
+                }
-                json.put("is_paper_ok", "2");
+                if (Attribute5.equals("0")) {
-            }
+                    json.put("is_paper_ok", "2");
-            json.put("sale_order_name", Attribute2);
+                }
-            json.put("material_type", Attribute6);
+                json.put("sale_order_name", Attribute2);
-            json.put("start_time", DateUtil.now());
+                json.put("material_type", Attribute6);
-            json.put("status", "01");
+                json.put("start_time", DateUtil.now());
-            json.put("qzz_generation", qzz_generation);
+                json.put("status", "01");
-            json.put("is_parent_ok", "0");
+                json.put("qzz_generation", qzz_generation);
-            json.put("is_child_tz_ok", "0");
+                json.put("is_parent_ok", "0");
-            json.put("is_child_ps_ok", "0");
+                json.put("is_child_tz_ok", "0");
-            json.put("is_delete", "0");
+                json.put("is_child_ps_ok", "0");
-            tab.insert(json);
+                json.put("is_delete", "0");
-
+            }
-            result.put("RTYPE", "S");
+            PdmBiSlittingproductionplan slittingproductionplan = json.toJavaObject(PdmBiSlittingproductionplan.class);
-            result.put("RTMSG", "操作成功!");
+            slittingproductionplanService.save(slittingproductionplan);
-            result.put("RTOAL", 1);
+          return  MapOf.of("RTYPE", "S","RTMSG", "操作成功!","RTOAL", 1,"RTDAT", null);
-            result.put("RTDAT", null);
         } catch (Exception e) {
-            result.put("RTYPE", "E");
+            log.info("MES下发分切计划保存下发失败：-------------------" + e.getMessage());
-            result.put("RTMSG", "操作失败!" + e.getMessage());
+            return  MapOf.of("RTYPE", "E","RTMSG", "操作失败!" + e.getMessage(),"RTOAL", 0,"RTDAT", null);
-            result.put("RTOAL", 0);
-            result.put("RTDAT", null);
         }
-        log.info("cutPlanTransfer接口输出参数为：-------------------" + result.toString());
-        return result;
     }
 
     /**

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("查询分切计划")
-
+    public ResponseEntity<Object> query(PdmBiSlittingproductionplanQuery query, PageQuery page) {
-    //@SaCheckPermission("@el.check('slittingproductionplan:list')")
+        TableDataInfo<Map> queryAll = biSlittingproductionplanService.queryAll(query, page);
-    public ResponseEntity<Object> query(@RequestParam Map whereJson, Pageable page) {
+        return new ResponseEntity<>(queryAll,HttpStatus.OK);
-        return new ResponseEntity<>(slittingproductionplanService.queryAll(whereJson, page), HttpStatus.OK);
     }
 
     @PostMapping

lms/nladmin-system/src/main/resources/logback-spring.xml

@@ -98,8 +98,9 @@ https://juejin.cn/post/6844903775631572999
     <!--开发环境:打印控制台-->
     <springProfile name="dev">
         <root level="info">
-            <appender-ref ref="asyncFileAppender"/>
+            <appender-ref ref="asyncLuceneAppender"/>
             <appender-ref ref="CONSOLE"/>
+
         </root>
         <logger name="jdbc" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>