diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java index cbe6bce0d..e37c1a777 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java @@ -2,6 +2,7 @@ package org.nl.b_lms.pdm.subpackagerelation.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; @@ -374,7 +375,7 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl entityList, BstIvtBoxinfo boxDao, String totalWeight) { UpdateWrapper updateWrapper = new UpdateWrapper<>(); //理论毛重 - updateWrapper.set("box_weight", totalWeight); + updateWrapper.set("box_weight", NumberUtil.round(totalWeight, 2).toString()); updateWrapper.set("package_box_sn", boxDao.getBox_no()); updateWrapper.set("quanlity_in_box", entityList.size()); updateWrapper.set("box_type", boxDao.getMaterial_code()); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index cf7c2622d..4ef187855 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -2341,7 +2341,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { String subVolume = param.getString("sub_volume"); String weight = param.getString("weight1"); LambdaUpdateWrapper updateWrapper = new UpdateWrapper().lambda(); - updateWrapper.set(PdmBiSlittingproductionplan::getWeight, weight) + updateWrapper.set(PdmBiSlittingproductionplan::getWeight, NumberUtil.round(weight, 2).toString()) .eq(PdmBiSlittingproductionplan::getContainer_name, subVolume); boolean update = slittingproductionplanService.update(updateWrapper); if (update) { @@ -2369,7 +2369,10 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { String isUncap = "1"; JSONObject vehicle_info = WQLObject.getWQLObject("md_pb_storagevehicleext").query("storagevehicle_code = '" + material_barcode + "'").uniqueResult(0); if (ObjectUtil.isEmpty(vehicle_info)) { - throw new BadRequestException("未查询到载具号【" + vehicle_code + "】对应的载具信息!"); + vehicle_info = WQLObject.getWQLObject("md_pb_storagevehicleext").query("storagevehicle_code = '" + vehicle_code + "'").uniqueResult(0); + if (ObjectUtil.isEmpty(vehicle_info)){ + throw new BadRequestException("未查询到载具号【" + vehicle_code + "】对应的载具信息!"); + } } material_barcode = vehicle_info.getString("pcsn"); // 查询木箱信息