Commit bccdbe91 by zhanglt

盘盈入库单bug修复

parent 4cc1695e
...@@ -36,7 +36,7 @@ public class ProfitWarehousingInfo extends DataEntity<ProfitWarehousingInfo> { ...@@ -36,7 +36,7 @@ public class ProfitWarehousingInfo extends DataEntity<ProfitWarehousingInfo> {
private int num; // 数量 private int num; // 数量
private String shelvesIds; // 货架ids private String shelvesIds; // 货架ids
private String warehouseIds; // 仓库ids private String warehouseIds; // 仓库ids
private String updateFlag; // 0 : 未修改,1 : 已修改
private List<Shelves> shelvesList; private List<Shelves> shelvesList;
private List<Warehouse> warehouseList; private List<Warehouse> warehouseList;
/** /**
...@@ -49,6 +49,14 @@ public class ProfitWarehousingInfo extends DataEntity<ProfitWarehousingInfo> { ...@@ -49,6 +49,14 @@ public class ProfitWarehousingInfo extends DataEntity<ProfitWarehousingInfo> {
return beginTime; return beginTime;
} }
public String getUpdateFlag() {
return updateFlag;
}
public void setUpdateFlag(String updateFlag) {
this.updateFlag = updateFlag;
}
public void setBeginTime(Date beginTime) { public void setBeginTime(Date beginTime) {
this.beginTime = beginTime; this.beginTime = beginTime;
} }
......
...@@ -180,12 +180,14 @@ public class ProfitWarehousingService extends CrudService<ProfitWarehousingMappe ...@@ -180,12 +180,14 @@ public class ProfitWarehousingService extends CrudService<ProfitWarehousingMappe
profitWarehousingInfoMapper.update(profitWarehousingInfo); profitWarehousingInfoMapper.update(profitWarehousingInfo);
if(profitWarehousingInfo.getQrCode()!=null){ if(profitWarehousingInfo.getQrCode()!=null){
//已入库的不修改 //已入库的不修改
if(!Objects.equals(profitWarehousingInfo.getQrCode().getState(), "3")){ if(Objects.equals(profitWarehousingInfo.getQrCode().getState(), "0")){
if(StringUtils.isNotBlank(profitWarehousingInfo.getUpdateFlag()) && Objects.equals(profitWarehousingInfo.getUpdateFlag(), "1"))
cleanQr(profitWarehousingInfo.getId()); cleanQr(profitWarehousingInfo.getId());
} }
} }
} }
}else{ }else{
cleanQr(profitWarehousingInfo.getId());
profitWarehousingInfoMapper.delete(profitWarehousingInfo); profitWarehousingInfoMapper.delete(profitWarehousingInfo);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment