Browse Source

fixed返捡返回品类错误

hill.liu 8 months ago
parent
commit
dec0f176de

+ 1 - 1
src/main/java/com/sy/coinage/workshop/service/impl/BaseInfoServiceImpl.java

@@ -320,7 +320,7 @@ public class BaseInfoServiceImpl extends ServiceImpl<BaseInfoDao, BaseInfo> impl
         old.setUnpackageStatus(2);
         old.setUnpackageStatus(2);
         old.setUnpackageTime(new Date());
         old.setUnpackageTime(new Date());
         old.setQty(old.getQty() - req.getQty());
         old.setQty(old.getQty() - req.getQty());
-        if (isSub) {
+        if (!isSub) {
             old.setCrownBetween(old.getCrownPrefix() + old.getCrownFrom() + " 至 "
             old.setCrownBetween(old.getCrownPrefix() + old.getCrownFrom() + " 至 "
                     + old.getCrownPrefix() + old.getCrownTo());
                     + old.getCrownPrefix() + old.getCrownTo());
         } else {
         } else {

+ 1 - 1
src/main/java/com/sy/coinage/workshop/service/impl/CheckServiceImpl.java

@@ -494,7 +494,7 @@ public class CheckServiceImpl extends ServiceImpl<CheckDao, Check> implements IC
     public List<BaseInfo> securitiesOpt() {
     public List<BaseInfo> securitiesOpt() {
         LambdaQueryWrapper<BaseInfo> queryWrapper = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<BaseInfo> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(BaseInfo::getStatus, 4);
         queryWrapper.eq(BaseInfo::getStatus, 4);
-        queryWrapper.groupBy(BaseInfo::getStatus);
+        queryWrapper.groupBy(BaseInfo::getSecuritiesId,BaseInfo::getStatus);
         return this.baseInfoService.list(queryWrapper);
         return this.baseInfoService.list(queryWrapper);
     }
     }