diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java index 990567f34..85bc7fd15 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -188,8 +188,8 @@ public class InvWarehouseController extends BaseController { if (!"".equals(invWarehouseEntity.getParentCode())) { invWarehouseEntities1.add(invWarehouseEntity); } - //领用仓库选择手术室的话,可以领用上一级中心库的产品 - if (filterInvWarehouseRequest.getLocInvCode().equals("1002000") && invWarehouseEntity.getCode().equals("1000000")) { + //领用仓库选择二级仓库的话,可以领用上一级中心库的产品 + if (!filterInvWarehouseRequest.getLocInvCode().equals("1000000") && invWarehouseEntity.getCode().equals("1000000")) { invWarehouseEntities1.add(invWarehouseEntity); } } diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java index 8f79efd2a..ce6e4d1a2 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java @@ -171,6 +171,8 @@ public class IoOrderDetailBizResponse { private String checkColdFileName; + private String zczbhhzbapzbh; + diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderDetailServiceImpl.java index cccf3d0e5..3c91f3fca 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderDetailServiceImpl.java @@ -107,7 +107,7 @@ public class InvMAOrderDetailServiceImpl implements InvMAOrderDetailService { invMAOrderDetailEntity.setCreateTime(new Date()); invMAOrderDetailDao.insert(invMAOrderDetailEntity); } else { - return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "当前仓库中不存在此产品,无法进行养护!"); + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "当前货位中不存在此产品,无法进行养护!"); } } return ResultVOUtils.success("添加库存养护详情成功!"); diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml index 3a03df330..24abc9a04 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml @@ -2,7 +2,7 @@ diff --git a/src/main/resources/mybatis/mapper/purchase/SupCertRemindMsgDao.xml b/src/main/resources/mybatis/mapper/purchase/SupCertRemindMsgDao.xml index 24f357afc..aa78abd52 100644 --- a/src/main/resources/mybatis/mapper/purchase/SupCertRemindMsgDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/SupCertRemindMsgDao.xml @@ -4,7 +4,7 @@ select m.*, c.companyName `name`, - (select `name` from sup_cert s where s.code = m.code and s.manufacturerIdFk = m.idFk) certName + (select `name` from sup_cert s where s.code = m.code and s.manufacturerIdFk = m.idFk limit 1) certName from sup_cert_remind_msg m - left join sup_manufacturer c on m.idFk = c.customerId + left join sup_manufacturer c on m.idFk = c.manufacturerId AND c.companyName like concat('%', #{name}, '%') @@ -69,4 +69,4 @@ order by m.updateTime desc - \ No newline at end of file +