opt:修改单重计算;
This commit is contained in:
@@ -583,7 +583,7 @@ public class MdGruopDickServiceImpl extends ServiceImpl<MdGruopDickMapper, MdGru
|
|||||||
+ "在ERP系统上检索不到相关物料信息,请检查!"
|
+ "在ERP系统上检索不到相关物料信息,请检查!"
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
r.setSingle_weight(materialInfo.getSingle_weight());
|
r.setSingle_weight(materialInfo.getNet_weight());
|
||||||
}
|
}
|
||||||
//过滤出需要称重校验的物料(单重 > 0)
|
//过滤出需要称重校验的物料(单重 > 0)
|
||||||
List<MdPbVehicleMaterVo> validItems = item.stream()
|
List<MdPbVehicleMaterVo> validItems = item.stream()
|
||||||
|
|||||||
@@ -468,8 +468,10 @@ public class SyncErpBillsScheduleService {
|
|||||||
if (netWeightGet.compareTo(BigDecimal.ZERO) > 0 && assistUint.contains("kg")) {
|
if (netWeightGet.compareTo(BigDecimal.ZERO) > 0 && assistUint.contains("kg")) {
|
||||||
BigDecimal newWeightGet = netWeightGet.multiply(new BigDecimal(1000));
|
BigDecimal newWeightGet = netWeightGet.multiply(new BigDecimal(1000));
|
||||||
materialBase.setNet_weight(newWeightGet);
|
materialBase.setNet_weight(newWeightGet);
|
||||||
|
materialBase.setNearby_weight(newWeightGet);
|
||||||
} else {
|
} else {
|
||||||
materialBase.setNet_weight(netWeightGet);
|
materialBase.setNet_weight(netWeightGet);
|
||||||
|
materialBase.setNearby_weight(netWeightGet);
|
||||||
}
|
}
|
||||||
materialBase.setPrint_no(formData.getPcsn());
|
materialBase.setPrint_no(formData.getPcsn());
|
||||||
if (materialInfo != null) {
|
if (materialInfo != null) {
|
||||||
@@ -479,6 +481,8 @@ public class SyncErpBillsScheduleService {
|
|||||||
.set(MdMeMaterialbase::getMaterial_spec, m_spec)
|
.set(MdMeMaterialbase::getMaterial_spec, m_spec)
|
||||||
.set(MdMeMaterialbase::getQty_unit_id, m_unit)
|
.set(MdMeMaterialbase::getQty_unit_id, m_unit)
|
||||||
.set(MdMeMaterialbase::getAssist_unit_id, assistUint)
|
.set(MdMeMaterialbase::getAssist_unit_id, assistUint)
|
||||||
|
.set(MdMeMaterialbase::getNet_weight, materialBase.getNet_weight())
|
||||||
|
.set(MdMeMaterialbase::getNearby_weight, materialBase.getNearby_weight())
|
||||||
.set(MdMeMaterialbase::getPrint_no, formData.getPcsn())
|
.set(MdMeMaterialbase::getPrint_no, formData.getPcsn())
|
||||||
.set(MdMeMaterialbase::getUpdate_time, DateUtil.now())
|
.set(MdMeMaterialbase::getUpdate_time, DateUtil.now())
|
||||||
.set(MdMeMaterialbase::getEnglish_name, "id变更前id:" + materialInfo.getMaterial_id())
|
.set(MdMeMaterialbase::getEnglish_name, "id变更前id:" + materialInfo.getMaterial_id())
|
||||||
|
|||||||
Reference in New Issue
Block a user