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 71664b5..502cd0e 100644 Binary files a/acs/hd/nladmin-system/src/main/java/org/nl/acs/order/service/wql/order.xls and b/acs/hd/nladmin-system/src/main/java/org/nl/acs/order/service/wql/order.xls differ diff --git a/acs/qd/src/views/monitor/logback/index.vue b/acs/qd/src/views/monitor/logback/index.vue index 835cfab..2dfa2dd 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 { 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/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); 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 {