diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/BstIvtPackageinfoivt.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/BstIvtPackageinfoivt.java index fac1b0812..6970892ad 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/BstIvtPackageinfoivt.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/BstIvtPackageinfoivt.java @@ -136,10 +136,25 @@ public class BstIvtPackageinfoivt extends Model { private String plan; /** - * 规划 + * 所属等待点 */ private String wait_point_type; + /** + * 排 + */ + private String row_num; + + /** + * 列 + */ + private String col_num; + + /** + * 深浅位 + */ + private String depth; + /** * 获取主键值 * diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java index 5057a7640..9d13409d6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java @@ -422,7 +422,7 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl().eq(BstIvtPackageinfoivt::getContainer_name, whereJson.getString("container_name"))); if (dto == null) { result.put("status", org.springframework.http.HttpStatus.BAD_REQUEST.value()); - result.put("message", "不存在该数据!"); + result.put("message", "子卷号有误,请核对是否存在!"); return result; } dto.setIvt_status(whereJson.getString("ivt_status")); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBussManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBussManageServiceImpl.java index acb269bd8..3385a6513 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBussManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/OutBussManageServiceImpl.java @@ -301,7 +301,7 @@ public class OutBussManageServiceImpl implements OutBussManageService { .qty_unit_id(jsonUnit.getLongValue("measure_unit_id")) .qty_unit_name(jsonUnit.getString("unit_name")) .plan_qty(jsonIvt.getBigDecimal("canuse_qty")) - .real_qty(jsonIvt.getBigDecimal("real_qty")) + .real_qty(jsonIvt.getBigDecimal("canuse_qty")) .work_status(work_status) .box_no(jsonSub.getString("package_box_sn")) .build(); diff --git a/lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue b/lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue index c406f6ecb..5eaf298d1 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue @@ -39,7 +39,7 @@ > - +