diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStHrBcpInServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStHrBcpInServiceImpl.java index 81e049e6..d2a44efa 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStHrBcpInServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/pda/service/impl/PdaStHrBcpInServiceImpl.java @@ -136,7 +136,7 @@ public class PdaStHrBcpInServiceImpl implements PdaStHrBcpInService { double weight = NumberUtil.div(NumberUtil.mul(materDao.getNet_weight().doubleValue(), whereJson.getDoubleValue("qty")), 1000); dao.setWeight(BigDecimal.valueOf(weight)); dao.setQty(whereJson.getBigDecimal("qty")); - dao.setType(IOSEnum.IO_TYPE.check("入库")); + dao.setType(IOSEnum.IO_TYPE.code("入库")); dao.setIs_delete(false); dao.setCreate_time(DateUtil.now()); dao.setBiz_date(DateUtil.today()); diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/dao/mapper/xml/StIvtIostorinvHrBcpMapper.xml b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/dao/mapper/xml/StIvtIostorinvHrBcpMapper.xml index 725f1593..4722274b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/dao/mapper/xml/StIvtIostorinvHrBcpMapper.xml +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/dao/mapper/xml/StIvtIostorinvHrBcpMapper.xml @@ -9,7 +9,7 @@ mater.material_spec, task.task_code, task.task_status, - ROUND(dtl.plan_qty / dtl.unit_weight,3 ) AS qty + ROUND((dtl.plan_qty * dtl.unit_weight) / 1000,3 ) AS qty FROM st_ivt_iostorinv_hr_bcp dtl LEFT JOIN md_me_materialbase mater ON mater.material_id = dtl.material_id diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/impl/StIvtIostorinvHrBcpInServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/impl/StIvtIostorinvHrBcpInServiceImpl.java index 24a1a325..fe86a042 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/impl/StIvtIostorinvHrBcpInServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/semimanagehr/service/iostorInv/impl/StIvtIostorinvHrBcpInServiceImpl.java @@ -473,7 +473,7 @@ public class StIvtIostorinvHrBcpInServiceImpl extends ServiceImpl - - + + - + diff --git a/mes/qd/src/views/wms/storage_manage/semiproducthr/semiproductIvthrFlow/index.vue b/mes/qd/src/views/wms/storage_manage/semiproducthr/semiproductIvthrFlow/index.vue index 76eb7db2..12a53500 100644 --- a/mes/qd/src/views/wms/storage_manage/semiproducthr/semiproductIvthrFlow/index.vue +++ b/mes/qd/src/views/wms/storage_manage/semiproducthr/semiproductIvthrFlow/index.vue @@ -133,8 +133,8 @@ - - + + diff --git a/mes/qd/src/views/wms/storage_manage/semiproducthr/semiproducthrIn/AddDialog.vue b/mes/qd/src/views/wms/storage_manage/semiproducthr/semiproducthrIn/AddDialog.vue index d7a62801..27d5d0fe 100644 --- a/mes/qd/src/views/wms/storage_manage/semiproducthr/semiproducthrIn/AddDialog.vue +++ b/mes/qd/src/views/wms/storage_manage/semiproducthr/semiproducthrIn/AddDialog.vue @@ -100,7 +100,7 @@ - + - + - +