rev:页面优化
This commit is contained in:
@@ -0,0 +1,27 @@
|
||||
package org.nl.wms.autotask;
|
||||
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.nl.modules.wql.core.bean.WQLObject;
|
||||
import org.nl.system.service.param.ISysParamService;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
/**
|
||||
* 自动清除日志(操作日志、异常日志)数据
|
||||
*/
|
||||
@Slf4j
|
||||
@Component
|
||||
@RequiredArgsConstructor
|
||||
public class CleanTask {
|
||||
private final ISysParamService paramService;
|
||||
|
||||
public void run() {
|
||||
//delete from sys_log where DATE(create_time) <= DATE(DATE_SUB(NOW(),INTERVAL 30 day)) limit 10;
|
||||
WQLObject taskTab = WQLObject.getWQLObject("sch_base_task");
|
||||
int days = Integer.parseInt(paramService.findByCode("task_day").getValue());
|
||||
taskTab.delete("DATE(create_time) <= DATE(DATE_SUB(NOW(),INTERVAL " + days + " day))");
|
||||
|
||||
log.info("自动清理任务执行成功...!");
|
||||
}
|
||||
|
||||
}
|
||||
@@ -83,15 +83,6 @@ public class MaterialbaseController {
|
||||
return new ResponseEntity<>(MaterOptTypeEnum.getObj(materOpt_code), HttpStatus.OK);
|
||||
}
|
||||
|
||||
@PostMapping("/synchronize")
|
||||
@Log("物料同步")
|
||||
|
||||
//@PreAuthorize("@el.check('materialtype:list')")
|
||||
public ResponseEntity<Object> synchronize(@RequestBody Map whereJson) {
|
||||
materialBaseService.synchronize(whereJson);
|
||||
return new ResponseEntity<>(HttpStatus.OK);
|
||||
}
|
||||
|
||||
@Log("查询产品系列类型")
|
||||
|
||||
@GetMapping("/getProductSeries")
|
||||
|
||||
@@ -88,8 +88,6 @@ public interface MaterialbaseService {
|
||||
*/
|
||||
JSONObject getMaterOptType(String materOpt_code);
|
||||
|
||||
void synchronize(Map whereJson);
|
||||
|
||||
JSONArray getProductSeries(String parent_class_id);
|
||||
|
||||
|
||||
|
||||
@@ -39,7 +39,6 @@ import java.util.Set;
|
||||
@Slf4j
|
||||
public class MaterialbaseServiceImpl implements MaterialbaseService {
|
||||
private final ClassstandardService classstandardService;
|
||||
//private final WmsToErpService wmsToErpService;
|
||||
|
||||
@Override
|
||||
public Map<String, Object> queryAll(Map whereJson, Pageable page) {
|
||||
@@ -214,12 +213,6 @@ public class MaterialbaseServiceImpl implements MaterialbaseService {
|
||||
return MaterOptTypeEnum.getObj(materOpt_code);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void synchronize(Map whereJson) {
|
||||
/* wmsToErpService.getClassInfo(null);
|
||||
wmsToErpService.getMaterialInfo(null);*/
|
||||
}
|
||||
|
||||
@Override
|
||||
public JSONArray getProductSeries(String parent_class_id) {
|
||||
WQLObject wo = WQLObject.getWQLObject("MD_PB_ClassStandard");
|
||||
|
||||
@@ -55,11 +55,13 @@
|
||||
SELECT
|
||||
task.*,
|
||||
md.class_name task_type_name,
|
||||
user.person_name AS create_name1,
|
||||
dict.label task_status_name,
|
||||
case when task.task_type like '0105%' then 'LK' ELSE task.product_area end AS final_product_area
|
||||
FROM
|
||||
sch_base_task task
|
||||
LEFT JOIN md_pb_classstandard md ON task.task_type = md.class_code
|
||||
LEFT JOIN sys_user user ON user.username = task.create_name
|
||||
LEFT JOIN sys_dict dict ON dict.`value` = task.task_status AND dict.`code` = 'task_status'
|
||||
WHERE
|
||||
1=1
|
||||
|
||||
@@ -340,57 +340,6 @@
|
||||
ENDQUERY
|
||||
ENDIF
|
||||
|
||||
IF 输入.flag = "8"
|
||||
PAGEQUERY
|
||||
SELECT
|
||||
pp.CREATE_DATE AS receive_date,
|
||||
pp.VBILLCODE AS source_bill_code,
|
||||
mb.material_code,
|
||||
mb.material_name,
|
||||
class.class_desc,
|
||||
mb.material_id,
|
||||
pp.QTY AS receive_qty,
|
||||
( CASE WHEN a.real_qty IS NULL THEN pp.QTY ELSE ( pp.QTY - a.real_qty ) END ) AS need_qty,
|
||||
mu.unit_name AS qty_unit_name,
|
||||
'采购订单' AS source_type_name,
|
||||
mu.measure_unit_id AS qty_unit_id,
|
||||
pp.id AS source_billdtl_id,
|
||||
'PO' AS source_bill_type,
|
||||
'PCS_IF_PurchaseOrderProc' AS source_bill_table,
|
||||
pp.id AS base_billdtl_id,
|
||||
'PO' AS base_bill_type,
|
||||
'' AS base_bill_code,
|
||||
'PCS_IF_PurchaseOrderProc' AS base_bill_table
|
||||
FROM
|
||||
pcs_if_purchaseorderproc pp
|
||||
LEFT JOIN md_me_materialbase mb ON mb.ext_id = pp.ITEM_ID
|
||||
INNER JOIN md_pb_classstandard class ON class.class_id = mb.material_type_id
|
||||
INNER JOIN md_pb_measureunit mu ON mu.ext_id = pp.M_UNIT_ID
|
||||
LEFT JOIN ( SELECT dtl.source_billdtl_id, SUM( dtl.real_qty ) AS real_qty FROM st_ivt_iostorinvdtl dtl GROUP BY source_billdtl_id ) a ON a.source_billdtl_id = pp.id
|
||||
WHERE
|
||||
pp.proc_status IN ( '01', '02' )
|
||||
AND
|
||||
pp.DR='0'
|
||||
AND
|
||||
mb.material_type_id IN 输入.clsss_ids
|
||||
OPTION 输入.material_search <> ""
|
||||
(mb.material_code like 输入.material_search
|
||||
OR
|
||||
mb.material_name like 输入.material_search)
|
||||
ENDOPTION
|
||||
OPTION 输入.bill_code <> ""
|
||||
pp.VBILLCODE like 输入.bill_code
|
||||
ENDOPTION
|
||||
OPTION 输入.begin_time <> ""
|
||||
pp.CREATE_DATE >= 输入.begin_time
|
||||
ENDOPTION
|
||||
OPTION 输入.end_time <> ""
|
||||
pp.CREATE_DATE <= 输入.end_time
|
||||
ENDOPTION
|
||||
ENDSELECT
|
||||
ENDPAGEQUERY
|
||||
ENDIF
|
||||
|
||||
IF 输入.flag = "9"
|
||||
PAGEQUERY
|
||||
SELECT
|
||||
|
||||
@@ -18,7 +18,6 @@
|
||||
输入.begin_time TYPEAS s_string
|
||||
输入.end_time TYPEAS s_string
|
||||
输入.material_code TYPEAS s_string
|
||||
输入.classIds TYPEAS f_string
|
||||
输入.pcsn TYPEAS s_string
|
||||
输入.sap_pcsn TYPEAS s_string
|
||||
输入.package_box_sn TYPEAS s_string
|
||||
@@ -53,14 +52,9 @@
|
||||
stor.stor_name,
|
||||
da.sect_date,
|
||||
da.pcsn,
|
||||
da.quality_scode,
|
||||
class.class_name,
|
||||
class.class_code,
|
||||
mater.material_id,
|
||||
mater.material_code,
|
||||
mater.material_name,
|
||||
mater.material_model,
|
||||
unit.unit_name,
|
||||
da.start_num,
|
||||
da.in_num,
|
||||
da.out_num,
|
||||
@@ -77,22 +71,17 @@
|
||||
sum(end_num) AS end_num,
|
||||
sum(more_num) AS more_num,
|
||||
sum(less_num) AS less_num,
|
||||
max(material_id) AS material_id,
|
||||
max( material_id ) AS material_id,
|
||||
max(stor_id) AS stor_id,
|
||||
max(sect_date) AS sect_date,
|
||||
max(quality_scode) AS quality_scode,
|
||||
max(pcsn) AS pcsn
|
||||
sect_date,
|
||||
pcsn
|
||||
FROM
|
||||
ST_IVT_IOStorDaily a
|
||||
GROUP BY
|
||||
a.material_id,
|
||||
a.quality_scode,
|
||||
a.pcsn,
|
||||
a.sect_date
|
||||
) AS da
|
||||
LEFT JOIN MD_ME_MaterialBase mater ON da.material_id = mater.material_id
|
||||
LEFT JOIN md_pb_classstandard class ON mater.material_type_id = class.class_id
|
||||
LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = mater.base_unit_id
|
||||
LEFT JOIN st_ivt_bsrealstorattr stor ON stor.stor_id = da.stor_id
|
||||
LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = da.pcsn
|
||||
WHERE 1=1
|
||||
@@ -127,10 +116,6 @@
|
||||
sub.package_box_sn like 输入.package_box_sn
|
||||
ENDOPTION
|
||||
|
||||
OPTION 输入.classIds <> ""
|
||||
class.class_id in 输入.classIds
|
||||
ENDOPTION
|
||||
|
||||
ENDSELECT
|
||||
ENDPAGEQUERY
|
||||
ENDIF
|
||||
|
||||
Reference in New Issue
Block a user