Commit daeafb44 by wuwenlong

bugfix

parent cc5dcfc2
...@@ -169,7 +169,7 @@ public class ServiceHPKC004 extends ServiceBase { ...@@ -169,7 +169,7 @@ public class ServiceHPKC004 extends ServiceBase {
} }
inInfo = this.query(inInfo); inInfo = this.query(inInfo);
inInfo.setStatus(EiConstant.STATUS_DEFAULT); inInfo.setStatus(EiConstant.STATUS_DEFAULT);
inInfo.setMsg("操作成功!本次对[" + resultRows.size() + "]条数据删除成功!"); inInfo.setMsg("操作成功!本次对[" + resultRows.size() + "]条数据申请退货成功!");
} catch (Exception e) { } catch (Exception e) {
LogUtils.setDetailMsg(inInfo, e, "删除失败"); LogUtils.setDetailMsg(inInfo, e, "删除失败");
} }
......
...@@ -92,12 +92,12 @@ public class ServiceHPKC013 extends ServiceBase { ...@@ -92,12 +92,12 @@ public class ServiceHPKC013 extends ServiceBase {
HPKC010 hpkc010 = null; HPKC010 hpkc010 = null;
HPKC013 fKc013 = new HPKC013(); HPKC013 fKc013 = new HPKC013();
fKc013.fromMap(resultRows.get(i)); fKc013.fromMap(resultRows.get(i));
HPKC013 dbKc013 = mapKc013.get(fKc013.getReturnNo());
if (!fKc013.getSubInventCode().equals(" ")) { if (!fKc013.getSubInventCode().equals(" ")) {
hpkc011 = HPKCTools.HpKc011.listById(fKc013.getKcId()); hpkc011 = HPKCTools.HpKc011.listById(dbKc013.getKcId());
}else { }else {
hpkc010 = HPKCTools.HpKc010.listById(fKc013.getKcId()); hpkc010 = HPKCTools.HpKc010.listById(dbKc013.getKcId());
} }
HPKC013 dbKc013 = mapKc013.get(fKc013.getReturnNo());
if(dbKc013.getReturnStatus().compareTo(ReturnStatusEnum.RETURNING.getCode())==0) { if(dbKc013.getReturnStatus().compareTo(ReturnStatusEnum.RETURNING.getCode())==0) {
dbKc013.setReturnStatus(ReturnStatusEnum.RETURNED.getCode()); dbKc013.setReturnStatus(ReturnStatusEnum.RETURNED.getCode());
DaoUtils.update(HPKC013.UPDATE, dbKc013); DaoUtils.update(HPKC013.UPDATE, dbKc013);
......
...@@ -139,9 +139,10 @@ function returnApply(){ ...@@ -139,9 +139,10 @@ function returnApply(){
} }
}); });
if(flag) { if(flag) {
JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"退货\"操作? ", { JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据做\"申请退货\"操作? ", {
ok: function () { ok: function () {
JSUtils.submitGridsData("result", "HPKC004", "returnApply", true); JSUtils.submitGridsData("result", "HPKC004", "returnApply", true);
query();
} }
}); });
} }
......
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