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

收货通知增加计划占用储位数

master
erzhongxmu 2020-10-08 11:53:05 +08:00
parent 51066181a7
commit 15a40d7a41
4 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/zzjee/api/wmomController.java
View File

@ -201,6 +201,7 @@ public class wmomController {
rfidBuseEntity.setRfidId1(barcode);
rfidBuseEntity.setRfidId2(weight);
rfidBuseEntity.setRfidId3(volumn);
rfidBuseEntity.setCreateDate(now());
systemService.save(rfidBuseEntity);
}catch (Exception e){

18
src/main/java/org/jeecgframework/web/system/sms/util/task/SmsSendTask.java
View File

@ -72,9 +72,9 @@ public class SmsSendTask {
try {//查找储位 设置批量收货基本数量
List<WmInQmIEntity> WmInQmlist = new ArrayList<WmInQmIEntity>();
hql = null;
hql = "from WmInQmIEntity t where t.binSta=? and (t.binId is null or t.binId = '' ) ";
hql = "from WmInQmIEntity t where t.binSta= 'N' and (t.binId is null or t.binId = '' ) ";
WmInQmlist = systemService.findHql(hql, new Object[] { "N" });
WmInQmlist = systemService.findHql(hql);
for (WmInQmIEntity wmInQmIEntity : WmInQmlist) {
if(wmInQmIEntity.getImNoticeId().startsWith("YK")){//越库任务
@ -108,9 +108,9 @@ public class SmsSendTask {
}
String hqllastbin = "from WmInQmIEntity t where t.binSta=? and (t.binId is not null or t.binId <> '' ) and imNoticeItem = ? order by updateDate desc ";
String hqllastbin = "from WmInQmIEntity t where t.binSta= 'Y' and (t.binId is not null or t.binId <> '' ) and imNoticeItem = ? order by updateDate desc ";
List<WmInQmIEntity> WmInQmbinlist = systemService.findHql(hql, new Object[] { "Y" },wmInQmIEntity.getImNoticeItem());
List<WmInQmIEntity> WmInQmbinlist = systemService.findHql(hqllastbin,wmInQmIEntity.getImNoticeItem());
String lastbin = ""; //本单上一个储位
String lastbinfenzu = ""; //本单上一个储位分组
@ -121,7 +121,7 @@ public class SmsSendTask {
lastbinfenzu = mdblist.get(0).getZuiDaMianJi();
}
}
sql = "select binid from wv_avabin where ku_wei_lei_xing <> '不良品区' and zui_da_mian_ji = '" +lastbinfenzu+
sql = "select binid from wv_avabin where ting_yong <> 'Y' and zui_da_mian_ji = '" +lastbinfenzu+
"' and zui_da_ti_ji >"
+ zuidatiji
+ " and ku_wei_shu_xing = (select cf_wen_ceng from mv_goods where goods_code = '"
@ -143,7 +143,7 @@ public class SmsSendTask {
systemService.updateEntitie(wmInQmIEntity);
}else{
sql = "select binid from wv_avabin where ku_wei_lei_xing <> '不良品区' and ti_ji_dan_wei <= " +binplantuopan+
sql = "select binid from wv_avabin where ting_yong <> 'Y' and ti_ji_dan_wei <= " +binplantuopan+
" and zhong_liang_dan_wei >= " +binplantuopan+
" and zui_da_ti_ji >"
+ zuidatiji
@ -220,7 +220,7 @@ public class SmsSendTask {
systemService.saveOrUpdate(wmInQmIEntity);
}
} catch (Exception e) {
// TODO: handle exception
e.printStackTrace();
}
try {
// 更新上架商品基本单位基本数量
@ -492,7 +492,7 @@ public class SmsSendTask {
String tsql = "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 = '待下架')"
+ " ws.ku_wei_bian_ma = mb.ku_wei_bian_ma and mb.ting_yong <> 'Y' and (ws.kuctype = '库存' or ws.kuctype = '待下架')"
;
String aldown = "no";
try {
@ -548,7 +548,7 @@ public class SmsSendTask {
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 = '待下架')";
+ " ws.ku_wei_bian_ma = mb.ku_wei_bian_ma and mb.ting_yong <> 'Y' and (ws.kuctype = '库存' or ws.kuctype = '待下架')";
if("yes".equals(aldown)){

6
src/main/webapp/webpage/com/zzjee/md/mdBin-add.jsp
View File

@ -50,12 +50,6 @@
<!-- tab内容 -->
<div class="con-wrapper" id="con-wrapper1" style="display: block;">
<div class="row form-wrapper">
<div class="row show-grid">
<div class="col-xs-3 text-center">
<b style="color:red">库存地点</b>

22
src/main/webapp/webpage/com/zzjee/wm/wmOmQmIassignList.jsp
View File

@ -33,7 +33,7 @@
<t:dgCol title="备注" field="itemText" queryMode="group" width="50"></t:dgCol>
<t:dgCol title="生产日期" field="proData" extendParams="editor:'text'" queryMode="group" width="80"></t:dgCol>
<t:dgCol title="托盘" field="tinId" extendParams="editor:'text'" query="true" queryMode="single" width="70"></t:dgCol>
<%-- <t:dgCol title="批次" field="goodsBatch" queryMode="group" width="120"></t:dgCol> --%>
<t:dgCol title="仓位" field="binId" extendParams="editor:'text'" query="true" queryMode="single" width="90"></t:dgCol>
<%-- <t:dgCol title="体积" field="tinTj" queryMode="group" width="70"></t:dgCol> --%>
@ -79,7 +79,7 @@
</div>
</div>
<script src = "webpage/com/zzjee/wm/wmOmQmIList.js"></script>
<script src = "webpage/com/zzjee/wm/wmOmQmIList.js"></script>
<script type="text/javascript">
@ -138,7 +138,7 @@
if (d.success) {
tip("波次生成成功");
$('#wmOmQmIList').datagrid('reload',{});
}
}
}
});
}
@ -170,7 +170,7 @@
});
}
function doassignALLSelect(){
var ids = [];
@ -191,11 +191,11 @@
if (d.success) {
tip("添加到下架任务清单成功");
$('#wmOmQmIList').datagrid('reload',{});
}
}
}
});
}
function taskassign(id){
var url = "wmOmQmIController.do?doassign&id="+id;
$.ajax({
@ -210,11 +210,13 @@
if (d.success) {
tip("添加到下架任务清单成功");
$('#wmOmQmIList').datagrid('reload',{});
}
windows.open("http://192.168.0.102:9080/fxj-boot/fxj/base/getxiajia");
}
}
});
}
function wmtodown(id){
var url = "wmOmQmIController.do?dotodown&id="+id;
$.ajax({
@ -229,7 +231,7 @@
if (d.success) {
tip("下架成功");
$('#wmOmQmIList').datagrid('reload',{});
}
}
}
});
}
@ -311,4 +313,4 @@ function ExportXlsByT() {
JeecgExcelExport("wmOmQmIController.do?exportXlsByT","wmOmQmIList");
}
</script>
</script>