bug修改

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/order/OrderDO.java

@@ -107,10 +107,10 @@ public class OrderDO extends BaseDO {
      * 备注
      */
     private String remark;
-    /**
+//    /**
-     * 是否删除
+//     * 是否删除
-     */
+//     */
-    private Boolean deleted;
+//    private Boolean deleted;
 
     /**
      * 自定义板编号配置id

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderBody/OrderBodyDO.java

@@ -78,8 +78,8 @@ public class OrderBodyDO extends BaseDO {
      * 备注
      */
     private String remark;
-    /**
+//    /**
-     * 是否删除
+//     * 是否删除
-     */
+//     */
-    private Boolean deleted;
+//    private Boolean deleted;
 }

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderGroup/OrderGroupDO.java

@@ -79,9 +79,9 @@ public class OrderGroupDO extends BaseDO {
      * 备注
      */
     private String remark;
-    /**
+//    /**
-     * 是否删除
+//     * 是否删除
-     */
+//     */
-    private Boolean deleted;
+//    private Boolean deleted;
 
 }

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/orderParts/OrderPartsDO.java

@@ -102,9 +102,9 @@ public class OrderPartsDO extends BaseDO {
      * 备注
      */
     private String remark;
-    /**
+//    /**
-     * 是否删除
+//     * 是否删除
-     */
+//     */
-    private Boolean deleted;
+//    private Boolean deleted;
 
 }

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/plate/PlateDO.java

@@ -185,10 +185,10 @@ public class PlateDO extends BaseDO {
      * 是否作废
      */
     private Boolean isCancel;
-    /**
+//    /**
-     * 是否删除
+//     * 是否删除
-     */
+//     */
-    private Boolean deleted;
+//    private Boolean deleted;
 
     private String customPlateNo;
 

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/process/OrderProcessDO.java

@@ -57,9 +57,9 @@ public class OrderProcessDO extends BaseDO {
      * 下一工序 ID
      */
     private Long nextStepId;
-    /**
+//    /**
-     * 是否删除
+//     * 是否删除
-     */
+//     */
-    private Boolean deleted;
+//    private Boolean deleted;
 
 }

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/processStep/ProcessStepDO.java

@@ -90,9 +90,9 @@ public class ProcessStepDO extends BaseDO {
      * 工序处理日期
      */
     private LocalDateTime processDate;
-    /**
+//    /**
-     * 是否删除
+//     * 是否删除
-     */
+//     */
-    private Boolean deleted;
+//    private Boolean deleted;
 
 }

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/dataobject/rawgoods/RawGoodsDO.java

@@ -71,9 +71,9 @@ public class RawGoodsDO extends BaseDO {
      * 规格
      */
     private String spec;
-    /**
+//    /**
-     * 是否删除
+//     * 是否删除
-     */
+//     */
-    private Boolean deleted;
+//    private Boolean deleted;
 
 }

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java

@@ -822,7 +822,21 @@ public class OrderServiceImpl implements OrderService {
             } else if (plateGoodDOS != null && !plateGoodDOS.isEmpty()) { // 存在板材
                 goodsDO.setGoodsId(plateGoodDOS.get(0).getGoodsId());
             } else { // 不存在板材
-                throw exception(ORDER_MATCH_NOT);
+//                throw exception(ORDER_MATCH_NOT);
+                long plateNo = idWorker.nextId();
+                long obtainingTime = idWorker.obtainingTime();
+
+                String goodsId = goodsDO.getGoodsId() == null ? (obtainingTime) + Long.toString(plateNo).substring(2) : goodsDO.getGoodsId();
+                goodsDO.setGoodsId(goodsId);
+
+
+                Long plateGoods = (Long) identifierGenerator.nextId(null);
+
+                plateGoodDO = BeanUtils.toBean(goodsDO, PlateGoodDO.class)
+                        .setId(plateGoods)
+                        .setGoodsId(goodsId);
+
+                plateGoodLists.add(plateGoodDO);
             }
 
         }

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/parts/PartsController.java

@@ -121,6 +121,7 @@ public class PartsController {
             @Parameter(name = "updateSupport", description = "是否支持更新", example = "true"),
             @Parameter(name = "organId", description = "配件所属组织ID")
     })
