diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlSELECT.java b/lms/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlSELECT.java index 0641afe81..435359dc2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlSELECT.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/wql/core/engine/syntax/wqlSELECT.java @@ -1,6 +1,5 @@ package org.nl.modules.wql.core.engine.syntax; -import cn.hutool.core.util.StrUtil; import lombok.extern.slf4j.Slf4j; import org.nl.modules.wql.WQLCore; import org.nl.modules.wql.core.DataType; @@ -160,7 +159,7 @@ public class wqlSELECT extends IWQL { if ((wo.wp.PAGE_PAGESTART != -99 && wo.wp.PAGE_PAGERECORDNUM != -99) && (wo.wp.SORT_ORDERBYFIELD.length() > 0)) { // String sqlTmp = "select * from("+wo.wp.sSQL+") TOTALRECORDVIEW order by " + wo.wp.SORT_ORDERBYFIELD + " limit "+wo.wp.PAGE_PAGESTART+","+wo.wp.PAGE_PAGERECORDNUM; // String sqlTmp = wo.wp.sSQL+" order by " + wo.wp.SORT_ORDERBYFIELD + " limit "+wo.wp.PAGE_PAGESTART+","+wo.wp.PAGE_PAGERECORDNUM; -// String sqlTmp = "select top "+wo.wp.PAGE_PAGERECORDNUM+"* FROM () WHERE ID NOT IN(SELECT TOP 45000 ID FROM ARTICLE ORDER BY YEAR DESC, ID DESC) ORDER BY YEAR DESC,ID DESC +// String sqlTmp = "select top "+wo.wp.PAGE_PAGERECORDNUM+"* FROM () WHERE ID NOT IN(SELECT TOP 45000 ID FROM ARTICLE ORDER BY YEAR DESC, ID DESC) ORDER BY YEAR DESC,ID DESC String sqlTmp = "select * from (select row_number() over( order by " + wo.wp.SORT_ORDERBYFIELD + ") rownumber,* from (" + wo.wp.sSQL + ") b ) a1 where rownumber between " + (wo.wp.PAGE_PAGESTART + 1) + " and " + (wo.wp.PAGE_PAGESTART + wo.wp.PAGE_PAGERECORDNUM); @@ -371,15 +370,10 @@ public class wqlSELECT extends IWQL { //2.2、对分页进行处理 Set keySettTempTable = WQLCore.tempTableMap.keySet(); if (this.isInQuery && this.isPageQuery) { - if ((wo.wp.PAGE_PAGESTART != -99 && wo.wp.PAGE_PAGERECORDNUM != -99) ) { + if ((wo.wp.PAGE_PAGESTART != -99 && wo.wp.PAGE_PAGERECORDNUM != -99) && (wo.wp.SORT_ORDERBYFIELD.length() > 0)) { // String sqlTmp = "select * from("+wo.wp.sSQL+") TOTALRECORDVIEW order by " + wo.wp.SORT_ORDERBYFIELD + " limit "+wo.wp.PAGE_PAGESTART+","+wo.wp.PAGE_PAGERECORDNUM; String sqlTmp = wo.wp.sSQL + " order by " + wo.wp.SORT_ORDERBYFIELD + " limit " + wo.wp.PAGE_PAGESTART + "," + wo.wp.PAGE_PAGERECORDNUM; - if (StrUtil.isEmpty(wo.wp.SORT_ORDERBYFIELD)){ - sqlTmp = wo.wp.sSQL + " limit " + wo.wp.PAGE_PAGESTART + "," + wo.wp.PAGE_PAGERECORDNUM; - - } - // String sqlTmp = "select * from (select PAGE_SRCRESULTSET_1.*, row_number() over(order by " + wo.wp.SORT_ORDERBYFIELD + ")" // + " as SORT_INDEXFIELDALIAS from ( " // + wo.wp.sSQL @@ -412,7 +406,7 @@ public class wqlSELECT extends IWQL { log.error("关闭st,rs出错" + e.toString()); } } - if (this.isPageQuery) { + if (wo.wp.SORT_ORDERBYFIELD.length() > 0) { //对sql进行特殊处理，找出和第一个select配对的from，并把中间全部换为1 // String page_sql = change_1(wo.wp.sSQL); String page_sql = wo.wp.sSQL; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java index a2959b62d..9a5e89f1d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java @@ -105,7 +105,7 @@ public class LmsToMesServiceImpl implements LmsToMesService { if (ObjectUtil.isEmpty(sb_jo)) { throw new BadRequestException("未查询到母卷号：" + iContainerName + "对应的生箔机台编号！"); } - if (StrUtil.equals("0", sb_jo.getString("is_used"))) { + if (StrUtil.equals("0", sb_jo.getString("mes_used"))) { result.put("status", HttpStatus.OK.value()); result.put("message", "设备：" + sb_jo.getString("point_code") + "未启动!"); result.put("data", new JSONObject()); @@ -165,7 +165,7 @@ public class LmsToMesServiceImpl implements LmsToMesService { if (ObjectUtil.isEmpty(sb_jo)) { throw new BadRequestException("未查询到母卷号：" + iContainerName + "对应的生箔机台编号！"); } - if (StrUtil.equals("0", sb_jo.getString("is_used"))) { + if (StrUtil.equals("0", sb_jo.getString("mes_used"))) { result.put("status", HttpStatus.OK.value()); result.put("message", "设备：" + sb_jo.getString("point_code") + "未启动!"); result.put("data", new JSONObject()); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java index de3d62a29..ed0a486dd 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java @@ -160,7 +160,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { if (ObjectUtil.isEmpty(jsonPoint)) { jsonPoint = new JSONObject(); } - if (StrUtil.equals("1", jsonPoint.getString("is_used"))) { + if (StrUtil.equals("1", jsonPoint.getString("mes_used"))) { JSONObject json = new JSONObject(); json.put("ContainerName", raw_jo.getString("container_name")); json.put("ResourceName", raw_jo.getString("resource_name")); @@ -284,7 +284,7 @@ public class MesToLmsServiceImpl implements MesToLmsService { if (ObjectUtil.isEmpty(sb_jo)) { throw new BadRequestException("未查询到母卷号：" + ContainerName + "对应的生箔机台编号！"); } - if (StrUtil.equals("1", sb_jo.getString("is_used"))) { + if (StrUtil.equals("1", sb_jo.getString("mes_used"))) { if (StrUtil.equals(nextSpec, "1")) { /* * 入烘箱 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java index 371cdc56a..795883fd9 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java @@ -96,15 +96,10 @@ public class BakingServiceImpl implements BakingService { throw new BadRequestException("未查询到母卷号：" + container_name + "对应的生箔机台编号！"); } - /*if (StrUtil.equals("1", sb_jo.getString("is_used")) && !raw_jo.getString("is_baking").equals("1")) { - throw new BadRequestException("该母卷在MES上未进行决策入烘箱，不允许进行入烘箱操作！"); - }*/ - - if (!raw_jo.getString("is_baking").equals("1")) { + if (StrUtil.equals("1", sb_jo.getString("mes_used")) && !raw_jo.getString("is_baking").equals("1")) { throw new BadRequestException("该母卷在MES上未进行决策入烘箱，不允许进行入烘箱操作！"); } - if (ObjectUtil.isEmpty(container_name)) { throw new BadRequestException("母卷号不能为空"); } @@ -472,11 +467,7 @@ public class BakingServiceImpl implements BakingService { throw new BadRequestException("未查询到母卷号：" + container_name + "对应的生箔机台编号！"); } - /*if (StrUtil.equals("1", sb_jo.getString("is_used")) && !raw_jo.getString("is_instor").equals("1")) { - throw new BadRequestException("该母卷在MES上未进行决策入半成品库，不允许进行入冷却操作！"); - }*/ - - if (!raw_jo.getString("is_instor").equals("1")) { + if (StrUtil.equals("1", sb_jo.getString("mes_used")) && !raw_jo.getString("is_instor").equals("1")) { throw new BadRequestException("该母卷在MES上未进行决策入半成品库，不允许进行入冷却操作！"); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/dto/SbPointIvtDto.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/dto/SbPointIvtDto.java index a70676978..e88d7609d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/dto/SbPointIvtDto.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/dto/SbPointIvtDto.java @@ -43,6 +43,9 @@ public class SbPointIvtDto implements Serializable { /** 是否启用 */ private String is_used; + /** 是否启用 */ + private String mes_used; + /** 创建人 */ private String create_id; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/SbPointIvtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/SbPointIvtServiceImpl.java index 8c81face8..4a350aa51 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/SbPointIvtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/service/impl/SbPointIvtServiceImpl.java @@ -46,6 +46,7 @@ public class SbPointIvtServiceImpl implements SbPointIvtService { map.put("point_code", "%" + whereJson.get("point_code") + "%"); map.put("product_area", whereJson.get("product_area")); map.put("is_used", whereJson.get("is_used")); + map.put("mes_used", whereJson.get("mes_used")); if (ObjectUtil.isNotEmpty(in_area_id)) map.put("in_area_id", in_area_id); JSONObject json = WQL.getWO("ST_IVT_SBPOINTIVT").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "product_area,point_code"); return json; diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_SBPOINTIVT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_SBPOINTIVT.wql index 039e454b8..4c31f666c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_SBPOINTIVT.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/ST_IVT_SBPOINTIVT.wql @@ -17,6 +17,7 @@ 输入.point_code TYPEAS s_string 输入.product_area TYPEAS s_string 输入.is_used TYPEAS s_string + 输入.mes_used TYPEAS s_string 输入.in_area_id TYPEAS f_string @@ -58,6 +59,9 @@ OPTION 输入.is_used <> "" is_used = 输入.is_used ENDOPTION + OPTION 输入.is_used <> "" + mes_used = 输入.mes_used + ENDOPTION ENDSELECT ENDPAGEQUERY ENDIF \ No newline at end of file diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls index 40558cf76..7ba6a10b5 100644 Binary files a/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls and b/lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/pdm.xls differ diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java index f9d4ba246..e9d3a3580 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java @@ -154,8 +154,8 @@ public class CheckOutBillController { return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @PostMapping("/allSetPoint") - @Log("设置全部站点") - @ApiOperation("设置全部站点") + @Log("一键设置") + @ApiOperation("一键设置") public ResponseEntity allSetPoint(@RequestBody JSONObject whereJson) { checkOutBillService.allSetPoint(whereJson); return new ResponseEntity<>(HttpStatus.NO_CONTENT); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql index aaa3cb5f3..e20e18311 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql @@ -93,7 +93,7 @@ LEFT JOIN md_cs_customerbase cu ON ios.cust_code = cu.cust_code LEFT JOIN st_ivt_iostorinvdtl dtl ON ios.iostorinv_id = dtl.iostorinv_id LEFT JOIN st_ivt_iostorinvdis dis ON dtl.iostorinvdtl_id = dis.iostorinvdtl_id - LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn AND dis.box_no = sub.package_box_sn + LEFT JOIN pdm_bi_subpackagerelationrecord sub ON sub.container_name = dis.pcsn AND dis.box_no = sub.package_box_sn AND sub.bill_code = ios.bill_code WHERE ios.io_type = '1' and ios.is_delete='0' diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java index f4684232a..27d143d0e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java @@ -415,7 +415,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { } JSONObject jsonSub = subTab.query("container_name = '" + json2.getString("pcsn") + "' AND package_box_sn = '" + json2.getString("box_no") + "'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(jsonSect)) { + if (ObjectUtil.isNotEmpty(jsonSub)) { jsonDis.put("CHARG", jsonSub.getString("sap_pcsn")); // sap批次 } jsonDis.put("VBELN", json.getString("vbeln")); // 交货 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/wql/QST_IVT_INANDOUTRETRUN.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/wql/QST_IVT_INANDOUTRETRUN.wql index bc04daedd..06ad82d2f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/wql/QST_IVT_INANDOUTRETRUN.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/returns/wql/QST_IVT_INANDOUTRETRUN.wql @@ -68,7 +68,7 @@ user.person_name AS upload_name FROM st_ivt_iostorinv mst - LEFT JOIN ( + INNER JOIN ( SELECT iostorinv_id, MAX( source_bill_type ) AS source_bill_type, @@ -91,13 +91,13 @@ GROUP BY iostorinv_id ) a ON mst.iostorinv_id = a.iostorinv_id - LEFT JOIN ( + INNER JOIN ( SELECT iostorinv_id FROM st_ivt_iostorinvdis dis - LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = dis.pcsn - AND dis.box_no = sub.package_box_sn + LEFT JOIN pdm_bi_subpackagerelationrecord sub ON sub.container_name = dis.pcsn + AND dis.box_no = sub.package_box_sn AND dis.iostorinv_id = sub.bill_id WHERE 1=1 OPTION 输入.pcsn <> "" diff --git a/lms/nladmin-ui/src/views/wms/pdm/ivt/sbpointivt/index.vue b/lms/nladmin-ui/src/views/wms/pdm/ivt/sbpointivt/index.vue index 2adc10e03..42916118a 100644 --- a/lms/nladmin-ui/src/views/wms/pdm/ivt/sbpointivt/index.vue +++ b/lms/nladmin-ui/src/views/wms/pdm/ivt/sbpointivt/index.vue @@ -48,6 +48,16 @@ @change="hand" /> + + + @@ -99,6 +109,9 @@ + + +
取消 @@ -127,6 +140,11 @@ {{ dict.label.is_used[scope.row.is_used] }} + + +