diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java index 55377e41..72858f83 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/ComponentPackingController.java @@ -190,9 +190,6 @@ public class ComponentPackingController { List daVos = tasks.stream() .map(item -> Convert.convert(ComponentPackingItemPdaVO.class, item)) .collect(Collectors.toList()); - daVos.forEach(vo -> { - vo.setFactoryNo(packing.getFactoryNo()); - }); return ApiResult.success(daVos); } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ComponentPackingItemPdaVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ComponentPackingItemPdaVO.java index 0fa94d69..a6b38457 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ComponentPackingItemPdaVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ComponentPackingItemPdaVO.java @@ -53,9 +53,4 @@ public class ComponentPackingItemPdaVO { public BigDecimal getRemainQty() { return menge.subtract(outQty); } - - /** - * 工厂 - */ - private String factoryNo; } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ComponentPackingPdaVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ComponentPackingPdaVO.java index ee0a3973..1c5454d7 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ComponentPackingPdaVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/ComponentPackingPdaVO.java @@ -42,4 +42,9 @@ public class ComponentPackingPdaVO { * 设备名称 */ private String maktx; + + /** + * 工厂 + */ + private String factoryNo; } diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsComponentPackingMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsComponentPackingMapper.xml index 5c412a41..99255edb 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsComponentPackingMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsComponentPackingMapper.xml @@ -37,7 +37,7 @@