+    @OperateLog(type = IMPORT)
     @PreAuthorize("@ss.hasAnyPermissions('system:accessory:import','base:accessory:import')")
     public void importExcel(@RequestParam("file") MultipartFile file,
                             @RequestParam(value = "updateSupport", required = false, defaultValue = "false") Boolean updateSupport,
@@ -152,4 +153,12 @@ public class PartsController {
         return success(BeanUtils.toBean(pageResult, PartsRespVO.class));
     }
 
+    @GetMapping("/all")
+    @Operation(summary = "获取全部配件信息")
+    @PreAuthorize("@ss.hasAnyPermissions('manage:plate:query','base:plate:query')")
+    public CommonResult<List<PartsRespVO>> getPlateAll(@RequestParam("organId") Long organId,
+                                                       @RequestParam("category") String category) {
+        List<PartsDO> list = partsService.getPartAll(organId,category);
+        return success(BeanUtils.toBean(list, PartsRespVO.class));
+    }
 }

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/plate/PlateController.java

@@ -145,6 +145,7 @@ public class PlateController {
             @Parameter(name = "updateSupport", description = "是否支持更新，默认为 false", example = "true"),
             @Parameter(name = "organId", description = "板材所属组织ID")
     })
+    @OperateLog(type = IMPORT)
 //    @PreAuthorize("@ss.hasPermission('manage:plate:import')")
     @PreAuthorize("@ss.hasAnyPermissions('manage:plate:import','base:plate:import')")
     public void importExcel(@RequestParam("file") MultipartFile file,
@@ -171,4 +172,13 @@ public class PlateController {
 //        plateExcelUtil.clear();
     }
 
+
+    @GetMapping("/all")
+    @Operation(summary = "获取全部板材信息")
+    @PreAuthorize("@ss.hasAnyPermissions('manage:plate:query','base:plate:query')")
+    public CommonResult<List<PlateRespVO>> getPlateAll(@RequestParam("organId") Long organId) {
+        List<PlateDO> list = plateService.getPlateAll(organId);
+        return success(BeanUtils.toBean(list, PlateRespVO.class));
+    }
+
 }

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/parts/PartsMapper.java

@@ -9,6 +9,8 @@ import com.cf.imes.module.manage.dal.dataobject.parts.PartsDO;
 
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 配件表 parts_{N} Mapper
  *
@@ -172,4 +174,10 @@ public interface PartsMapper extends BaseMapperX<PartsDO> {
         return selectPage(reqVO, queryWrapper);
     }
 
+    default List<PartsDO> getAllByOrganId(Long organId, String category) {
+        return selectList(new LambdaQueryWrapperX<PartsDO>()
+                .eq(PartsDO::getOrganId, organId)
+                .eq(PartsDO::getCategory, category)
+                .eq(PartsDO::getDeleted, 0));
+    }
 }

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/plate/PlateMapper.java

@@ -9,6 +9,8 @@ import com.cf.imes.module.manage.dal.dataobject.plate.PlateDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 板材信息表 plate_{N} Mapper
  *
@@ -91,4 +93,10 @@ public interface PlateMapper extends BaseMapperX<PlateDO> {
                 .eq(PlateDO::getGoodsId, goodId)
                 .eq(PlateDO::getOrganId, organId)) > 0;
     }
+
+    default List<PlateDO> getAllByOrganId(Long organId) {
+        return selectList(new LambdaQueryWrapper<PlateDO>()
+                .eq(PlateDO::getOrganId, organId)
+                .eq(PlateDO::getDeleted, 0));
+    }
 }

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/parts/PartsService.java

@@ -84,4 +84,6 @@ public interface PartsService {
         return applicationHome.getDir().getAbsolutePath() + File.separator + "type";
 
     }
+
+    List<PartsDO> getPartAll(Long organId, String category);
 }

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/parts/PartsServiceImpl.java

@@ -208,6 +208,12 @@ public class PartsServiceImpl implements PartsService {
         }
     }
 
