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

Merge remote-tracking branch 'origin/master'

master
zhaodui 2022-04-06 21:30:23 +08:00
parent e88e2f2200 b474c5a5a4
commit b217464d0a
17 changed files with 670 additions and 549 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
doc/05项目启动/项目启动.md Normal file
View File

@ -0,0 +1,41 @@
#### 项目启动
##### 一、项目地址
https://gitee.com/erzhongxmu/jeewms
演示地址：
http://zhaoduiwms.natapp1.cc/jeewms/
账号：admin
密码：llg123
##### 二、导入数据库
1.修改连接地址
![img](file:///C:\Users\ADMINI~1.DES\AppData\Local\Temp\ksohtml\wps1BE2.tmp.jpg)
##### 三、启动后端项目
![img](file:///C:\Users\ADMINI~1.DES\AppData\Local\Temp\ksohtml\wpsA5B.tmp.jpg)
##### 四、项目启动成功
###### 1．登录页面
![img](file:///C:\Users\ADMINI~1.DES\AppData\Local\Temp\ksohtml\wpsA5C.tmp.jpg)
###### 2．首页
![img](file:///C:\Users\ADMINI~1.DES\AppData\Local\Temp\ksohtml\wpsA5D.tmp.jpg)

3
src/main/java/com/zzjee/wm/controller/WmImNoticeHController.java
View File

@ -2817,7 +2817,7 @@ public class WmImNoticeHController extends BaseController {
*/
@RequestMapping(params = "importExcel", method = RequestMethod.POST)
@ResponseBody
public AjaxJson importExcel(HttpServletRequest request,
public AjaxJson importExcel(HttpServletRequest request,
HttpServletResponse response) {
AjaxJson j = new AjaxJson();
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
@ -2921,6 +2921,7 @@ public class WmImNoticeHController extends BaseController {
wmImNoticeH.setSupName(mdsup.getZhongWenQch());
}
wmImNoticeH.setImCusCode(pageheader.getImCusCode());
wmImNoticeHService.addMain(wmImNoticeH, wmImNoticeIListnew);
}
j.setMsg("文件导入成功！");

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

@ -454,11 +454,13 @@ public class WmInQmIController extends BaseController {
if (Double.parseDouble(wmInQmI.getQmOkQuat()) <= 0) {
j.setSuccess(false);
message = "数量不能为0";
j.setMsg(message);
return j;
}
} catch (Exception e) {
j.setSuccess(false);
message = "数量 错误";
j.setMsg(message);
return j;
// TODO: handle exception
}
@ -466,6 +468,7 @@ public class WmInQmIController extends BaseController {
if (!wmUtil.checkbin(wmInQmI.getBinId())) {
j.setSuccess(false);
message = wmInQmI.getBinId() + "储位不存在或已停用";
j.setMsg(message);
return j;
}
}
@ -481,11 +484,19 @@ public class WmInQmIController extends BaseController {
}
}
//托盘占用判断
if(!wmUtil.checkys(wmInQmI.getGoodsId(),wmInQmI.getProData())){
j.setSuccess(false);
message = "超过允收期";
j.setMsg(message);
return j;
}
String flagchsh = "y";
try {
WmImNoticeIEntity wmImNoticeIEntity = systemService.get(WmImNoticeIEntity.class, wmInQmI.getImNoticeItem());
if (wmImNoticeIEntity != null) {
if ("n".equals(ResourceUtil.getConfigByName("chaoshou"))) {
Long weiq = Long.parseLong(wmImNoticeIEntity
.getGoodsCount())
@ -504,6 +515,8 @@ public class WmInQmIController extends BaseController {
if ("n".equals(flagchsh)) {
j.setSuccess(false);
message = "不允许超收";
j.setMsg(message);
return j;
}
@ -540,10 +553,14 @@ public class WmInQmIController extends BaseController {
} else {
j.setSuccess(false);
message = "收货通知不存在";
j.setMsg(message);
return j;
}
if (!flag.equals("X")) {
j.setSuccess(false);
message = "收货通知下此商品不存在或已经全部收货";
j.setMsg(message);
return j;
}
if (flag.equals("X")) {
MvGoodsEntity mvgoods = systemService.findUniqueByProperty(
@ -599,6 +616,15 @@ public class WmInQmIController extends BaseController {
wminqm.setImNoticeItem(jeecgDemo.getId());
wminqm.setGoodsId(jeecgDemo.getGoodsCode());
wminqm.setProData(DateUtils.date2Str(jeecgDemo.getGoodsPrdData(), DateUtils.date_sdf));
if(!wmUtil.checkys(wminqm.getGoodsId(),wminqm.getProData())){
j.setSuccess(false);
message = "超过允收期";
j.setMsg(message);
return j;
}
wminqm.setImNoticeId(jeecgDemo.getImNoticeId());
wminqm.setGoodsName(jeecgDemo.getGoodsName());
wminqm.setBinId(jeecgDemo.getBinPlan());
@ -999,7 +1025,11 @@ public class WmInQmIController extends BaseController {
} catch (Exception e) {
}
if(!wmUtil.checkys(wmImNoticeIEntity.getGoodsCode(),wmInQmI.getProData())){
D0.setErrorMsg("超过允收期");
D0.setOK(false);
return new ResponseEntity(D0, HttpStatus.OK);
}
if ("n".equals(ResourceUtil.getConfigByName("chaoshou"))) {
Double weiq = Double.parseDouble(wmImNoticeIEntity
.getGoodsCount())

2
src/main/java/com/zzjee/wm/service/WmOmNoticeHServiceI.java
View File

@ -18,7 +18,7 @@ public interface WmOmNoticeHServiceI extends CommonService{
* 添加一对多
*
*/
public void addMain(WmOmNoticeHEntity wmOmNoticeH,
public void addMain(WmOmNoticeHEntity wmOmNoticeH,
List<WmOmNoticeIEntity> wmOmNoticeIList) ;
public void addMaintms(WmTmsNoticeHEntity wmOmNoticeH,
List<WmTmsNoticeIEntity> wmOmNoticeIList) ;

2
src/main/java/com/zzjee/wm/service/impl/WmImNoticeHServiceImpl.java
View File

@ -39,7 +39,7 @@ public class WmImNoticeHServiceImpl extends CommonServiceImpl implements WmImNot
}
@Override
public void addMain(WmImNoticeHEntity wmImNoticeH,
public synchronized void addMain(WmImNoticeHEntity wmImNoticeH,
List<WmImNoticeIEntity> wmImNoticeIList){
//保存主信息
if(StringUtil.isEmpty(wmImNoticeH.getOrderTypeCode())){

2
src/main/java/com/zzjee/wm/service/impl/WmInQmIServiceImpl.java
View File

@ -26,7 +26,7 @@ public class WmInQmIServiceImpl extends CommonServiceImpl implements WmInQmIServ
}
@Override
public Serializable save(WmInQmIEntity entity) throws Exception{
public synchronized Serializable save(WmInQmIEntity entity) throws Exception{
Serializable t = super.save(entity);
//执行新增操作增强业务
this.doAddBus(entity);

2
src/main/java/com/zzjee/wm/service/impl/WmOmNoticeHServiceImpl.java
View File

@ -38,7 +38,7 @@ public class WmOmNoticeHServiceImpl extends CommonServiceImpl implements WmOmNot
}
@Override
public void addMain(WmOmNoticeHEntity wmOmNoticeH,
public synchronized void addMain(WmOmNoticeHEntity wmOmNoticeH,
List<WmOmNoticeIEntity> wmOmNoticeIList){
//保存主信息
this.save(wmOmNoticeH);

2
src/main/java/com/zzjee/wm/service/impl/WmToDownGoodsServiceImpl.java
View File

@ -26,7 +26,7 @@ public class WmToDownGoodsServiceImpl extends CommonServiceImpl implements WmToD
}
@Override
public Serializable save(WmToDownGoodsEntity entity) throws Exception{
public synchronized Serializable save(WmToDownGoodsEntity entity) throws Exception{
Serializable t = super.save(entity);
//执行新增操作增强业务
this.doAddBus(entity);

2
src/main/java/com/zzjee/wm/service/impl/WmToUpGoodsServiceImpl.java
View File

@ -46,7 +46,7 @@ public class WmToUpGoodsServiceImpl extends CommonServiceImpl implements WmToUpG
}
@Override
public Serializable save(WmToUpGoodsEntity entity) throws Exception{
public synchronized Serializable save(WmToUpGoodsEntity entity) throws Exception{
Serializable t = super.save(entity);
//执行新增操作增强业务
this.doAddBus(entity);

1086
src/main/java/com/zzjee/wmutil/wmUtil.java
View File

File diff suppressed because it is too large Load Diff

1
src/main/java/org/jeecgframework/core/util/ApplicationContextUtil.java
View File

@ -13,7 +13,6 @@ public class ApplicationContextUtil implements ApplicationContextAware {
private static ApplicationContext context;
@Override
public void setApplicationContext(ApplicationContext context)
throws BeansException {

30
src/main/java/test/JeecgOneGUI.java
View File

@ -3,8 +3,11 @@ package test;
import com.sap.conn.jco.JCoTable;
import com.zzjee.sap.SapRFC;
import org.jeecgframework.codegenerate.window.CodeWindow;
import org.jeecgframework.core.util.DateUtils;
import java.sql.SQLOutput;
import java.text.ParseException;
import java.util.Calendar;
import java.util.HashMap;
import java.util.Map;
@ -17,19 +20,24 @@ import java.util.Map;
*/
public class JeecgOneGUI {
public static void main(String[] args) {
public static void main(String[] args) throws ParseException {
// CodeWindow codeWindow = new CodeWindow();
// codeWindow.pack();
try {
SapRFC saprfc = SapRFC.getInstance();
saprfc.prepare("ZZKMES_FM_PP112");
saprfc.execCall();
// saprfc.getParamTableList()
JCoTable tab = saprfc.getParamTableList("ES_OUTPUT");
System.out.print("rows:" + tab.getNumRows());
} catch (Exception e) {
System.out.print(e.getMessage());
}
// try {
// SapRFC saprfc = SapRFC.getInstance();
// saprfc.prepare("ZZKMES_FM_PP112");
// saprfc.execCall();
//// saprfc.getParamTableList()
// JCoTable tab = saprfc.getParamTableList("ES_OUTPUT");
// System.out.print("rows:" + tab.getNumRows());
// } catch (Exception e) {
// System.out.print(e.getMessage());
// }
Calendar now = DateUtils.getCalendar();
Calendar scrq = DateUtils.parseCalendar("2021-04-05","yyyy-MM-dd");
int rq = DateUtils.dateDiff('d',now,scrq);
System.out.println(rq);
}
}

2
src/main/resources/dbconfig.properties
View File

@ -20,7 +20,7 @@ validationQuery.sqlserver=SELECT 1
jdbc.url.jeecg=jdbc:mysql://127.0.0.1:3306/jee-wms?useUnicode=true&characterEncoding=UTF-8
jdbc.username.jeecg=root
jdbc.password.jeecg=Zzerp123
jdbc.password.jeecg=password
jdbc.dbType=mysql
#Oracle

4
src/main/resources/sysConfig.properties
View File

@ -218,7 +218,8 @@ show.noticeurl=http://120.92.53.114/jeewms/wmOmNoticeHController.do?showlist&id=
show.goodsurl=http://120.92.53.114/jeewms/wmOmNoticeHController.do?showgoods&id=
wms.totms=no
#????? W???E???A??
wms.yskz=E
sys.del=database
wm.alldown=yes
@ -236,3 +237,4 @@ cus.role=CUS

2
src/main/webapp/webpage/com/zzjee/wm/wmInQmI-add.jsp
View File

@ -73,7 +73,7 @@ window.onload = function() {
</head>
<body>
<t:formvalid formid="formobj" dialog="true" usePlugin="password" layout="table" action="wmInQmIController.do?doAdd" tiptype="1" >
<t:formvalid formid="formobj" dialog="true" usePlugin="password" layout="table" action="wmInQmIController.do?doAdd" tiptype="2" >
<%--<t:formvalid formid="formobj" dialog="true" usePlugin="password" layout="div" >--%>
<input type="hidden" id="btn_sub" class="btn_sub"/>
<input type="hidden" id="id" name="id"/>

2
src/main/webapp/webpage/com/zzjee/wm/wmInQmIList.jsp
View File

@ -26,7 +26,7 @@
<t:dgCol title="到货数量" field="imQuat" queryMode="single" width="80"></t:dgCol>
<t:dgCol title="数量" field="qmOkQuat" queryMode="single" width="80"></t:dgCol>
<t:dgCol title="备注" field="itemText" queryMode="single" width="50"></t:dgCol>
<t:dgCol title="温度" field="recDeg" hidden="true" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="温度" field="recDeg" queryMode="single" width="120"></t:dgCol>
<t:dgCol title="生产日期" field="proData" formatter="yyyy-MM-dd" queryMode="group" width="120"></t:dgCol>
<t:dgCol title="托盘" field="tinId" query="true" queryMode="single" width="80"></t:dgCol>
<t:dgCol title="单位" field="goodsUnit" queryMode="single" width="50"></t:dgCol>

2
src/main/webapp/webpage/com/zzjee/wm/wmOmNoticeHList.jsp
View File

@ -49,7 +49,7 @@
<t:dgFunOpt title="打印出库单" funname="printckdpage(id)" urlclass="ace_button" urlfont="fa-print" exp="omSta#ne#已删除"/>
<%--<t:dgFunOpt title="装箱单" funname="printckd(id)" urlclass="ace_button" urlfont=" fa-print" exp="omSta#ne#已删除"/>--%>
<t:dgToolBar title="录入" icon="icon-add" url="wmOmNoticeHController.do?goAdd&orderTypeCode=11" funname="add" width="100%" height="100%"></t:dgToolBar>
<t:dgToolBar title="编辑" icon="icon-edit" operationCode="omnoedit" url="wmOmNoticeHController.do?goUpdate" funname="update" width="100%" height="100%"></t:dgToolBar>
<t:dgToolBar title="编辑" icon="icon-edit" url="wmOmNoticeHController.do?goUpdate" funname="update" width="100%" height="100%"></t:dgToolBar>
<%-- <t:dgToolBar title="批量删除" icon="icon-remove" url="wmOmNoticeHController.do?doBatchDel" funname="deleteALLSelect"></t:dgToolBar> --%>
<t:dgToolBar title="查看" icon="icon-search" url="wmOmNoticeHController.do?goUpdate" funname="detail" width="100%" height="100%"></t:dgToolBar>
<t:dgToolBar title="导入" icon="icon-put" funname="ImportXls"></t:dgToolBar>