From 7fe2550fefcccddec9c6c35a3850ce80a15094d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=81=92=E6=9D=B0?= <2658502433@qq.com> Date: Thu, 19 Sep 2024 11:08:48 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=84=E5=B1=9E=E5=B1=9E=E6=80=A7=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/BaseProductAttachedServiceImpl.java | 80 +++++++++---------- .../mapper/wms/BaseProductAttachedMapper.xml | 4 +- 2 files changed, 43 insertions(+), 41 deletions(-) diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/BaseProductAttachedServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/BaseProductAttachedServiceImpl.java index 3c2e32f5..6fe9eea9 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/BaseProductAttachedServiceImpl.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/BaseProductAttachedServiceImpl.java @@ -216,46 +216,46 @@ public class BaseProductAttachedServiceImpl implements IBaseProductAttachedServi // if (productAttached.getSprayWay().isEmpty() || productAttached.getSprayWay()==null){ // return error(500, "喷药方式不能为空!信息导入失败!"); // } - //白坯直径 - if (productAttached.getBlankDiameter().toString().isEmpty() || productAttached.getBlankDiameter()==null){ - return error(500, "白坯直径不能为空!信息导入失败!"); - } - //白坯物料号 - if (productAttached.getBlankNo().isEmpty() || productAttached.getBlankNo()==null){ - return error(500, "白坯物料号不能为空!信息导入失败!"); - } - //标准喷药量 - if (productAttached.getSprayVolume().toString().isEmpty() || productAttached.getSprayVolume()==null){ - return error(500, "标准喷药量不能为空!信息导入失败!"); - } - //药液料号 - if (productAttached.getLiquidNo().isEmpty() || productAttached.getLiquidNo()==null){ - return error(500, "药液料号不能为空!信息导入失败!"); - } - //标准内膜用量 - if (productAttached.getEndometrialDosage().toString().isEmpty() || productAttached.getEndometrialDosage()==null){ - return error(500, "标准内膜用量不能为空!信息导入失败!"); - } - //标准外膜用量 - if (productAttached.getOuterFilmDosage().toString().isEmpty() || productAttached.getOuterFilmDosage()==null){ - return error(500, "标准外膜用量不能为空!信息导入失败!"); - } - //支架 - if (productAttached.getSupport().toString().isEmpty() || productAttached.getSupport()==null){ - return error(500, "支架不能为空!信息导入失败!"); - } - //支架物料号 - if (productAttached.getSupportNo().isEmpty() || productAttached.getSupportNo()==null){ - return error(500, "支架物料号不能为空!信息导入失败!"); - } - //吸塑 - if (productAttached.getPvc().toString().isEmpty() || productAttached.getPvc()==null){ - return error(500, "吸塑不能为空!信息导入失败!"); - } - //支架盘 - if (productAttached.getSupportPlate().toString().isEmpty() || productAttached.getSupportPlate()==null){ - return error(500, "支架盘不能为空!信息导入失败!"); - } +// //白坯直径 +// if (productAttached.getBlankDiameter().toString().isEmpty() || productAttached.getBlankDiameter()==null){ +// return error(500, "白坯直径不能为空!信息导入失败!"); +// } +// //白坯物料号 +// if (productAttached.getBlankNo().isEmpty() || productAttached.getBlankNo()==null){ +// return error(500, "白坯物料号不能为空!信息导入失败!"); +// } +// //标准喷药量 +// if (productAttached.getSprayVolume().toString().isEmpty() || productAttached.getSprayVolume()==null){ +// return error(500, "标准喷药量不能为空!信息导入失败!"); +// } +// //药液料号 +// if (productAttached.getLiquidNo().isEmpty() || productAttached.getLiquidNo()==null){ +// return error(500, "药液料号不能为空!信息导入失败!"); +// } +// //标准内膜用量 +// if (productAttached.getEndometrialDosage().toString().isEmpty() || productAttached.getEndometrialDosage()==null){ +// return error(500, "标准内膜用量不能为空!信息导入失败!"); +// } +// //标准外膜用量 +// if (productAttached.getOuterFilmDosage().toString().isEmpty() || productAttached.getOuterFilmDosage()==null){ +// return error(500, "标准外膜用量不能为空!信息导入失败!"); +// } +// //支架 +// if (productAttached.getSupport().toString().isEmpty() || productAttached.getSupport()==null){ +// return error(500, "支架不能为空!信息导入失败!"); +// } +// //支架物料号 +// if (productAttached.getSupportNo().isEmpty() || productAttached.getSupportNo()==null){ +// return error(500, "支架物料号不能为空!信息导入失败!"); +// } +// //吸塑 +// if (productAttached.getPvc().toString().isEmpty() || productAttached.getPvc()==null){ +// return error(500, "吸塑不能为空!信息导入失败!"); +// } +// //支架盘 +// if (productAttached.getSupportPlate().toString().isEmpty() || productAttached.getSupportPlate()==null){ +// return error(500, "支架盘不能为空!信息导入失败!"); +// } //库检周期 if (productAttached.getWarehouseCycle().isEmpty() || productAttached.getSupportPlate()==null){ return error(500, "库检周期不能为空!信息导入失败!"); diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductAttachedMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductAttachedMapper.xml index 7e0496d2..89abc616 100644 --- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductAttachedMapper.xml +++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseProductAttachedMapper.xml @@ -159,7 +159,9 @@ man_standar = #{manStandar}, warehouse_cycle = #{warehouseCycle}, pallet_num = #{palletNum}, - pack_type = #{packType} + pack_type = #{packType}, + category=#{category}, + other=#{other} where id = #{id}