root
/
lixin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

opt:修改bug

master
DESKTOP-5DIJMF9\admin 2 months ago
parent
e6faeb555c
commit
921a7b382d
9 changed files with 77 additions and 95 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      lxapp/app/products/mes/st/is/issue_bill_other_forinsert.jsp
  2. 57
      lxapp/app/products/mes/st/is/issue_bill_other_forinsert_mater_choice.jsp
  3. 3
      lxapp/app/products/mes/st/is/issue_bill_other_forupdate.jsp
  4. 2
      lxapp/app/products/mes/st/is/issue_bill_other_query.jsp
  5. 86
      lxapp/src/wql/mes/st/is/ST_IS_ISSUE_OTHER_01.wql
  6. 4
      lxservice/com/noblelift/imp/products/mes/service/ifs/sap/SapToWmsServiceImpl.java
  7. 9
      lxservice/com/noblelift/imp/products/mes/service/ifs/sch/CarrierMaterJob.java
  8. 6
      lxservice/com/noblelift/imp/products/mes/service/ifs/sch/SapMaterialShortagelistJob.java
  9. 2
      lxservice/com/noblelift/imp/products/mes/service/st/is/IssueBillOtherServiceImpl.java

3
lxapp/app/products/mes/st/is/issue_bill_other_forinsert.jsp
View File

