From 423e5b13cabe6ec5d4ff6f8c0e74387973ac126c Mon Sep 17 00:00:00 2001 From: lyd <1419499670@qq.com> Date: Wed, 6 Jul 2022 18:17:18 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=EF=BC=8C=E7=BB=84=E7=9B=98?= =?UTF-8?q?=E5=90=8E=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/database/service/dto/MaterialDto.java | 15 +++++++++++ .../service/impl/MaterialServiceImpl.java | 4 +-- .../org/nl/wms/sch/rest/PointController.java | 14 ++++++++++ .../org/nl/wms/sch/service/PointService.java | 3 +++ .../sch/service/impl/PointServiceImpl.java | 26 +++++++++++++++++++ 5 files changed, 60 insertions(+), 2 deletions(-) diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/database/service/dto/MaterialDto.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/database/service/dto/MaterialDto.java index aba8ea4..b4828e3 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/database/service/dto/MaterialDto.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/database/service/dto/MaterialDto.java @@ -87,6 +87,21 @@ public class MaterialDto implements Serializable { */ private String is_delete; + /** + * 是否人工打包 + */ + private String is_manmade; + + /** + * 码垛数量 + */ + private Long palletize_num; + + /** + * 托盘类型 + */ + private String vehicle_type; + /** * 外部标识 */ diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/database/service/impl/MaterialServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/database/service/impl/MaterialServiceImpl.java index bf22656..03a17c1 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/database/service/impl/MaterialServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/database/service/impl/MaterialServiceImpl.java @@ -44,10 +44,10 @@ public class MaterialServiceImpl implements MaterialService { String sql = "1=1"; if (StrUtil.isNotEmpty(name)) { sql = " (material_code like '%"+name+"%' OR material_code like '%"+name+"%')"; - } - ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), sql+ " and is_delete='0'", "update_time desc"); + 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/sch/rest/PointController.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/rest/PointController.java index 1d87ec0..2a10e90 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/rest/PointController.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/rest/PointController.java @@ -2,7 +2,11 @@ package org.nl.wms.sch.rest; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.JSONArray; +import com.mysql.cj.xdevapi.JsonArray; +import org.nl.wms.sch.AcsUtil; import org.nl.wms.sch.service.PointService; import org.nl.wms.sch.service.dto.PointDto; import org.springframework.data.domain.Pageable; @@ -13,6 +17,8 @@ import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.*; + +import java.util.Iterator; import java.util.Map; import lombok.extern.slf4j.Slf4j; @@ -88,4 +94,12 @@ public class PointController { return new ResponseEntity<>(pointService.getEndPoint(whereJson,page),HttpStatus.OK); } + @PostMapping("/getPointStatu") + @Log("获取点位状态") + @ApiOperation("获取点位状态") + public ResponseEntity getPointStatu(@RequestBody JSONArray ja) { + pointService.getPointStatuAndChage(ja); + return new ResponseEntity<>(HttpStatus.OK); + } + } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/PointService.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/PointService.java index df9b5a4..5c7cbe7 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/PointService.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/PointService.java @@ -1,6 +1,7 @@ package org.nl.wms.sch.service; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import org.nl.wms.sch.service.dto.PointDto; import org.springframework.data.domain.Pageable; @@ -79,4 +80,6 @@ public interface PointService { * 获取终点点位 */ Map getEndPoint(Map whereJson, Pageable page); + + void getPointStatuAndChage(JSONArray ja); } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java index 611ef5a..6b56c6a 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java @@ -7,14 +7,18 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import lombok.RequiredArgsConstructor; import org.nl.exception.BadRequestException; +import org.nl.wms.sch.AcsUtil; import org.nl.wms.sch.service.PointService; import org.nl.wms.sch.service.dto.PointDto; import org.nl.wql.WQL; +import org.nl.wql.core.bean.ResultBean; +import org.nl.wql.core.bean.WQLData; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.data.domain.Pageable; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -252,4 +256,26 @@ public class PointServiceImpl implements PointService { return json; } + @Override + public void getPointStatuAndChage(JSONArray ja) { + //发起请求获取数据 + try { + JSONObject jsona = AcsUtil.notifyAcs("/api/wms/getPointStatus", ja); + JSONArray arr = jsona.getJSONArray("key"); + WQLObject wql = WQLObject.getWQLObject("sch_base_point"); + for (int i = 0; i < arr.size(); i++) { + JSONObject jsonObject = ja.getJSONObject(i); + Long point_id = (Long) jsonObject.get("point_id"); + String point_status = (String) jsonObject.get("point_status"); + //获得单条数据 + JSONObject jo = wql.query("point_id='" + point_id + "'").uniqueResult(0); + jo.put("point_status",point_status); + //获取数据表，更新状态 + wql.update(jo); + } + } catch (Exception e) { + e.printStackTrace(); + } + } + }