+    @Override
+    public List<PartsDO> getPartAll(Long organId, String category) {
+        organId = getOrganId(BASE_PARTS_QUERY_PERMISSION, getLoginUser().getId(), organId);
+        return partsMapper.getAllByOrganId(organId , category);
+    }
+
     private void validateOrganExists(Long organId) {
         CommonResult<Boolean> index = organApi.validOrgan(organId);
         if (!index.isSuccess()) {

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateExcelListener.java

@@ -30,7 +30,7 @@ public final class PlateExcelListener<T> extends ExcelListener<PlateImportExcelV
     @Override
     public void invoke(PlateImportExcelVO data, AnalysisContext context) {
         if (!data.isValidGoods()) {//返回false，表示商品信息无效；否则返回true，表示商品信息有效
-            data.setResult("商品关键信息缺少");
+            data.setResult("板材【*】信息请填写完整");
             this.flag = false;
         }
         checkData(data.getHeight(),"高度",data);
@@ -41,13 +41,22 @@ public final class PlateExcelListener<T> extends ExcelListener<PlateImportExcelV
         }
         checkData(data.getPrice(),"价格",data);
         checkTexture(data.getTexture(),"纹理",data);
+//        字段长度判断
+        checkLength(data.getGoodsId(),"物料编号",data,32);
+        checkLength(data.getGoodsName(),"物料名称",data,64);
+        checkLength(data.getMaterial(),"材质",data,64);
+        checkLength(data.getColor(),"颜色",data,32);
+        checkLength(data.getSpec(),"规格",data,64);
+        checkLength(data.getBrand(),"品牌",data,64);
+        checkLength(data.getRemark(),"备注",data,255);
+
         if (data.getResult() != null)
             data.setResult(data.getResult().replace("null,", ""));
         valueMap.put(context.getCurrentRowNum(), data.getResult());
         datas.add(data);
     }
 
-    //    错误判断
+//    错误判断
     private void checkData(String valueCheck, String head, PlateImportExcelVO data) {
 //        长宽厚、价格判断非空
         if (valueCheck == null || valueCheck.equals("")) {
@@ -68,10 +77,7 @@ public final class PlateExcelListener<T> extends ExcelListener<PlateImportExcelV
 
     private void checkTexture(String valueCheck, String head, PlateImportExcelVO data) {
 
-        if (valueCheck == null || valueCheck.equals("")) {
+        if (valueCheck != null && !valueCheck.equals("")) {
-            this.flag = false;
-            data.setResult(data.getResult() + "," + head + "信息缺少");
-        } else {
             String value = valueCheck.trim();
             if (!value.equals("有") && !value.equals("无")) {
                 this.flag = false;
@@ -83,6 +89,20 @@ public final class PlateExcelListener<T> extends ExcelListener<PlateImportExcelV
             }
         }
     }
+
+
+    /**
+     * 字段长度判断
+     */
+    private void checkLength(String valueCheck, String head, PlateImportExcelVO data, int maxLength) {
+        if (valueCheck != null && !valueCheck.equals("")) {
+            if (valueCheck.length() > maxLength) {
+                this.flag = false;
+                data.setResult(data.getResult() + "," + head + "信息有误");
+            }
+        }
+    }
+
     /**
      * 读取完后操作
      *

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateService.java

@@ -88,4 +88,6 @@ public interface PlateService {
         return applicationHome.getDir().getAbsolutePath() + File.separator + "type";
 
     }
+
+    List<PlateDO> getPlateAll(Long organId);
 }

cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/service/plate/PlateServiceImpl.java

@@ -150,13 +150,18 @@ public class PlateServiceImpl implements PlateService {
             PlateDO existPlate = plateMapper.selectByGoodID(importPlate.getGoodsId(), finalOrganId);
             if (existPlate == null) {
                 respVO.getCreatePlateNames().add(importPlate.getGoodsName());
-                insertList.add(BeanUtils.toBean(importPlate, PlateDO.class).setOrganId(finalOrganId).setTexture(Boolean.valueOf(importPlate.getTexture())));
+                insertList.add(BeanUtils.toBean(importPlate, PlateDO.class)
+                        .setOrganId(finalOrganId));
+//                        .setTexture(Boolean.valueOf(importPlate.getTexture()));
                 return;
             }
             // 判断是否允许更新
             if (!isUpdateSupport) {
                 respVO.getFailurePlateNames().put(importPlate.getGoodsName(), ErrorCodeConstants.PLATE_EXISTS.getMsg());
-                PlateDO plateDO = BeanUtils.toBean(importPlate, PlateDO.class).setOrganId(finalOrganId).setId(existPlate.getId()).setTexture(Boolean.valueOf(importPlate.getTexture()));
+                PlateDO plateDO = BeanUtils.toBean(importPlate, PlateDO.class)
+                        .setOrganId(finalOrganId)
+                        .setId(existPlate.getId());
+//                        .setTexture(Boolean.valueOf(importPlate.getTexture()));
                 updateList.add(plateDO);
             }
         });
@@ -177,6 +182,12 @@ public class PlateServiceImpl implements PlateService {
         FileHelperUtil.getFile(rootPath, response, value);
     }
 
+    @Override
+    public List<PlateDO> getPlateAll(Long organId) {
+        organId = getOrganId(BASE_PLATE_QUERY_PERMISSION, getLoginUser().getId(), organId);
+        return plateMapper.getAllByOrganId( organId);
+    }
+
     private void validateOrganExists(Long organId) {
         CommonResult<Boolean> index = organApi.validOrgan(organId);
         if (!index.isSuccess()) {