erzhongxmu 2024-03-09 16:34:14 +08:00
parent 70d722afb5
commit adbf2ce23f
1 changed files with 0 additions and 33 deletions

View File

@ -223,25 +223,18 @@ public class WmImNoticeHController extends BaseController {
wmImNoticeIEntity.setGoodsName(mvgoods.getShpMingCheng()); wmImNoticeIEntity.setGoodsName(mvgoods.getShpMingCheng());
} }
}catch (Exception e){ }catch (Exception e){
} }
try{ try{
wmImNoticeIEntity.setGoodsFvol(dfsum.format(Double.parseDouble(wmImNoticeIEntity.getGoodsFvol()))); wmImNoticeIEntity.setGoodsFvol(dfsum.format(Double.parseDouble(wmImNoticeIEntity.getGoodsFvol())));
}catch (Exception e){ }catch (Exception e){
} }
try{ try{
wmImNoticeIEntity.setGoodsWeight(dfsum.format(Double.parseDouble(wmImNoticeIEntity.getGoodsWeight()))); wmImNoticeIEntity.setGoodsWeight(dfsum.format(Double.parseDouble(wmImNoticeIEntity.getGoodsWeight())));
}catch (Exception e){ }catch (Exception e){
} }
totalCount = totalCount.add(new BigDecimal(wmImNoticeIEntity.getGoodsCount())); totalCount = totalCount.add(new BigDecimal(wmImNoticeIEntity.getGoodsCount()));
wmImNoticeIEntitynewList.add(wmImNoticeIEntity); wmImNoticeIEntitynewList.add(wmImNoticeIEntity);
} }
request.setAttribute("wmImNoticeIList", wmImNoticeIEntitynewList); request.setAttribute("wmImNoticeIList", wmImNoticeIEntitynewList);
@ -278,13 +271,10 @@ public class WmImNoticeHController extends BaseController {
wmImNoticeIEntity.setGoodsQmCount("0"); wmImNoticeIEntity.setGoodsQmCount("0");
resultnew.add(wmImNoticeIEntity); resultnew.add(wmImNoticeIEntity);
} }
} }
dataGrid.setResults(resultnew); dataGrid.setResults(resultnew);
dataGrid.setTotal(resultnew.size()); dataGrid.setTotal(resultnew.size());
TagUtil.datagrid(response, dataGrid); TagUtil.datagrid(response, dataGrid);
} }
@RequestMapping(params = "datagridtbatch") @RequestMapping(params = "datagridtbatch")
public void datagridtbatch(WmImNoticeIEntity wmImNoticeI, public void datagridtbatch(WmImNoticeIEntity wmImNoticeI,
@ -390,26 +380,14 @@ public class WmImNoticeHController extends BaseController {
} catch (Exception e) { } catch (Exception e) {
throw new BusinessException(e.getMessage()); throw new BusinessException(e.getMessage());
} }
// if (wmImNoticeH.getImSta() == null) {
// cq.eq("imSta", Constants.wm_sta1);
// }
if(StringUtil.isNotEmpty(wmUtil.getCusCode())){ if(StringUtil.isNotEmpty(wmUtil.getCusCode())){
cq.eq("cusCode", wmUtil.getCusCode()); cq.eq("cusCode", wmUtil.getCusCode());
} }
// Map<String,Object> map = new HashMap<String,Object>();
// map.put("imSta", "desc");
// cq.setOrder(map);
Map<String,Object> map1 = new HashMap<String,Object>(); Map<String,Object> map1 = new HashMap<String,Object>();
map1.put("createDate", "desc"); map1.put("createDate", "desc");
cq.setOrder(map1); cq.setOrder(map1);
cq.eq("orderTypeCode", "09"); cq.eq("orderTypeCode", "09");
cq.add(); cq.add();
this.wmImNoticeHService.getDataGridReturn(cq, true); this.wmImNoticeHService.getDataGridReturn(cq, true);
TagUtil.datagrid(response, dataGrid); TagUtil.datagrid(response, dataGrid);
} }
@ -442,23 +420,14 @@ public class WmImNoticeHController extends BaseController {
if (wmImNoticeH.getImSta() == null) { if (wmImNoticeH.getImSta() == null) {
cq.eq("imSta", Constants.wm_sta1); cq.eq("imSta", Constants.wm_sta1);
} }
if(StringUtil.isNotEmpty(wmUtil.getCusCode())){ if(StringUtil.isNotEmpty(wmUtil.getCusCode())){
cq.eq("cusCode", wmUtil.getCusCode()); cq.eq("cusCode", wmUtil.getCusCode());
} }
// Map<String,Object> map = new HashMap<String,Object>();
// map.put("imSta", "desc");
// cq.setOrder(map);
Map<String,Object> map1 = new HashMap<String,Object>(); Map<String,Object> map1 = new HashMap<String,Object>();
map1.put("createDate", "desc"); map1.put("createDate", "desc");
cq.setOrder(map1); cq.setOrder(map1);
cq.eq("orderTypeCode", "03"); cq.eq("orderTypeCode", "03");
cq.add(); cq.add();
this.wmImNoticeHService.getDataGridReturn(cq, true); this.wmImNoticeHService.getDataGridReturn(cq, true);
TagUtil.datagrid(response, dataGrid); TagUtil.datagrid(response, dataGrid);
} }
@ -495,13 +464,11 @@ public class WmImNoticeHController extends BaseController {
if(StringUtil.isNotEmpty(wmUtil.getCusCode())){ if(StringUtil.isNotEmpty(wmUtil.getCusCode())){
cq.eq("cusCode", wmUtil.getCusCode()); cq.eq("cusCode", wmUtil.getCusCode());
} }
Map<String,Object> map1 = new HashMap<String,Object>(); Map<String,Object> map1 = new HashMap<String,Object>();
map1.put("createDate", "desc"); map1.put("createDate", "desc");
cq.setOrder(map1); cq.setOrder(map1);
cq.eq("orderTypeCode", "04"); cq.eq("orderTypeCode", "04");
cq.add(); cq.add();
this.wmImNoticeHService.getDataGridReturn(cq, true); this.wmImNoticeHService.getDataGridReturn(cq, true);
TagUtil.datagrid(response, dataGrid); TagUtil.datagrid(response, dataGrid);
} }