purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

采购入库，解决多账户不能显示的问题（完善）

Browse Source
This commit is contained in:
季圣华
2019-01-09 00:05:43 +08:00
parent 3bc21efcf2
commit 9760cad758
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erp_web/js/pages/materials/in_out.js
View File

@@ -1727,7 +1727,9 @@
$("#OperTimeShow").text(depotHeadInfo[4]);
$('#OrganIdShow').text(depotHeadInfo[11]);
$("#HandsPersonIdShow").text(depotHeadInfo[12]);
if(depotHeadInfo[22]!="undefined" && depotHeadInfo[23]!="undefined"){
if(depotHeadInfo[13] && depotHeadInfo[13]!="undefined"){
$("#AccountIdShow").text(depotHeadInfo[13]); //结算账户
} else {
var accountArr = depotHeadInfo[22].split(","); //账户id列表
var accountMoneyArr = depotHeadInfo[23].split(","); //账户金额列表
var accountIdShow = "";
@@ -1747,9 +1749,7 @@
}
}
$("#AccountIdShow").text(accountIdShow);
} else if(depotHeadInfo[13]){
$("#AccountIdShow").text(depotHeadInfo[13]); //结算账户
}
}
$("#ChangeAmountShow").text(depotHeadInfo[8]);
$("#RemarkShow").text(depotHeadInfo[9]);
$("#DiscountShow").text(depotHeadInfo[19]);

8
src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
View File

@@ -82,13 +82,17 @@ public class DepotHeadService {
}
depotHead.setCreatetime(new Timestamp(System.currentTimeMillis()));
depotHead.setStatus(false);
return depotHeadMapper.insertSelective(depotHead);
return depotHeadMapper.insert(depotHead);
}
public int updateDepotHead(String beanJson, Long id) {
DepotHead dh = depotHeadMapper.selectByPrimaryKey(id);
DepotHead depotHead = JSONObject.parseObject(beanJson, DepotHead.class);
depotHead.setId(id);
return depotHeadMapper.updateByPrimaryKeySelective(depotHead);
depotHead.setStatus(dh.getStatus());
depotHead.setCreatetime(dh.getCreatetime());
depotHead.setOperpersonname(dh.getOperpersonname());
return depotHeadMapper.updateByPrimaryKey(depotHead);
}
public int deleteDepotHead(Long id) {