diff --git a/src/main/java/com/gaotao/modules/propertyChange/controller/PropertyChangeController.java b/src/main/java/com/gaotao/modules/propertyChange/controller/PropertyChangeController.java index 64de135..8947446 100644 --- a/src/main/java/com/gaotao/modules/propertyChange/controller/PropertyChangeController.java +++ b/src/main/java/com/gaotao/modules/propertyChange/controller/PropertyChangeController.java @@ -56,7 +56,7 @@ public class PropertyChangeController { Map stockInfo = propertyChangeService.getStockInfoByLabelCode(labelCode.trim(), site.trim(), warehouseId.trim()); if (stockInfo == null) { - return R.error("未找到该标签的库存信息,请检查标签条码是否正确或该标签是否在库"); + return R.error("标签不存在!"); } logger.info("获取库存信息成功,标签条码: {}", labelCode); @@ -101,18 +101,21 @@ public class PropertyChangeController { // 检查是否有变动内容 String newLocationId = (String) params.get("newLocationId"); + String newStatus = (String) params.get("newStatus"); String newProductionDate = (String) params.get("newProductionDate"); String newExpiryDate = (String) params.get("newExpiryDate"); String oldLocationId = (String) params.get("oldLocationId"); + String oldStatus = (String) params.get("oldStatus"); String oldProductionDate = (String) params.get("oldProductionDate"); String oldExpiryDate = (String) params.get("oldExpiryDate"); boolean hasLocationChange = newLocationId != null && !newLocationId.trim().isEmpty() && !newLocationId.equals(oldLocationId); + boolean hasStatusChange = newStatus != null && !newStatus.trim().isEmpty() && !newStatus.equals(oldStatus); boolean hasProductionDateChange = newProductionDate != null && !newProductionDate.trim().isEmpty() && !newProductionDate.equals(oldProductionDate); boolean hasExpiryDateChange = newExpiryDate != null && !newExpiryDate.trim().isEmpty() && !newExpiryDate.equals(oldExpiryDate); - if (!hasLocationChange && !hasProductionDateChange && !hasExpiryDateChange) { + if (!hasLocationChange && !hasStatusChange && !hasProductionDateChange && !hasExpiryDateChange) { return R.error("没有检测到属性变动,请修改后再提交"); } diff --git a/src/main/java/com/gaotao/modules/propertyChange/service/impl/PropertyChangeServiceImpl.java b/src/main/java/com/gaotao/modules/propertyChange/service/impl/PropertyChangeServiceImpl.java index 4b66fdb..74496a0 100644 --- a/src/main/java/com/gaotao/modules/propertyChange/service/impl/PropertyChangeServiceImpl.java +++ b/src/main/java/com/gaotao/modules/propertyChange/service/impl/PropertyChangeServiceImpl.java @@ -80,10 +80,12 @@ public class PropertyChangeServiceImpl extends ServiceImpl 0 @@ -39,6 +40,9 @@ location_id = #{params.newLocationId}, + + status = #{params.newStatus}, + manufacture_date = #{params.newProductionDate},