diff --git a/src/main/java/com/zzjee/wm/controller/WmInQmIController.java b/src/main/java/com/zzjee/wm/controller/WmInQmIController.java index 6d7aad6e..9bae384c 100644 --- a/src/main/java/com/zzjee/wm/controller/WmInQmIController.java +++ b/src/main/java/com/zzjee/wm/controller/WmInQmIController.java @@ -928,6 +928,16 @@ for (WmInQmIEntity wmInQmIEntity : wmInQmIso) { MvGoodsEntity.class, "goodsCode", wmInQmI.getGoodsId()); if (mvgoods != null) { wmInQmI.setGoodsName(mvgoods.getGoodsName()); + if(StringUtil.isNotEmpty(wmInQmI.getItemText())){ + MdGoodsEntity mdGoodsEntity = systemService.findUniqueByProperty( + MdGoodsEntity.class, "shpBianMa", mvgoods.getGoodsId()); + if(mdGoodsEntity!=null){ + mdGoodsEntity.setShpTiaoMa(wmInQmI.getItemText()); + systemService.updateEntitie(mdGoodsEntity); + } + } + + } }catch (Exception e){ diff --git a/src/main/java/org/jeecgframework/web/cgform/controller/template/CgformTemplateController.java b/src/main/java/org/jeecgframework/web/cgform/controller/template/CgformTemplateController.java index e326a8f2..3e80215c 100644 --- a/src/main/java/org/jeecgframework/web/cgform/controller/template/CgformTemplateController.java +++ b/src/main/java/org/jeecgframework/web/cgform/controller/template/CgformTemplateController.java @@ -550,7 +550,7 @@ public class CgformTemplateController extends BaseController { // String path=request.getSession().getServletContext().getRealPath("/WEB-INF/classes/online/template"); ClassLoader classLoader = this.getClass().getClassLoader(); - URL resource = classLoader.getResource("sysConfig.properties"); + URL resource = classLoader.getResource("sysConfig.properties"); String path = resource.getPath(); path = path.substring(0,path.indexOf("sysConfig.properties"))+"online/template"; // String path= this.getClass().getResource("/").getPath()+"online/template"; diff --git a/src/main/java/org/jeecgframework/web/cgreport/controller/core/CgReportController.java b/src/main/java/org/jeecgframework/web/cgreport/controller/core/CgReportController.java index 53ff6789..a77c8940 100644 --- a/src/main/java/org/jeecgframework/web/cgreport/controller/core/CgReportController.java +++ b/src/main/java/org/jeecgframework/web/cgreport/controller/core/CgReportController.java @@ -24,12 +24,7 @@ import org.jeecgframework.core.online.def.CgReportConstant; import org.jeecgframework.core.online.exception.CgReportNotFoundException; import org.jeecgframework.core.online.util.CgReportQueryParamUtil; import org.jeecgframework.core.online.util.FreemarkerHelper; -import org.jeecgframework.core.util.ContextHolderUtils; -import org.jeecgframework.core.util.DynamicDBUtil; -import org.jeecgframework.core.util.SqlUtil; -import org.jeecgframework.core.util.StringUtil; -import org.jeecgframework.core.util.SysThemesUtil; -import org.jeecgframework.core.util.oConvertUtils; +import org.jeecgframework.core.util.*; import org.jeecgframework.web.cgreport.service.core.CgReportServiceI; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; diff --git a/src/main/java/org/jeecgframework/web/system/sms/service/impl/TSSmsServiceImpl.java b/src/main/java/org/jeecgframework/web/system/sms/service/impl/TSSmsServiceImpl.java index cfec0f16..76fb43ea 100644 --- a/src/main/java/org/jeecgframework/web/system/sms/service/impl/TSSmsServiceImpl.java +++ b/src/main/java/org/jeecgframework/web/system/sms/service/impl/TSSmsServiceImpl.java @@ -1,5 +1,4 @@ package org.jeecgframework.web.system.sms.service.impl; -import java.io.PrintWriter; import java.io.Serializable; import java.net.ConnectException; import java.util.ArrayList; @@ -13,7 +12,6 @@ import org.jeecgframework.core.common.service.impl.CommonServiceImpl; import org.jeecgframework.core.util.DBTypeUtil; import org.jeecgframework.core.util.LogUtil; import org.jeecgframework.core.util.PropertiesUtil; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/org/jeecgframework/web/system/sms/util/task/GoodsMoveTask.java b/src/main/java/org/jeecgframework/web/system/sms/util/task/GoodsMoveTask.java index c97780f7..cad33bd1 100644 --- a/src/main/java/org/jeecgframework/web/system/sms/util/task/GoodsMoveTask.java +++ b/src/main/java/org/jeecgframework/web/system/sms/util/task/GoodsMoveTask.java @@ -62,7 +62,7 @@ public class GoodsMoveTask { } public void goodsMove(String binstrore,String moveStatus ){ //转移到B - String tsql = "SELECT id FROM zzjee.wv_stock_stt " + + String tsql = "SELECT id FROM wv_stock_stt " + "where yushoutianshu <> bzhi_qi " + "and bzhi_qi > 0 " + "and bin_id = 'A' " + @@ -71,7 +71,7 @@ public class GoodsMoveTask { this.genGoodsMove(tsql,"B","",moveStatus); //转移到C - tsql = "SELECT id FROM zzjee.wv_stock_stt " + + tsql = "SELECT id FROM wv_stock_stt " + "where yushoutianshu <> bzhi_qi " + "and bzhi_qi > 0 " + "and bin_id in ('A','B') " + @@ -81,11 +81,13 @@ public class GoodsMoveTask { private void genGoodsMove(String Tsql,String TinId,String binstrore,String moveStatus ){ List> resulmovea = systemService - .findForJdbc(Tsql, binstrore); + .findForJdbc(Tsql); //生成任务转B for (int i = 0; i < resulmovea.size(); i++) { + try{ + WvStockEntity t = systemService.get(WvStockEntity.class,resulmovea.get(i).get("id").toString()); - try { + WmToMoveGoodsEntity wmtomove = new WmToMoveGoodsEntity(); wmtomove.setOrderTypeCode("TPZY"); wmtomove.setBinFrom(t.getKuWeiBianMa());