From b842f9932ef4c74f34dd6ce97f747e907c4dda1f Mon Sep 17 00:00:00 2001 From: loujf Date: Tue, 27 Sep 2022 16:36:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=9E=9B=E5=9E=8B=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CribbinginfoServiceImpl.java | 13 ++++++++++++- wms/qd/src/views/wms/Cribbing/index.vue | 18 ++++++++++++++---- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/Cribbing/service/impl/CribbinginfoServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/Cribbing/service/impl/CribbinginfoServiceImpl.java index 6501735..505a9d4 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/Cribbing/service/impl/CribbinginfoServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/Cribbing/service/impl/CribbinginfoServiceImpl.java @@ -2,6 +2,7 @@ package org.nl.wms.Cribbing.service.impl; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import org.nl.exception.BadRequestException; @@ -37,9 +38,19 @@ public class CribbinginfoServiceImpl implements CribbinginfoService { @Override public Map queryAll(Map whereJson, Pageable page) { +// WQLObject wo = WQLObject.getWQLObject("md_me_cribbinginfo"); +// ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "1=1", "update_time desc"); +// final JSONObject json = rb.pageResult(); +// return json; WQLObject wo = WQLObject.getWQLObject("md_me_cribbinginfo"); - ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "1=1", "update_time desc"); + String name = (String) whereJson.get("name"); + String sql = "1=1"; + if (StrUtil.isNotEmpty(name)) { + sql = " (material_code like '%" + name + "%' OR material_name like '%" + name + "%')"; + } + ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), sql + " and is_delete='0'", "update_time desc"); final JSONObject json = rb.pageResult(); + log.info("json:{}", json); return json; } diff --git a/wms/qd/src/views/wms/Cribbing/index.vue b/wms/qd/src/views/wms/Cribbing/index.vue index b96458b..40ecdeb 100644 --- a/wms/qd/src/views/wms/Cribbing/index.vue +++ b/wms/qd/src/views/wms/Cribbing/index.vue @@ -4,16 +4,26 @@
+ + - + - + - + @@ -292,7 +302,7 @@ export default { components: { pagination, crudOperation, rrOperation, udOperation, MaterDialog }, mixins: [presenter(), header(), form(defaultForm), crud()], cruds() { - return CRUD({title: '基础垛形参数', url: 'api/cribbinginfo', idField: 'info_id', sort: 'info_id,desc', crudMethod: { ...crudCribbinginfo }}) + return CRUD({ title: '基础垛形参数', url: 'api/cribbinginfo', idField: 'info_id', sort: 'info_id,desc', crudMethod: { ...crudCribbinginfo }}) }, data() { return { From a7639b0332ecf5d2f1173d5822448f6fb9b4f6ec Mon Sep 17 00:00:00 2001 From: lyd <1419499670@qq.com> Date: Tue, 27 Sep 2022 17:19:47 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=BF=87=E9=95=BF?= =?UTF-8?q?=E6=8D=A2=E8=A1=8C=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- acs/qd/src/views/monitor/logback/index.vue | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/acs/qd/src/views/monitor/logback/index.vue b/acs/qd/src/views/monitor/logback/index.vue index 835cfab..2bc3741 100644 --- a/acs/qd/src/views/monitor/logback/index.vue +++ b/acs/qd/src/views/monitor/logback/index.vue @@ -99,13 +99,15 @@
-
+
- -
-
+ +
+
+
+
@@ -461,5 +463,8 @@ export default { From 5d64cdebcbb90b874ed423af9bb406861247c7c6 Mon Sep 17 00:00:00 2001 From: loujf Date: Wed, 28 Sep 2022 18:22:33 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=98=89=E8=80=90=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/service/impl/WmsToAcsServiceImpl.java | 11 ++++++----- .../service/dto/ProduceshiftorderDto.java | 2 +- .../impl/ProduceshiftorderServiceImpl.java | 4 ++-- .../order/service/wql/QPRODUCESHIFTORDER.wql | 2 +- .../org/nl/acs/order/service/wql/order.xls | Bin 63488 -> 63488 bytes acs/qd/src/views/monitor/logback/index.vue | 2 +- .../service/impl/ProducetaskServiceImpl.java | 2 +- .../impl/WorkprocedureiosServiceImpl.java | 4 ++-- 8 files changed, 14 insertions(+), 13 deletions(-) diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index a80eb05..dcba3b1 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -276,11 +276,12 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { String molten_pool = json.getString("molten_pool"); String weight = json.getString("weight"); String qty = json.getString("plan_qty"); + String product_type = json.getString("product_type"); String product_code = json.getString("product_code"); - String AlongSide = json.getString("AlongSide"); - String BshortSide = json.getString("BshortSide"); - String Htrapezoidal = json.getString("Htrapezoidal"); - String Wthickness = json.getString("Wthickness"); + String AlongSide = json.getString("alongside"); + String BshortSide = json.getString("bshortside"); + String Htrapezoidal = json.getString("htrapezoidal"); + String Wthickness = json.getString("wthickness"); if (StrUtil.isEmpty(producetask_code)) { throw new WDKException("工单号不能为空"); @@ -375,7 +376,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { //下发成功后，写入工单信息表记录 ProduceshiftorderDto dto = new ProduceshiftorderDto(); dto.setOrder_code(producetask_code); - dto.setProduct_code(product_code); + dto.setProduct_type(product_type); dto.setDevice_code(device_code); dto.setOrder_status("0"); dto.setMaterial_code(material_code); diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/order/service/dto/ProduceshiftorderDto.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/order/service/dto/ProduceshiftorderDto.java index 1c295b0..2f478b3 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/order/service/dto/ProduceshiftorderDto.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/order/service/dto/ProduceshiftorderDto.java @@ -28,7 +28,7 @@ public class ProduceshiftorderDto implements Serializable { private String qty; /** 产品编码 */ - private String product_code; + private String product_type; /** 物料编码 */ private String material_code; diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java index 25d5231..468856c 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java @@ -140,7 +140,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService { map.put("设备编码", produceshiftorder.getDevice_code()); map.put("工单状态", produceshiftorder.getOrder_status()); map.put("下料数量", produceshiftorder.getQty()); - map.put("产品编码", produceshiftorder.getProduct_code()); + map.put("工单类型", produceshiftorder.getProduct_type()); map.put("物料编码", produceshiftorder.getMaterial_code()); map.put("物料名称", produceshiftorder.getMaterial_name()); map.put("物料标识", produceshiftorder.getMaterial_uuid()); @@ -172,7 +172,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService { //判断是否为wms下发的排产单 String hasWms = acsConfigService.findConfigFromCache().get(AcsConfig.HASWMS); - if (StrUtil.isNotEmpty(dto.getProduct_code()) && hasWms.equals("1")) { + if (StrUtil.isNotEmpty(dto.getProduct_type()) && hasWms.equals("1")) { JSONObject json = new JSONObject(); json.put("producetask_code",dto.getOrder_code()); json.put("device_code",dto.getDevice_code()); diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/order/service/wql/QPRODUCESHIFTORDER.wql b/acs/hd/nladmin-system/src/main/java/org/nl/acs/order/service/wql/QPRODUCESHIFTORDER.wql index bcc7f25..2011a4e 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/order/service/wql/QPRODUCESHIFTORDER.wql +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/order/service/wql/QPRODUCESHIFTORDER.wql @@ -49,7 +49,7 @@ prod.order_code, prod.order_status, prod.qty, - prod.product_code, + prod.product_type, prod.material_code, prod.material_name, prod.material_uuid, diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/order/service/wql/order.xls b/acs/hd/nladmin-system/src/main/java/org/nl/acs/order/service/wql/order.xls index 71664b575b8b893fde3e0f71d525e21ab8ad0c3b..502cd0efb926f9c2571238e589c1bb84514dad41 100644 GIT binary patch delta 1139 zcmZvce@s(X6vxkfE#+5#P-y#FTCk!N2{I6;vkZtaFn%~YkN^s@YWXp6V{{Be5CW2+ zFc4Ud3k%ap0LkVY0p6UM69oqZ$&w`?1EVuI7-X4CN(atggxyz?{jqr8k8{rF`+eu; z-kZE?o1oez=zUKpYX81;S}@5K2}Oh$xH6{=0-9AVrjkhE!?4|ly>U%=tX3AY?^c5?(JXy38 z@y2fyW}-!jGKAG77q_IYimK$-!w_=F(pn21aQGBo z3(4u6ti0t0X)e#Io7b5&=l!e`6%A=TE9zWlb0%_p<58YTVYZuR0+LtfSE)4fuJHbK zmpRvz{Cj3fGS3nQ*V(hQ-N&tHu5IIx(MXcz~GInz1)yxnZZz@ z3tq|b3?JJmZ}B&zb&XzCf4p`-wRjDZ2>`wS8;3V)ZF?#BzY|HWp=uyuIMJi_=lefs zy)s_}M&CKper9L-fs9A@;@p;GziAIV69*QIjP4nki0NA*TRSeQdy^lQFIZkF{lLp$ zEM2I;BYtD>dcf`)U3rN*b${{GFT&cArnVcKj(n9GIb@!CH{}%v{f-8J|m@oslU8@fkZh_Fr8th&pc;^n4mQ0`JP+YA&4lEV$G> zQ8YNeI;A;g>bEx;KlI2h!u*U5VD~JvY;5u^eF=?CqF3{xmq&;#B{fV zFzEDlQDY5&wHB@8kGb?ZgA2*!PPS}t67Kul*@k#{sl|PgLMD^ delta 1107 zcmZXUZA?>F7{|}Ky{!e>+ZO1(E!4KiC@>+V;?OS+Hj(1km<|Ze0cFK@U1fv8++ctd z#+x|f%+oAjnV}@j9qgnjwmg@p2(8!y1SVU~n*8HYZ(UXU|GfBPJ$QZE}!c^WQ*rzH`>z=my*Oc*A@OEa-beo!Ak8;)=Q8Li4j=?(i zo;uv0ES^bgW>rxiXhIbz42cllob%%WJ&Hqmv;hGjMFvDZg`3&a$qTB=xC;Je1jbp` z=2|32yXyEeiR*27j`@R>oo6M7S6QL$-Mq5$gPA;Ye!0q~Q*lX%lV=qAt%GL*>}Xh5 zp|tQ>8+uo>EcVp2ne2=-p1nA<$`&&dN(#YXeJ*%~lp*AKMDkqZNfvP77)A~*5HOgR z!VX*K2^g^X%a=lg*ZtKs^rCSza@hRGGECWm{ttcZhRQ9eBMI`_sX4=WlOo<keu6N$3`9#&nY5K)e7ge2UnhZZ6<>JRzd8pypM zg5C8JQB5^Mj#@a?a-YpSfh7q{PSc>fkS1!lgizfzZ&&A7QxL?E;@;o4`wGX3a<~s8 U)iWemV?vwIMzoPt&fgXM1Ina=8UO$Q diff --git a/acs/qd/src/views/monitor/logback/index.vue b/acs/qd/src/views/monitor/logback/index.vue index 2bc3741..2dfa2dd 100644 --- a/acs/qd/src/views/monitor/logback/index.vue +++ b/acs/qd/src/views/monitor/logback/index.vue @@ -464,7 +464,7 @@ export default { diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskServiceImpl.java index 0e3e42d..ea32306 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskServiceImpl.java @@ -300,7 +300,7 @@ public class ProducetaskServiceImpl implements ProducetaskService { taskObj = WQL.getWO("PDM_ProduceTask_01").addParam("flag", "4").addParam("producetask_id", producetask_id).process().uniqueResult(0); } - taskObj.put("product_code", "wms"); + taskObj.put("product_type", "wms"); WmsToAcsService wmsToAcsService = SpringContextHolder.getBean(WmsToAcsService.class); JSONArray arr = new JSONArray(); arr.add(taskObj); diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/in/service/impl/WorkprocedureiosServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/in/service/impl/WorkprocedureiosServiceImpl.java index 5a1dc51..36bc5d7 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/in/service/impl/WorkprocedureiosServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/in/service/impl/WorkprocedureiosServiceImpl.java @@ -44,7 +44,7 @@ import cn.hutool.core.util.ObjectUtil; @Slf4j public class WorkprocedureiosServiceImpl implements WorkprocedureiosService { private final String THIS_CLASS = SendMaterialTask.class.getName(); - private SendMaterialTask sendMaterialTask; + @Override public Map queryAll(Map whereJson, Pageable page) { @@ -238,7 +238,7 @@ public class WorkprocedureiosServiceImpl implements WorkprocedureiosService { @Override @Transactional(rollbackFor = Exception.class) public void genTask(JSONObject taskJson) { - + SendMaterialTask sendMaterialTask = new SendMaterialTask(); String iostorinv_id = taskJson.getString("iostorinv_id"); WQLObject wo = WQLObject.getWQLObject("st_ivt_workprocedureios"); JSONObject jsonObject = wo.query("iostorinv_id = '" + iostorinv_id + "'").uniqueResult(0);