zcy
/
jee_wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

数据库精简

master
erzhongxmu 2018-11-08 00:42:12 +08:00
parent 1022be8516
commit f0d5838773
5 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/zzjee/wm/controller/WmInQmIController.java
View File

@ -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){

2
src/main/java/org/jeecgframework/web/cgform/controller/template/CgformTemplateController.java
View File

@ -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";

7
src/main/java/org/jeecgframework/web/cgreport/controller/core/CgReportController.java
View File

@ -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;

2
src/main/java/org/jeecgframework/web/system/sms/service/impl/TSSmsServiceImpl.java
View File

@ -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;

10
src/main/java/org/jeecgframework/web/system/sms/util/task/GoodsMoveTask.java
View File

@ -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<Map<String, Object>> 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());