Merge remote-tracking branch 'origin/master'

master
郑明梁 2 years ago
commit a6aa0f5dbf

@ -11,7 +11,6 @@ public class UdiEntity {
private String expireDate; private String expireDate;
private String serialNo; private String serialNo;
private String udi; private String udi;
public String getBatchNo() { public String getBatchNo() {
return batchNo; return batchNo;
} }

@ -47,7 +47,6 @@ public class IoCodeLostResponse {
private String cpmctymc; private String cpmctymc;
//规格型号 //规格型号
private String ggxh; private String ggxh;
public static final String COL_ID = "id"; public static final String COL_ID = "id";
public static final String COL_CODE = "code"; public static final String COL_CODE = "code";

@ -187,9 +187,11 @@ public class IoCheckInoutService {
UdiEntity udiEntity = FilterUdiUtils.getUdi(codeEntity.getCode()); UdiEntity udiEntity = FilterUdiUtils.getUdi(codeEntity.getCode());
IoCodeLostEntity codeLostEntity = codeLostService.findByCode(codeEntity.getCode()); IoCodeLostEntity codeLostEntity = codeLostService.findByCode(codeEntity.getCode());
if (codeLostEntity == null) if (codeLostEntity == null) {
codeLostEntity = new IoCodeLostEntity(); codeLostEntity = new IoCodeLostEntity();
codeLostEntity.setNameCode(udiEntity.getUdi());
codeLostEntity.setCode(codeEntity.getCode());
}
//校验是否写入缺失表 //校验是否写入缺失表
boolean isTrue = false; boolean isTrue = false;
if (udiEntity != null) { if (udiEntity != null) {

@ -19,8 +19,8 @@ import org.springframework.stereotype.Component;
import javax.annotation.Resource; import javax.annotation.Resource;
//@Component @Component
//@EnableScheduling @EnableScheduling
public class AsyncHeartTask implements SchedulingConfigurer { public class AsyncHeartTask implements SchedulingConfigurer {
final Logger logger = LoggerFactory.getLogger(AsyncHeartTask.class); final Logger logger = LoggerFactory.getLogger(AsyncHeartTask.class);

Loading…
Cancel
Save