更新后端代码
This commit is contained in:
@@ -62,37 +62,62 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
||||
}
|
||||
|
||||
/**
|
||||
* 增加仓管通
|
||||
* 增加单据
|
||||
* @return
|
||||
*/
|
||||
public void create()
|
||||
{
|
||||
Log.infoFileSync("==================开始调用增加仓管通信息信息方法create()===================");
|
||||
public void create(){
|
||||
Log.infoFileSync("==================开始调用增加单据信息信息方法create()===================");
|
||||
Boolean flag = false;
|
||||
try
|
||||
{
|
||||
DepotHead depotHead = new DepotHead();
|
||||
depotHead.setType(model.getType());
|
||||
depotHead.setSubType(model.getSubType());
|
||||
depotHead.setProjectId(new Depot(model.getProjectId()));
|
||||
depotHead.setNumber(model.getNumber());
|
||||
if(model.getProjectId()!=null){depotHead.setProjectId(new Depot(model.getProjectId()));}
|
||||
//构造新的编号
|
||||
String number = model.getNumber();
|
||||
String allNewNumber = "";
|
||||
if(number.equals(model.getDefaultNumber())){ //两个编号一致说明没有修改过
|
||||
number = number.substring(0,12); //截取前缀
|
||||
String beginTime = Tools.getNow() + " 00:00:00";
|
||||
String endTime = Tools.getNow() + " 23:59:59";
|
||||
String newNumber = buildNumberFun(model.getType(), model.getSubType(), beginTime, endTime); //从数据库查询最新的编号+1,这样能防止重复
|
||||
allNewNumber = number + newNumber;
|
||||
depotHead.setNumber(allNewNumber);
|
||||
}
|
||||
else { //修改过的编号
|
||||
depotHead.setNumber(model.getNumber());
|
||||
}
|
||||
depotHead.setDefaultNumber(allNewNumber); //初始编号,一直都从后台取值
|
||||
|
||||
depotHead.setOperPersonName(getUser().getUsername());
|
||||
depotHead.setCreateTime(new Timestamp(new Date().getTime()));
|
||||
try
|
||||
{
|
||||
depotHead.setOperTime(new Timestamp(Tools.parse(model.getOperTime(), "yyyy-MM-dd").getTime()));
|
||||
try{
|
||||
depotHead.setOperTime(new Timestamp(Tools.parse(model.getOperTime(), "yyyy-MM-dd HH:mm:ss").getTime()));
|
||||
}
|
||||
catch (ParseException e)
|
||||
{
|
||||
catch (ParseException e){
|
||||
Log.errorFileSync(">>>>>>>>>>>>>>>解析购买日期格式异常", e);
|
||||
}
|
||||
if(model.getOrganId()!=null){depotHead.setOrganId(new Supplier(model.getOrganId()));}
|
||||
if(model.getHandsPersonId()!=null){depotHead.setHandsPersonId(new Person(model.getHandsPersonId()));}
|
||||
if(model.getHandsPersonId()!=null){depotHead.setHandsPersonId(new Person(model.getHandsPersonId()));}
|
||||
if(model.getSalesman()!=null){
|
||||
depotHead.setSalesman(model.getSalesman().toString());
|
||||
}
|
||||
if(model.getAccountId()!=null){depotHead.setAccountId(new Account(model.getAccountId()));}
|
||||
depotHead.setChangeAmount(model.getChangeAmount());
|
||||
depotHead.setAccountIdList(model.getAccountIdList());
|
||||
depotHead.setAccountMoneyList(model.getAccountMoneyList());
|
||||
depotHead.setDiscount(model.getDiscount());
|
||||
depotHead.setDiscountMoney(model.getDiscountMoney());
|
||||
depotHead.setDiscountLastMoney(model.getDiscountLastMoney());
|
||||
depotHead.setOtherMoney(model.getOtherMoney());
|
||||
depotHead.setOtherMoneyList(model.getOtherMoneyList());
|
||||
depotHead.setOtherMoneyItem(model.getOtherMoneyItem());
|
||||
depotHead.setAccountDay(model.getAccountDay());
|
||||
if(model.getAllocationProjectId()!=null){depotHead.setAllocationProjectId(new Depot(model.getAllocationProjectId()));}
|
||||
depotHead.setTotalPrice(model.getTotalPrice());
|
||||
depotHead.setPayType(model.getPayType());
|
||||
depotHead.setStatus(false);
|
||||
depotHead.setRemark(model.getRemark());
|
||||
depotHeadService.create(depotHead);
|
||||
|
||||
@@ -102,88 +127,88 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
||||
tipMsg = "成功";
|
||||
tipType = 0;
|
||||
}
|
||||
catch (DataAccessException e)
|
||||
{
|
||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加仓管通信息异常", e);
|
||||
catch (DataAccessException e) {
|
||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>增加单据信息异常", e);
|
||||
flag = false;
|
||||
tipMsg = "失败";
|
||||
tipType = 1;
|
||||
}
|
||||
finally
|
||||
{
|
||||
try
|
||||
{
|
||||
finally {
|
||||
try {
|
||||
toClient(flag.toString());
|
||||
}
|
||||
catch (IOException e)
|
||||
{
|
||||
Log.errorFileSync(">>>>>>>>>>>>增加仓管通信息回写客户端结果异常", e);
|
||||
catch (IOException e) {
|
||||
Log.errorFileSync(">>>>>>>>>>>>增加单据信息回写客户端结果异常", e);
|
||||
}
|
||||
}
|
||||
|
||||
logService.create(new Logdetails(getUser(), "增加仓管通", model.getClientIp(),
|
||||
logService.create(new Logdetails(getUser(), "增加单据", model.getClientIp(),
|
||||
new Timestamp(System.currentTimeMillis())
|
||||
, tipType, "增加仓管通编号为 "+ model.getNumber() + " " + tipMsg + "!", "增加仓管通" + tipMsg));
|
||||
Log.infoFileSync("==================结束调用增加仓管通方法create()===================");
|
||||
, tipType, "增加单据编号为 "+ model.getNumber() + " " + tipMsg + "!", "增加单据" + tipMsg));
|
||||
Log.infoFileSync("==================结束调用增加单据方法create()===================");
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除仓管通
|
||||
* 删除单据
|
||||
* @return
|
||||
*/
|
||||
public String delete()
|
||||
{
|
||||
Log.infoFileSync("====================开始调用删除仓管通信息方法delete()================");
|
||||
try
|
||||
{
|
||||
public String delete() {
|
||||
Log.infoFileSync("====================开始调用删除单据信息方法delete()================");
|
||||
try {
|
||||
depotHeadService.delete(model.getDepotHeadID());
|
||||
tipMsg = "成功";
|
||||
tipType = 0;
|
||||
}
|
||||
catch (DataAccessException e)
|
||||
{
|
||||
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getDepotHeadID() + " 的仓管通异常", e);
|
||||
catch (DataAccessException e) {
|
||||
Log.errorFileSync(">>>>>>>>>>>删除ID为 " + model.getDepotHeadID() + " 的单据异常", e);
|
||||
tipMsg = "失败";
|
||||
tipType = 1;
|
||||
}
|
||||
model.getShowModel().setMsgTip(tipMsg);
|
||||
logService.create(new Logdetails(getUser(), "删除仓管通", model.getClientIp(),
|
||||
logService.create(new Logdetails(getUser(), "删除单据", model.getClientIp(),
|
||||
new Timestamp(System.currentTimeMillis())
|
||||
, tipType, "删除仓管通ID为 "+ model.getDepotHeadID() + " " + tipMsg + "!", "删除仓管通" + tipMsg));
|
||||
Log.infoFileSync("====================结束调用删除仓管通信息方法delete()================");
|
||||
, tipType, "删除单据ID为 "+ model.getDepotHeadID() + " " + tipMsg + "!", "删除单据" + tipMsg));
|
||||
Log.infoFileSync("====================结束调用删除单据信息方法delete()================");
|
||||
return SUCCESS;
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新仓管通
|
||||
* 更新单据
|
||||
* @return
|
||||
*/
|
||||
public void update()
|
||||
{
|
||||
public void update() {
|
||||
Boolean flag = false;
|
||||
try
|
||||
{
|
||||
try {
|
||||
DepotHead depotHead = depotHeadService.get(model.getDepotHeadID());
|
||||
depotHead.setType(model.getType());
|
||||
depotHead.setSubType(model.getSubType());
|
||||
depotHead.setProjectId(new Depot(model.getProjectId()));
|
||||
if(model.getProjectId()!=null){depotHead.setProjectId(new Depot(model.getProjectId()));}
|
||||
depotHead.setNumber(model.getNumber());
|
||||
depotHead.setOperPersonName(getUser().getUsername());
|
||||
try
|
||||
{
|
||||
depotHead.setOperTime(new Timestamp(Tools.parse(model.getOperTime(), "yyyy-MM-dd").getTime()));
|
||||
try{
|
||||
depotHead.setOperTime(new Timestamp(Tools.parse(model.getOperTime(), "yyyy-MM-dd HH:mm:ss").getTime()));
|
||||
}
|
||||
catch (ParseException e)
|
||||
{
|
||||
catch (ParseException e) {
|
||||
Log.errorFileSync(">>>>>>>>>>>>>>>解析入库时间格式异常", e);
|
||||
}
|
||||
if(model.getOrganId()!=null){depotHead.setOrganId(new Supplier(model.getOrganId()));}
|
||||
if(model.getHandsPersonId()!=null){depotHead.setHandsPersonId(new Person(model.getHandsPersonId()));}
|
||||
depotHead.setSalesman(model.getSalesman());
|
||||
if(model.getAccountId()!=null){depotHead.setAccountId(new Account(model.getAccountId()));}
|
||||
depotHead.setChangeAmount(model.getChangeAmount());
|
||||
depotHead.setAccountIdList(model.getAccountIdList());
|
||||
depotHead.setAccountMoneyList(model.getAccountMoneyList());
|
||||
depotHead.setDiscount(model.getDiscount());
|
||||
depotHead.setDiscountMoney(model.getDiscountMoney());
|
||||
depotHead.setDiscountLastMoney(model.getDiscountLastMoney());
|
||||
depotHead.setOtherMoney(model.getOtherMoney());
|
||||
depotHead.setOtherMoneyList(model.getOtherMoneyList());
|
||||
depotHead.setOtherMoneyItem(model.getOtherMoneyItem());
|
||||
depotHead.setAccountDay(model.getAccountDay());
|
||||
if(model.getAllocationProjectId()!=null){depotHead.setAllocationProjectId(new Depot(model.getAllocationProjectId()));}
|
||||
depotHead.setTotalPrice(model.getTotalPrice());
|
||||
depotHead.setPayType(model.getPayType());
|
||||
depotHead.setStatus(false);
|
||||
depotHead.setRemark(model.getRemark());
|
||||
depotHeadService.update(depotHead);
|
||||
|
||||
@@ -191,31 +216,27 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
||||
tipMsg = "成功";
|
||||
tipType = 0;
|
||||
}
|
||||
catch (DataAccessException e)
|
||||
{
|
||||
Log.errorFileSync(">>>>>>>>>>>>>修改仓管通ID为 : " + model.getDepotHeadID() + "信息失败", e);
|
||||
catch (DataAccessException e) {
|
||||
Log.errorFileSync(">>>>>>>>>>>>>修改单据ID为 : " + model.getDepotHeadID() + "信息失败", e);
|
||||
flag = false;
|
||||
tipMsg = "失败";
|
||||
tipType = 1;
|
||||
}
|
||||
finally
|
||||
{
|
||||
try
|
||||
{
|
||||
finally {
|
||||
try {
|
||||
toClient(flag.toString());
|
||||
}
|
||||
catch (IOException e)
|
||||
{
|
||||
Log.errorFileSync(">>>>>>>>>>>>修改仓管通回写客户端结果异常", e);
|
||||
catch (IOException e) {
|
||||
Log.errorFileSync(">>>>>>>>>>>>修改单据回写客户端结果异常", e);
|
||||
}
|
||||
}
|
||||
logService.create(new Logdetails(getUser(), "更新仓管通", model.getClientIp(),
|
||||
logService.create(new Logdetails(getUser(), "更新单据", model.getClientIp(),
|
||||
new Timestamp(System.currentTimeMillis())
|
||||
, tipType, "更新仓管通ID为 "+ model.getDepotHeadID() + " " + tipMsg + "!", "更新仓管通" + tipMsg));
|
||||
, tipType, "更新单据ID为 "+ model.getDepotHeadID() + " " + tipMsg + "!", "更新单据" + tipMsg));
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除指定ID仓管通
|
||||
* 批量删除指定ID单据
|
||||
* @return
|
||||
*/
|
||||
public String batchDelete()
|
||||
@@ -230,19 +251,130 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
||||
}
|
||||
catch (DataAccessException e)
|
||||
{
|
||||
Log.errorFileSync(">>>>>>>>>>>批量删除仓管通ID为:" + model.getDepotHeadIDs() + "信息异常", e);
|
||||
Log.errorFileSync(">>>>>>>>>>>批量删除单据ID为:" + model.getDepotHeadIDs() + "信息异常", e);
|
||||
tipMsg = "失败";
|
||||
tipType = 1;
|
||||
}
|
||||
|
||||
logService.create(new Logdetails(getUser(), "批量删除仓管通", model.getClientIp(),
|
||||
logService.create(new Logdetails(getUser(), "批量删除单据", model.getClientIp(),
|
||||
new Timestamp(System.currentTimeMillis())
|
||||
, tipType, "批量删除仓管通ID为 "+ model.getDepotHeadIDs() + " " + tipMsg + "!", "批量删除仓管通" + tipMsg));
|
||||
, tipType, "批量删除单据ID为 "+ model.getDepotHeadIDs() + " " + tipMsg + "!", "批量删除单据" + tipMsg));
|
||||
return SUCCESS;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 查找仓管通信息
|
||||
* 批量设置状态-审核或者反审核
|
||||
* @return
|
||||
*/
|
||||
public String batchSetStatus() {
|
||||
try {
|
||||
depotHeadService.batchSetStatus(model.getStatus(), model.getDepotHeadIDs());
|
||||
model.getShowModel().setMsgTip("成功");
|
||||
//记录操作日志使用
|
||||
tipMsg = "成功";
|
||||
tipType = 0;
|
||||
}
|
||||
catch (DataAccessException e) {
|
||||
Log.errorFileSync(">>>>>>>>>>>批量修改状态,单据ID为:" + model.getDepotHeadIDs() + "信息异常", e);
|
||||
tipMsg = "失败";
|
||||
tipType = 1;
|
||||
}
|
||||
|
||||
logService.create(new Logdetails(getUser(), "批量修改单据状态", model.getClientIp(),
|
||||
new Timestamp(System.currentTimeMillis())
|
||||
, tipType, "批量修改状态,单据ID为 "+ model.getDepotHeadIDs() + " " + tipMsg + "!", "批量修改单据状态" + tipMsg));
|
||||
return SUCCESS;
|
||||
}
|
||||
|
||||
/**
|
||||
* 检查单据编号是否存在
|
||||
*/
|
||||
public void checkIsNumberExist() {
|
||||
Boolean flag = false;
|
||||
try {
|
||||
flag = depotHeadService.checkIsNameExist("Number", model.getNumber(), "Id", model.getDepotHeadID());
|
||||
}
|
||||
catch (DataAccessException e)
|
||||
{
|
||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>检查单据编号为:" + model.getNumber() + " ID为: " + model.getDepotHeadID() + " 是否存在出现异常!");
|
||||
}
|
||||
finally
|
||||
{
|
||||
try
|
||||
{
|
||||
toClient(flag.toString());
|
||||
}
|
||||
catch (IOException e)
|
||||
{
|
||||
Log.errorFileSync(">>>>>>>>>>>>回写检查单据编号为:" + model.getNumber() + " ID为: " + model.getDepotHeadID() + " 是否存在出现异常!",e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 单据编号生成接口,规则:查找当前类型单据下的当天最大的单据号,并加1
|
||||
*/
|
||||
public void buildNumber(){
|
||||
try {
|
||||
String beginTime = model.getBeginTime();
|
||||
String endTime = model.getEndTime();
|
||||
String newNumber = buildNumberFun(model.getType(), model.getSubType(), beginTime, endTime);
|
||||
JSONObject outer = new JSONObject();
|
||||
outer.put("DefaultNumber", newNumber);
|
||||
//回写查询结果
|
||||
toClient(outer.toString());
|
||||
}
|
||||
catch (DataAccessException e) {
|
||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>单据编号生成异常", e);
|
||||
}
|
||||
catch (IOException e) {
|
||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写单据编号生成接口异常", e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 查找单据编号
|
||||
* @return
|
||||
*/
|
||||
public String buildNumberFun(String type,String subType,String beginTime,String endTime){
|
||||
String newNumber = "0001"; //新编号
|
||||
try {
|
||||
PageUtil<DepotHead> pageUtil = new PageUtil<DepotHead>();
|
||||
pageUtil.setPageSize(0);
|
||||
pageUtil.setCurPage(0);
|
||||
pageUtil.setAdvSearch(buildNumberCondition(type, subType, beginTime, endTime));
|
||||
depotHeadService.find(pageUtil);
|
||||
List<DepotHead> dataList = pageUtil.getPageList();
|
||||
//存放数据json数组
|
||||
if (null != dataList && dataList.size() > 0) {
|
||||
DepotHead depotHead = dataList.get(0);
|
||||
if (depotHead != null) {
|
||||
String number = depotHead.getDefaultNumber(); //最大的单据编号
|
||||
if (number != null) {
|
||||
Integer lastNumber = Integer.parseInt(number.substring(12, 16)); //末四尾
|
||||
lastNumber = lastNumber + 1;
|
||||
Integer nLen = lastNumber.toString().length();
|
||||
if (nLen == 1) {
|
||||
newNumber = "000" + lastNumber.toString();
|
||||
} else if (nLen == 2) {
|
||||
newNumber = "00" + lastNumber.toString();
|
||||
} else if (nLen == 3) {
|
||||
newNumber = "0" + lastNumber.toString();
|
||||
} else if (nLen == 4) {
|
||||
newNumber = lastNumber.toString();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (DataAccessException e) {
|
||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>单据编号生成异常", e);
|
||||
}
|
||||
return newNumber;
|
||||
}
|
||||
|
||||
/**
|
||||
* 查找单据信息
|
||||
* @return
|
||||
*/
|
||||
public void findBy()
|
||||
@@ -270,19 +402,30 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
||||
item.put("ProjectName", depotHead.getProjectId()==null?"":depotHead.getProjectId().getName());
|
||||
item.put("Number", depotHead.getNumber());
|
||||
item.put("OperPersonName", depotHead.getOperPersonName());
|
||||
item.put("CreateTime", Tools.getCurrentMonth(depotHead.getCreateTime()));
|
||||
item.put("OperTime", Tools.getCurrentMonth(depotHead.getOperTime()));
|
||||
item.put("CreateTime", Tools.getCenternTime(depotHead.getCreateTime()));
|
||||
item.put("OperTime", Tools.getCenternTime(depotHead.getOperTime()));
|
||||
item.put("OrganId", depotHead.getOrganId()==null?"":depotHead.getOrganId().getId());
|
||||
item.put("OrganName", depotHead.getOrganId()==null?"":depotHead.getOrganId().getSupplier());
|
||||
item.put("HandsPersonId", depotHead.getHandsPersonId()==null?"":depotHead.getHandsPersonId().getId());
|
||||
item.put("Salesman", depotHead.getSalesman().toString());
|
||||
item.put("HandsPersonName", depotHead.getHandsPersonId()==null?"":depotHead.getHandsPersonId().getName());
|
||||
item.put("AccountId", depotHead.getAccountId()==null?"":depotHead.getAccountId().getId());
|
||||
item.put("AccountName", depotHead.getAccountId()==null?"":depotHead.getAccountId().getName());
|
||||
item.put("ChangeAmount", depotHead.getChangeAmount()==null?"":Math.abs(depotHead.getChangeAmount()));
|
||||
item.put("AccountIdList", depotHead.getAccountIdList());
|
||||
item.put("AccountMoneyList", depotHead.getAccountMoneyList());
|
||||
item.put("Discount", depotHead.getDiscount());
|
||||
item.put("DiscountMoney", depotHead.getDiscountMoney());
|
||||
item.put("DiscountLastMoney", depotHead.getDiscountLastMoney());
|
||||
item.put("OtherMoney", depotHead.getOtherMoney());
|
||||
item.put("OtherMoneyList", depotHead.getOtherMoneyList()); //id列表
|
||||
item.put("OtherMoneyItem", depotHead.getOtherMoneyItem()); //money列表
|
||||
item.put("AccountDay", depotHead.getAccountDay()); //结算天数
|
||||
item.put("AllocationProjectId", depotHead.getAllocationProjectId()==null?"":depotHead.getAllocationProjectId().getId());
|
||||
item.put("AllocationProjectName", depotHead.getAllocationProjectId()==null?"":depotHead.getAllocationProjectId().getName());
|
||||
item.put("TotalPrice", depotHead.getTotalPrice()==null?"":Math.abs(depotHead.getTotalPrice()));
|
||||
item.put("payType", depotHead.getPayType()==null?"":depotHead.getPayType());
|
||||
item.put("Status", depotHead.getStatus());
|
||||
item.put("Remark", depotHead.getRemark());
|
||||
item.put("op", 1);
|
||||
dataArray.add(item);
|
||||
@@ -294,16 +437,16 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
||||
}
|
||||
catch (DataAccessException e)
|
||||
{
|
||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找仓管通信息异常", e);
|
||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找单据信息异常", e);
|
||||
}
|
||||
catch (IOException e)
|
||||
{
|
||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询仓管通信息结果异常", e);
|
||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询单据信息结果异常", e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 查找进销存_根据月份(报表)
|
||||
* 查找单据_根据月份(报表)
|
||||
* @return
|
||||
*/
|
||||
public void findByMonth() {
|
||||
@@ -332,11 +475,11 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
||||
}
|
||||
catch (DataAccessException e)
|
||||
{
|
||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找仓管通信息异常", e);
|
||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找单据信息异常", e);
|
||||
}
|
||||
catch (IOException e)
|
||||
{
|
||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询仓管通信息结果异常", e);
|
||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询单据信息结果异常", e);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -377,10 +520,10 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
||||
toClient(outer.toString());
|
||||
}
|
||||
catch (DataAccessException e) {
|
||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找仓管通信息异常", e);
|
||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找单据信息异常", e);
|
||||
}
|
||||
catch (IOException e) {
|
||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询仓管通信息结果异常", e);
|
||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询单据信息结果异常", e);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -449,98 +592,6 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
||||
}
|
||||
return allMoney;
|
||||
}
|
||||
|
||||
/**
|
||||
*入库出库明细接口
|
||||
*/
|
||||
public void findInDetail(){
|
||||
PageUtil pageUtil = new PageUtil();
|
||||
pageUtil.setPageSize(model.getPageSize());
|
||||
pageUtil.setCurPage(model.getPageNo());
|
||||
Long pid =model.getProjectId();
|
||||
String dids =model.getDepotIds();
|
||||
String beginTime = model.getBeginTime();
|
||||
String endTime = model.getEndTime();
|
||||
String type = model.getType();
|
||||
try{
|
||||
depotHeadService.findInDetail(pageUtil,beginTime,endTime,type,pid,dids);
|
||||
List dataList = pageUtil.getPageList();
|
||||
JSONObject outer = new JSONObject();
|
||||
outer.put("total", pageUtil.getTotalCount());
|
||||
//存放数据json数组
|
||||
JSONArray dataArray = new JSONArray();
|
||||
if(dataList!=null){
|
||||
for(Integer i=0; i<dataList.size(); i++){
|
||||
JSONObject item = new JSONObject();
|
||||
Object dl = dataList.get(i); //获取对象
|
||||
Object[] arr = (Object[]) dl; //转为数组
|
||||
item.put("number", arr[0]); //单据编号
|
||||
item.put("materialName", arr[1]); //商品名称
|
||||
item.put("materialModel", arr[2]); //商品型号
|
||||
item.put("unitPrice", arr[3]); //单价
|
||||
item.put("operNumber", arr[4]); //入库出库数量
|
||||
item.put("allPrice", arr[5]); //金额
|
||||
item.put("supplierName", arr[6]); //供应商
|
||||
item.put("depotName", arr[7]); //仓库
|
||||
item.put("operTime", arr[8]); //入库出库日期
|
||||
dataArray.add(item);
|
||||
}
|
||||
}
|
||||
outer.put("rows", dataArray);
|
||||
//回写查询结果
|
||||
toClient(outer.toString());
|
||||
}
|
||||
catch (JshException e) {
|
||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找信息异常", e);
|
||||
}
|
||||
catch (IOException e) {
|
||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询信息结果异常", e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
*入库出库统计接口
|
||||
*/
|
||||
public void findInOutMaterialCount(){
|
||||
PageUtil pageUtil = new PageUtil();
|
||||
pageUtil.setPageSize(model.getPageSize());
|
||||
pageUtil.setCurPage(model.getPageNo());
|
||||
Long pid =model.getProjectId();
|
||||
String dids =model.getDepotIds();
|
||||
String beginTime = model.getBeginTime();
|
||||
String endTime = model.getEndTime();
|
||||
String type = model.getType();
|
||||
try{
|
||||
depotHeadService.findInOutMaterialCount(pageUtil, beginTime, endTime, type, pid, dids);
|
||||
List dataList = pageUtil.getPageList();
|
||||
JSONObject outer = new JSONObject();
|
||||
outer.put("total", pageUtil.getTotalCount());
|
||||
//存放数据json数组
|
||||
JSONArray dataArray = new JSONArray();
|
||||
if(dataList!=null){
|
||||
for(Integer i=0; i<dataList.size(); i++){
|
||||
JSONObject item = new JSONObject();
|
||||
Object dl = dataList.get(i); //获取对象
|
||||
Object[] arr = (Object[]) dl; //转为数组
|
||||
item.put("MaterialId", arr[0]); //商品Id
|
||||
item.put("mName", arr[1]); //商品名称
|
||||
item.put("Model", arr[2]); //商品型号
|
||||
item.put("categoryName", arr[3]); //商品类型
|
||||
item.put("priceSum", arr[4]); //金额
|
||||
dataArray.add(item);
|
||||
}
|
||||
}
|
||||
outer.put("rows", dataArray);
|
||||
//回写查询结果
|
||||
toClient(outer.toString());
|
||||
}
|
||||
catch (JshException e) {
|
||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>查找信息异常", e);
|
||||
}
|
||||
catch (IOException e) {
|
||||
Log.errorFileSync(">>>>>>>>>>>>>>>>>>>回写查询信息结果异常", e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 拼接搜索条件
|
||||
@@ -552,14 +603,6 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
||||
* 拼接搜索条件
|
||||
*/
|
||||
Map<String,Object> condition = new HashMap<String,Object>();
|
||||
if(model.getAllocationProjectId()!=null)
|
||||
{condition.put("AllocationProjectId_n_eq", model.getAllocationProjectId());}
|
||||
if(model.getProjectId()!=null) {
|
||||
condition.put("ProjectId_n_eq", model.getProjectId());
|
||||
}
|
||||
else {
|
||||
condition.put("ProjectId_s_in", model.getDepotIds());
|
||||
}
|
||||
condition.put("Type_s_eq",model.getType());
|
||||
condition.put("SubType_s_eq",model.getSubType());
|
||||
condition.put("Number_s_like",model.getNumber());
|
||||
@@ -568,13 +611,20 @@ public class DepotHeadAction extends BaseAction<DepotHeadModel>
|
||||
condition.put("Id_s_order","desc");
|
||||
return condition;
|
||||
}
|
||||
|
||||
private Map<String,Object> buildNumberCondition(String type,String subType,String beginTime,String endTime) {
|
||||
Map<String,Object> condition = new HashMap<String,Object>();
|
||||
condition.put("Type_s_eq", type);
|
||||
condition.put("SubType_s_eq", subType);
|
||||
condition.put("OperTime_s_gteq",beginTime);
|
||||
condition.put("OperTime_s_lteq",endTime);
|
||||
condition.put("Id_s_order","desc");
|
||||
return condition;
|
||||
}
|
||||
|
||||
private Map<String,Object> getConditionHead()
|
||||
{
|
||||
Map<String,Object> condition = new HashMap<String,Object>();
|
||||
if(model.getProjectId()!=null) {
|
||||
condition.put("ProjectId_n_eq", model.getProjectId());
|
||||
}
|
||||
condition.put("OperTime_s_lteq",model.getMonthTime() + "-31 00:00:00");
|
||||
return condition;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user