From 140f573dce4b24d37f2c2ec859945ec28a036556 Mon Sep 17 00:00:00 2001 From: e Date: Wed, 19 Sep 2018 22:24:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=A2=9E=E5=8A=A0=E6=95=B4?= =?UTF-8?q?=E7=89=88=E5=87=BA=E8=B4=A7=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/system/sms/util/task/SmsSendTask.java | 212 ++++++++++-------- src/main/resources/sysConfig.properties | 3 +- 2 files changed, 116 insertions(+), 99 deletions(-) diff --git a/src/main/java/org/jeecgframework/web/system/sms/util/task/SmsSendTask.java b/src/main/java/org/jeecgframework/web/system/sms/util/task/SmsSendTask.java index 5059ab66..3ee88e91 100644 --- a/src/main/java/org/jeecgframework/web/system/sms/util/task/SmsSendTask.java +++ b/src/main/java/org/jeecgframework/web/system/sms/util/task/SmsSendTask.java @@ -475,122 +475,130 @@ public class SmsSendTask { + " and ws.cus_code = ? " + " group by ws.ku_wei_bian_ma,ws.bin_id,ws.goods_id,mb.qu_huo_ci_xu, ws.goods_pro_data having sum(ws.base_goodscount) > 0 order by ws.goods_pro_data , ws.goods_qua ,mb.qu_huo_ci_xu,ws.create_date desc "; List> resultt = new ArrayList>(); - try { - resultt = systemService - .findForJdbc(tsql, mvgoods.getGoodsId(), wmOmQmIEntity.getCusCode()); - } catch (Exception e) { - } + System.out.print(tsql); - if (resultt != null && resultt.size() > 0) { - String goodprodata = null; - try{ - goodprodata = resultt.get(0).get("goods_pro_data").toString(); + if(!"off".equals(ResourceUtil.getConfigByName("hiti"))) {//不启用HITI 此处不操作 - }catch (Exception e){ - - } - String hiti = "0"; try { - hiti = Long.toString(Long.parseLong(mvgoods.getMpCengGao()) * Long.parseLong(mvgoods.getMpDanCeng()) * Long.parseLong(mvgoods.getChlShl())); + resultt = systemService + .findForJdbc(tsql, mvgoods.getGoodsId(), wmOmQmIEntity.getCusCode()); } catch (Exception e) { + } - if (Long.parseLong(hiti) <= omcountwq) { - String tsqlz = "select ws.base_unit,ws.zhong_wen_qch, ws.ku_wei_bian_ma,ws.bin_id,ws.shp_ming_cheng,cast(sum(ws.base_goodscount) as signed) as goods_qua, mb.qu_huo_ci_xu, ws.goods_pro_data" - + " from wv_stock ws, md_bin mb where " - + " ws.ku_wei_bian_ma = mb.ku_wei_bian_ma and mb.ku_wei_lei_xing = '良品区' and mb.ting_yong <> 'Y' and (ws.kuctype = '库存' or ws.kuctype = '待下架')" + if (resultt != null && resultt.size() > 0) { + String goodprodata = null; + try { + goodprodata = resultt.get(0).get("goods_pro_data").toString(); + + } catch (Exception e) { - ; - if(StringUtil.isNotEmpty(tuopanma)) { - tsqlz = tsqlz + " and ws.bin_id = '"+tuopanma + "' "; } + String hiti = "0"; + try { + hiti = Long.toString(Long.parseLong(mvgoods.getMpCengGao()) * Long.parseLong(mvgoods.getMpDanCeng()) * Long.parseLong(mvgoods.getChlShl())); + } catch (Exception e) { + } + if (Long.parseLong(hiti) <= omcountwq) { + String tsqlz = "select ws.base_unit,ws.zhong_wen_qch, ws.ku_wei_bian_ma,ws.bin_id,ws.shp_ming_cheng,cast(sum(ws.base_goodscount) as signed) as goods_qua, mb.qu_huo_ci_xu, ws.goods_pro_data" + + " from wv_stock ws, md_bin mb where " + + " ws.ku_wei_bian_ma = mb.ku_wei_bian_ma and mb.ku_wei_lei_xing = '良品区' and mb.ting_yong <> 'Y' and (ws.kuctype = '库存' or ws.kuctype = '待下架')"; + if (StringUtil.isNotEmpty(tuopanma)) { + tsqlz = tsqlz + " and ws.bin_id = '" + tuopanma + "' "; + } - tsqlz = tsqlz - + " and ws.goods_id = ? " - + " and ws.cus_code = ? "; - if(StringUtil.isEmpty(goodprodata)){ - tsqlz = tsqlz - + " and ws.goods_pro_data = '"+ goodprodata +"'"; - } + tsqlz = tsqlz + + " and ws.goods_id = ? " + + " and ws.cus_code = ? "; + if (StringUtil.isEmpty(goodprodata)) { + tsqlz = tsqlz + + " and ws.goods_pro_data = '" + goodprodata + "'"; + } - tsqlz = tsqlz - + " and (ws.base_goodscount + 0) = ? " - + " group by ws.ku_wei_bian_ma,ws.bin_id,ws.goods_id,mb.qu_huo_ci_xu, ws.goods_pro_data having sum(ws.base_goodscount) > 0 order by ws.goods_pro_data , ws.goods_qua ,mb.qu_huo_ci_xu,ws.create_date desc"; - List> resultz = systemService - .findForJdbc(tsqlz, mvgoods.getGoodsId(), wmOmQmIEntity.getCusCode(), hiti); - System.out.print("****************tsqlz" + tsqlz); - - if (resultz != null && resultz.size() > 0) { - for (int i = 0; i < resultz.size(); i++) { - try{ - Long bin_qua = Long.valueOf(resultz.get(i) - .get("goods_qua").toString()); - if (omcountwq >= bin_qua && omcountwq > 0) { - wmOmQmIEntity.setBinId(resultz.get(i) - .get("ku_wei_bian_ma").toString()); - wmOmQmIEntity.setTinId(resultz.get(i) - .get("bin_id").toString()); - wmOmQmIEntity.setBaseUnit(resultz.get(i) - .get("base_unit").toString()); - wmOmQmIEntity - .setBaseGoodscount(resultz.get(i) - .get("goods_qua") - .toString()); - wmOmQmIEntity.setProData(resultz.get(i) - .get("goods_pro_data").toString()); - wmOmQmIEntity.setCusName(resultz.get(i) - .get("zhong_wen_qch").toString()); - wmOmQmIEntity.setGoodsName(resultz.get(i) - .get("shp_ming_cheng").toString()); - omcountwq = omcountwq - bin_qua; - if (wmOmNoticeIEntity.getGoodsUnit() - .equals(wmOmNoticeIEntity - .getBaseUnit())) { - wmOmQmIEntity.setQmOkQuat(Long.toString(bin_qua)); - try { - wmOmQmIEntity.setTinTj(String.valueOf(Double.parseDouble(mvgoods - .getTiJiCm()) / Double.parseDouble(mvgoods - .getChlShl()) - * Long.parseLong(wmOmQmIEntity.getQmOkQuat()))); - wmOmQmIEntity.setTinZhl(String.valueOf(Double.parseDouble(mvgoods - .getZhlKg()) / Double.parseDouble(mvgoods - .getChlShl()) - * Long.parseLong(wmOmQmIEntity.getQmOkQuat()))); - } catch (Exception e) { - // TODO: handle exception - } - } else { - try { - wmOmQmIEntity.setTinTj(String.valueOf(Double.parseDouble(mvgoods - .getTiJiCm()) - * Long.parseLong(wmOmQmIEntity.getQmOkQuat()) / Long.parseLong(mvgoods - .getChlShl()))); - wmOmQmIEntity.setTinZhl(String.valueOf(Double.parseDouble(mvgoods - .getZhlKg()) - * Long.parseLong(wmOmQmIEntity.getQmOkQuat()) / Long.parseLong(mvgoods - .getChlShl()))); - } catch (Exception e) { - // TODO: handle exception - } - try { + tsqlz = tsqlz + + " and (ws.base_goodscount + 0) = ? " + + " group by ws.ku_wei_bian_ma,ws.bin_id,ws.goods_id,mb.qu_huo_ci_xu, ws.goods_pro_data having sum(ws.base_goodscount) > 0 order by ws.goods_pro_data , ws.goods_qua ,mb.qu_huo_ci_xu,ws.create_date desc"; + List> resultz = systemService + .findForJdbc(tsqlz, mvgoods.getGoodsId(), wmOmQmIEntity.getCusCode(), hiti); + System.out.print("****************tsqlz" + tsqlz); + if (resultz != null && resultz.size() > 0) { + for (int i = 0; i < resultz.size(); i++) { + try { + Long bin_qua = Long.valueOf(resultz.get(i) + .get("goods_qua").toString()); + if (omcountwq >= bin_qua && omcountwq > 0) { + wmOmQmIEntity.setBinId(resultz.get(i) + .get("ku_wei_bian_ma").toString()); + wmOmQmIEntity.setTinId(resultz.get(i) + .get("bin_id").toString()); + wmOmQmIEntity.setBaseUnit(resultz.get(i) + .get("base_unit").toString()); wmOmQmIEntity - .setQmOkQuat(Long.toString(bin_qua)); + .setBaseGoodscount(resultz.get(i) + .get("goods_qua") + .toString()); + wmOmQmIEntity.setProData(resultz.get(i) + .get("goods_pro_data").toString()); + try{ + wmOmQmIEntity.setCusName(resultz.get(i) + .get("zhong_wen_qch").toString()); + wmOmQmIEntity.setGoodsName(resultz.get(i) + .get("shp_ming_cheng").toString()); + }catch (Exception e){ + + } + + omcountwq = omcountwq - bin_qua; + if (wmOmNoticeIEntity.getGoodsUnit() + .equals(wmOmNoticeIEntity + .getBaseUnit())) { + wmOmQmIEntity.setQmOkQuat(Long.toString(bin_qua)); + try { + wmOmQmIEntity.setTinTj(String.valueOf(Double.parseDouble(mvgoods + .getTiJiCm()) / Double.parseDouble(mvgoods + .getChlShl()) + * Long.parseLong(wmOmQmIEntity.getQmOkQuat()))); + wmOmQmIEntity.setTinZhl(String.valueOf(Double.parseDouble(mvgoods + .getZhlKg()) / Double.parseDouble(mvgoods + .getChlShl()) + * Long.parseLong(wmOmQmIEntity.getQmOkQuat()))); + } catch (Exception e) { + // TODO: handle exception + } + } else { + try { + wmOmQmIEntity.setTinTj(String.valueOf(Double.parseDouble(mvgoods + .getTiJiCm()) + * Long.parseLong(wmOmQmIEntity.getQmOkQuat()) / Long.parseLong(mvgoods + .getChlShl()))); + wmOmQmIEntity.setTinZhl(String.valueOf(Double.parseDouble(mvgoods + .getZhlKg()) + * Long.parseLong(wmOmQmIEntity.getQmOkQuat()) / Long.parseLong(mvgoods + .getChlShl()))); + } catch (Exception e) { + // TODO: handle exception + } + try { + + wmOmQmIEntity + .setQmOkQuat(Long.toString(bin_qua)); + + } catch (Exception e) { + // TODO: handle exception + } + } + + systemService.save(wmOmQmIEntity); - } catch (Exception e) { - // TODO: handle exception } + } catch (Exception e) { + } - - systemService.save(wmOmQmIEntity); - } - }catch (Exception e){ - - } - } + } } } } @@ -598,6 +606,7 @@ public class SmsSendTask { .findForJdbc(tsql, mvgoods.getGoodsId(), wmOmQmIEntity.getCusCode()); if (result != null && result.size() > 0) { for (int i = 0; i < result.size(); i++) { + try { Long bin_qua = Long.valueOf(result.get(i) .get("goods_qua").toString()); if (bin_qua > 0 && omcountwq > 0) { @@ -724,7 +733,14 @@ public class SmsSendTask { break; } } + }catch (Exception e){ + } + //catch jieshu + } + + + } } diff --git a/src/main/resources/sysConfig.properties b/src/main/resources/sysConfig.properties index ca946a9d..fad719b2 100644 --- a/src/main/resources/sysConfig.properties +++ b/src/main/resources/sysConfig.properties @@ -112,7 +112,8 @@ api_url_orderstatus_get = https://api.yonyouup.com/orderstatus/get?from_account= api_url_result_get = https://api.yonyouup.com/result?requestid={requestid} - +#\u542F\u7528HITI +hiti=off #\u5141\u8BB8\u8D85\u6536 y\u5141\u8BB8 n\u4E0D\u5141\u8BB8 chaoshou=y