@ -18,7 +18,6 @@
Combo_box_stor();
Combo_box_work_group();
//检测单类型下拉框
// Combo_box5("issuebill_type", "ST_INV_TYPE_IS", false);
debugger;
});
//班组下拉框
@ -226,7 +225,7 @@
var jres = $.str2json(result);
if (jres.code == "1") { //操作成功
alert(jres.desc);
$.notify("rc_qc_edit");//触发用户添加成功消息
$.notify("st_is_bill_other_edit");//触发用户添加成功消息
_close();
} else {
alert(jres.desc);

57
lxapp/app/products/mes/st/is/issue_bill_other_forinsert_mater_choice.jsp
View File

@ -22,7 +22,7 @@
//查询类型
//工厂下拉框
function Combo_box_factory() {
var form= $.getFieldValue({formid:'edit_form'});
var form= $.getFieldValue({formid:'search_form'});
$.combobox({
id:'factory_uuid',
url : 'wdk?action=wdk.pub&method=call_service&ajaxparam='+ new Date().getTime(),
@ -43,7 +43,7 @@
required:false,
editable:false,
multiple:false,
initvalue:'',
initvalue:'1060',
idField:'id',
textField:'text',
tipPosition:'bottom',
@ -95,7 +95,7 @@
}
function getGridQueryParam() {
//获取form对象值
var FieldValues = $.getFieldValue({formid:'edit_form'});
var FieldValues = $.getFieldValue({formid:'search_form'});
//组织参数
var dataParam = {
_SRVNAME:'server.store.issueBillOther'
@ -146,38 +146,31 @@
<div data-options="region:'center',border:false,collapsed:false">
<div class="easyui-layout" data-options="fit:true" style="overflow: auto;">
<div data-options="region:'north',border:false,collapsed:false" class="row-5" style="padding: 0 10px;height:130px;">
<div class="edit-container">
<form id="edit_form">
<input type="hidden" id="stor_uuid" name="stor_uuid" value="" />
<div class="h_layout fixed">
<div class="row">
<div class="formgroup">
<label>物料:</label>
<div>
<input type="text" class="easyui-validatebox nospaceinside" id="searchBar" name="searchBar" placeholder="物料号">
<div data-options="region:'north',border:false,collapsed:false" class="row-3" style="padding: 0 10px;overflow:hidden;">
<form id="search_form">
<input type="hidden" id="stor_uuid" name="stor_uuid" value="" />
<div class="h_layout fixed">
<div class="row">
<div class="formgroup">
<label>物料号:</label>
<div>
<input type="text" class="easyui-validatebox nospaceinside" id="searchBar" name="searchBar" placeholder="物料号">
</div>
</div>
<div class="formgroup">
<label>工厂:</label>
<div>
<input type="text" class="easyui-validatebox nospaceinside" id="factory_uuid" name="factory_uuid" >
</div>
</div>
</div>
</div>
<div class="formgroup">
<label>工厂:</label>
<div>
<input type="text" class="easyui-validatebox nospaceinside" id="factory_uuid" name="factory_uuid" >
<div class="h_layout fixed">
<div style="width:125px;">
<a class="eapbutton" style="float:right;margin-right:10px;" onclick="query()"><i class="fa fa-search" aria-hidden="true"></i><span><span>查询</span></span></a>
</div>
</div>
</div>
</div>
</div>
</form>
</div>
<div class="h_layout"
style=" vertical-align: middle; margin-top: 10px; margin-right: 20px;">
<div>
<div style="width: 125px;float: right;">
<a class="eapbutton" style="" onclick="query()"><i
class="fa fa-search" aria-hidden="true"></i><span><span>查询</span></span></a>
</div>
</div>
</div>
</form>
</div>
<div id="layout_grid" data-options="region:'center',border:false,collapsed:false" style="padding: 0px 10px;"></div>
</div>

3
lxapp/app/products/mes/st/is/issue_bill_other_forupdate.jsp
View File

@ -205,8 +205,6 @@
return;
}
}
debugger;
// staffFieldValues.carrier_no=allrows[0].carrier_no;
//打开旋转
$.wait_open();
dataParam = {
@ -298,7 +296,6 @@
}
function getGridQueryParam() {
//获取form对象值
// var FieldValues = $.getFieldValue({formid:'search_form'});
//组织参数
var dataParam = {
_SRVNAME:'server.store.issueBillOther'

2
lxapp/app/products/mes/st/is/issue_bill_other_query.jsp
View File

@ -19,6 +19,8 @@
Combo_box_status("status");
//初始化日期控件
initDate();
//注册用户添加成功的监听
$.addListener("st_is_bill_other_edit","query");
});
//初始化日期控件

86
lxapp/src/wql/mes/st/is/ST_IS_ISSUE_OTHER_01.wql
View File

@ -282,7 +282,7 @@ IF 输入.flag = "3"
issuebilldtl.sect_name
end
),
unit.unit_name AS num_base_unit_name,
unit.unit_name AS base_unit_name,
issuebilldtl.issued_qty,
issuebilldtl.noissued_qty,
issuebilldtl.create_deliver_qty,
@ -291,7 +291,6 @@ IF 输入.flag = "3"
issuebilldtl.nodelivered_qty,
issuebilldtl.STATUS,
issuebilldtl.remark,
mdme.net_weight ,
bill.lgort ,
bill.id AS sap_proc_id,
bill.is_checked,
@ -306,9 +305,7 @@ IF 输入.flag = "3"
LEFT JOIN ST_BS_WorkGroup gro ON gro.group_uuid = issuebilldtl.group_uuid
AND gro.is_active = '1'
LEFT JOIN MD_CS_Factory factory ON factory.factory_uuid = issuebilldtl.factory_uuid
LEFT JOIN ST_BS_WMSMaterial mater ON mater.wmsmaterial_uuid = issuebilldtl.wmsmaterial_uuid
LEFT JOIN MD_PB_MeasureUnit unit ON unit.measure_unit_uuid = issuebilldtl.num_base_unit_uuid
LEFT JOIN MD_ME_MaterialBase mdme ON mdme.material_uuid = mater.material_uuid
left join IF_SAP_IssueBillProc bill on bill.issuebill_uuid = issuebilldtl.issuebill_uuid
AND bill.arbpl = gro.group_code
AND bill.MATNR = issuebilldtl.material_code
@ -494,71 +491,50 @@ ENDIF
IF 输入.flag = "12"
PAGEQUERY
SELECT DISTINCT
mater.wmsmaterial_uuid as id,
mater.wmsmaterial_uuid AS id,
mater.wmsmaterial_uuid,
mater.material_uuid,
mater.material_code,
mater.material_name,
mater.factory_uuid,
materialbase.net_weight,
ISNULL(a.canuse_num,0) AS canuse_num,
factory.factory_code,
ISNULL( a.canuse_num, 0 ) AS canuse_num,
factory.factory_name,
measureunit.unit_name AS material_unit_name,
classStandard.class_name AS baseclassify,
materialbase.photo AS photo,
materialbase.is_seal_up,
materialbase.material_spec,
materialbase.material_unit_uuid AS unit_uuid,
measureunit.unit_name AS unit_name,
measureunit.conv_coefficient AS coefficient,
measureunit.measure_unit_uuid as num_base_unit_uuid,
measureunit.unit_name AS num_base_unit_name,
measureunit.unit_name AS base_unit_name,
materialbase.base_unit_uuid,
measureunit2.unit_name AS base_unit_name,
measureunit2.conv_coefficient AS base_coefficient,
materialbase.asst_unit_uuid,
measureunit3.unit_name AS asst_unit_name,
measureunit3.conv_coefficient AS asst_coefficient,
materialbase.weight_unit_uuid,
measureunit4.unit_name AS weight_unit_name,
measureunit4.conv_coefficient AS weight_coefficient,
materialbase.material_prop_scode,
dic.sysdic_name AS material_prop_scode_name,
materialbase.gross_weight,
materialbase.cubage,
materialbase.sect_type AS sect_type,
materialbase.sect_uuid AS sect_uuid,
materialbase.sect_code AS sect_code,
sect_name = (
case when
materialbase.sect_type = '01' then '1002'
else
materialbase.sect_name
end
),
sdi.sysdic_name AS sect_type_name
FROM ST_BS_WMSMaterial mater
LEFT JOIN MD_ME_MaterialBase materialbase ON materialbase.material_uuid=mater.material_uuid
LEFT JOIN ST_BS_SectAttr sect on (sect.sect_uuid=materialbase.sect_uuid and materialbase.sect_type = '03') or (materialbase.sect_type <> '03' and sect.sect_type=materialbase.sect_type)
LEFT JOIN MD_CS_Factory factory ON factory.factory_uuid=mater.factory_uuid
LEFT JOIN PF_PB_SysDicInfo dic ON dic.sysdic_code = materialbase.material_prop_scode and dic.sysdic_type='MD_MATERIAL_PROP'
LEFT JOIN MD_PB_BaseData_ClassInfo classInfo ON classInfo.base_data_uuid = materialbase.material_uuid
LEFT JOIN MD_PB_BaseData_ClassStandard classStandard ON classStandard.class_uuid = classInfo.class_uuid
AND classStandard.base_data_type = classInfo.base_data_type
LEFT JOIN MD_PB_MeasureUnit measureunit ON measureunit.measure_unit_uuid = materialbase.material_unit_uuid
LEFT JOIN MD_PB_MeasureUnit measureunit2 ON measureunit2.measure_unit_uuid = materialbase.base_unit_uuid
LEFT JOIN MD_PB_MeasureUnit measureunit3 ON measureunit3.measure_unit_uuid = materialbase.asst_unit_uuid
LEFT JOIN MD_PB_MeasureUnit measureunit4 ON measureunit4.measure_unit_uuid = materialbase.weight_unit_uuid
sect_name = ( CASE WHEN materialbase.sect_type = '01' THEN '1002' ELSE materialbase.sect_name END ),
sdi.sysdic_name AS sect_type_name
FROM
ST_BS_WMSMaterial mater
LEFT JOIN MD_ME_MaterialBase materialbase ON materialbase.material_uuid= mater.material_uuid
LEFT JOIN ST_BS_SectAttr sect ON ( sect.sect_uuid= materialbase.sect_uuid AND materialbase.sect_type = '03' )
OR ( materialbase.sect_type <> '03' AND sect.sect_type= materialbase.sect_type )
LEFT JOIN MD_CS_Factory factory ON factory.factory_uuid= mater.factory_uuid
LEFT JOIN MD_PB_MeasureUnit measureunit ON measureunit.measure_unit_uuid = materialbase.base_unit_uuid
LEFT JOIN PF_PB_SysDicInfo sdi ON sdi.sysdic_code = materialbase.sect_type AND sdi.sysdic_type = 'ST_SECT_TYPE'
LEFT JOIN (SELECT sum(ISNULL(ivt.canuse_num,0)) AS canuse_num,ivt.material_code,ivt.factory_uuid FROM ST_IVT_StructIvt ivt where ivt.stor_uuid = 输入.stor_uuid group by ivt.material_code,ivt.factory_uuid)a ON a.material_code = mater.material_code and a.factory_uuid = mater.factory_uuid
WHERE 1=1
and materialbase.sysisdelete != '1'
inner JOIN (
SELECT SUM
( ISNULL( ivt.canuse_num, 0 ) ) AS canuse_num,
ivt.material_code,
ivt.factory_uuid
FROM
ST_IVT_StructIvt ivt
WHERE
ivt.stor_uuid = 输入.stor_uuid
GROUP BY
ivt.material_code,
ivt.factory_uuid
) a ON ( a.material_code = mater.material_code AND a.factory_uuid = mater.factory_uuid )
WHERE
1 = 1
AND materialbase.sysisdelete <> '1'
OPTION 输入.factory_uuid <> ""
mater.factory_uuid = 输入.factory_uuid
ENDOPTION
OPTION 输入.searchBar <> ""
mater.material_code LIKE 输入.searchBar
OPTION 输入.material_code <> ""
mater.material_code = 输入.material_code
ENDOPTION
ENDSELECT
ENDPAGEQUERY

4
lxservice/com/noblelift/imp/products/mes/service/ifs/sap/SapToWmsServiceImpl.java
View File

@ -873,6 +873,10 @@ public class SapToWmsServiceImpl implements SapToWmsService {
material_name = material_name.replace("\"","’");
material_name = material_name.replace("'","’");
if (uString.isNotBlank(jo.getString("english_name"))) {
material_name = "(旧"+jo.getString("english_name")+")"+material_name;
}
jo.put("material_name", material_name);
JSONObject unit = WQLObject.getWQLObject("MD_PB_MeasureUnit")

9
lxservice/com/noblelift/imp/products/mes/service/ifs/sch/CarrierMaterJob.java
View File

@ -23,10 +23,15 @@ public class CarrierMaterJob extends BaseJob{
for(int i=0;i<ja.size();i++){
wql.insert(ja.optJSONObject(i));
}
//组盘数据备份
WQLObject.getWQLObject("ST_JOB_CarrierMater").delete("status <>'0' and stack_time<'"+beforeDate+"'");
//任务指令定期清理
WQLObject.getWQLObject("IF_WCS_InstructPoint").delete("create_time<'"+beforeDate+"'");
//物料规格型号表定期清理
WQLObject.getWQLObject("IF_SAP_MaterSpec").delete("1=1");
//删除wdk_scheduler_log
WQLObject.getWQLObject("wdk_scheduler_log").delete("1=1");
}
@Override

6
lxservice/com/noblelift/imp/products/mes/service/ifs/sch/SapMaterialShortagelistJob.java
View File

@ -3,9 +3,12 @@ package com.noblelift.imp.products.mes.service.ifs.sch;
import org.quartz.JobExecutionContext;
import org.wdk.core.env.context.ServiceContext;
import org.wdk.core.spring.SpringContext;
import org.wdk.core.wql.core.bean.WQLObject;
import org.wdk.module.scheduler.source.base.BaseJob;
import com.noblelift.imp.platform.core.util.WdkUtil;
import com.noblelift.imp.products.mes.api.ifs.sap.SapToWmsService;
import net.sf.json.JSONObject;
public class SapMaterialShortagelistJob extends BaseJob{
@ -18,6 +21,9 @@ public class SapMaterialShortagelistJob extends BaseJob{
//班组欠料信息导入
sapToWmsService.getMaterialShortagelist(ctx);
//删除wdk_scheduler_log
WQLObject.getWQLObject("wdk_scheduler_log").delete("1=1");
}
@Override

2
lxservice/com/noblelift/imp/products/mes/service/st/is/IssueBillOtherServiceImpl.java
View File

@ -152,7 +152,7 @@ public class IssueBillOtherServiceImpl implements IssueBillOtherService {
public ServiceResultBean pageQueryMaterByMater(ServiceContext context, String accountId, JSONObject form) {
HashMap<String, String> param = WDK.json2map(form);
if (uString.isNotBlank(form.optString("searchBar")))
param.put("searchBar", "%" + form.optString("searchBar") + "%");
param.put("material_code", form.optString("searchBar"));
JSONObject jres = WQL.getWO("ST_IS_ISSUE_OTHER_01").addParamMap(param).addParam("flag", "12").pageQuery(context, "");
ServiceResultBean srb = new ServiceResultBean();
srb.setSuccess();

Write Preview
Loading…
Cancel
Save