|
@@ -442,7 +442,7 @@ public class BaseInfoServiceImpl extends ServiceImpl<BaseInfoDao, BaseInfo> impl
|
|
|
public void print(Integer id, CacheUserVO user) {
|
|
|
|
|
|
LambdaUpdateWrapper<BaseInfo> updateWrapper = new LambdaUpdateWrapper<>();
|
|
|
- // 打印状态: 1.未打印 2.已打印
|
|
|
+ // 打印状态: 1.未打印 2.页面已打印 9.自动已打印 8.人工干预(自动打印数据不全)
|
|
|
updateWrapper.set(BaseInfo::getPrintTime, new Date()).set(BaseInfo::getPrintStatus, 2);
|
|
|
updateWrapper.set(BaseInfo::getPrinterId, user.getId())
|
|
|
.set(BaseInfo::getPrinter, user.getRealName());
|
|
@@ -485,6 +485,16 @@ public class BaseInfoServiceImpl extends ServiceImpl<BaseInfoDao, BaseInfo> impl
|
|
|
|
|
|
@Override
|
|
|
public void autoPrint(BaseInfo model) {
|
|
|
+ boolean isCanPrint = isBaseInfoCanPrint(model);
|
|
|
+ if(!isCanPrint){//数据冠字号前缀不全,需要人工干预,补全数据,在进行页面补打
|
|
|
+ log.info("autoPrint :the crownPrefix is null,model : {}");
|
|
|
+ //更新状态值为8,需要人工补全数据后,在页面中进行打印
|
|
|
+ model.setPrintStatus(8);
|
|
|
+ this.baseMapper.updateById(model);
|
|
|
+ log.info("autoPrint: rfid, serialNumber :{}, status : 8 ",model.getSerialNumber());
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
RfidInfoDTO dto = new RfidInfoDTO();
|
|
|
dto.setCrownBetween(model.getCrownBetween());
|
|
|
dto.setWeightor(model.getWeightor());
|
|
@@ -514,10 +524,6 @@ public class BaseInfoServiceImpl extends ServiceImpl<BaseInfoDao, BaseInfo> impl
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -547,4 +553,21 @@ public class BaseInfoServiceImpl extends ServiceImpl<BaseInfoDao, BaseInfo> impl
|
|
|
return data.getRecords().get(0);
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 校验baseInfo:
|
|
|
+ * 当数据crown_prefix字段为空时,就返回false
|
|
|
+ * 当字段不为空,返回true
|
|
|
+ * @param info
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ private boolean isBaseInfoCanPrint(BaseInfo info){
|
|
|
+
|
|
|
+ boolean isCanPrint = false;
|
|
|
+ if(StringUtils.isNotEmpty(info.getCrownPrefix()))
|
|
|
+ {
|
|
|
+ isCanPrint = true;
|
|
|
+ }
|
|
|
+ return isCanPrint;
|
|
|
+ }
|
|
|
+
|
|
|
}
|