From 5255d18de4f752ab633ee188d18b7f31b0debf2f Mon Sep 17 00:00:00 2001 From: 18188916393 <2562295436@qq.com> Date: Thu, 20 Oct 2022 21:56:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=8C=81=E4=BA=BA=E5=B7=A5=E6=89=AB?= =?UTF-8?q?=E7=A0=81=E5=8A=9F=E8=83=BD=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/wms/common/SortingUtil.java | 1 + .../wms/pda/group/rest/GroupController.java | 48 +++++++++++++++ .../wms/pda/group/service/GroupService.java | 16 +++++ .../group/service/impl/GroupServiceImpl.java | 60 +++++++++++++++++++ .../wms/pda/sendMaterial/wql/QPADSERVICE.wql | 16 ++++- 5 files changed, 140 insertions(+), 1 deletion(-) create mode 100644 wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/group/rest/GroupController.java create mode 100644 wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/group/service/GroupService.java create mode 100644 wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/group/service/impl/GroupServiceImpl.java diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/SortingUtil.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/SortingUtil.java index 7e9c201..2090539 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/SortingUtil.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/SortingUtil.java @@ -13,6 +13,7 @@ public class SortingUtil { //记录分拣 木托盘对应钢托盘 public static void record(JSONObject whereJson) { String device_code = (String) whereJson.get("device_code"); + //木托盘编号 String vehicle_code = (String) whereJson.get("vehicle_code"); if (StrUtil.isEmpty(vehicle_code)) { return; diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/group/rest/GroupController.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/group/rest/GroupController.java new file mode 100644 index 0000000..87d6bc8 --- /dev/null +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/group/rest/GroupController.java @@ -0,0 +1,48 @@ + +package org.nl.wms.pda.group.rest; + + +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.annotation.Log; +import org.nl.wms.pda.group.service.GroupService; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Map; + +/** + * @author ldjun + * @date 2021-07-26 + **/ +@RestController +@RequiredArgsConstructor +@Api(tags = "手持人工组盘") +@RequestMapping("/api/pda/group") +@Slf4j +public class GroupController { + + private final GroupService groupService; + + @PostMapping("/querytask") + @Log("查询未完成的指令") + @ApiOperation("查询未完成的指令") + public ResponseEntity querytask(@RequestBody Map param) { + return new ResponseEntity<>(groupService.querytask(param), HttpStatus.OK); + } + + @PostMapping("/submit") + @Log("组盘确定") + @ApiOperation("组盘确定") + public ResponseEntity submit(@RequestBody JSONObject param) { + return new ResponseEntity<>(groupService.submit(param), HttpStatus.OK); + } + +} diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/group/service/GroupService.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/group/service/GroupService.java new file mode 100644 index 0000000..e13f245 --- /dev/null +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/group/service/GroupService.java @@ -0,0 +1,16 @@ +package org.nl.wms.pda.group.service; + +import com.alibaba.fastjson.JSONObject; + +import java.util.Map; + +public interface GroupService { + Map querytask(Map jsonObject); + /** + * 盘点单确认 + * @param param 条件 + * @return Map + * + */ + Map submit( JSONObject param); +} diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/group/service/impl/GroupServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/group/service/impl/GroupServiceImpl.java new file mode 100644 index 0000000..8afce3e --- /dev/null +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/group/service/impl/GroupServiceImpl.java @@ -0,0 +1,60 @@ +package org.nl.wms.pda.group.service.impl; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.nl.exception.BadRequestException; +import org.nl.modules.system.util.CodeUtil; +import org.nl.utils.SecurityUtils; +import org.nl.wms.WorkProcedureEnum; +import org.nl.wms.ext.acs.service.impl.AcsToWmsServiceImpl; +import org.nl.wms.pda.group.service.GroupService; +import org.nl.wms.sch.manage.AreaEnum; +import org.nl.wms.sch.manage.BillTypeEnum; +import org.nl.wms.sch.manage.buss.FmjToPackIngTask; +import org.nl.wms.st.ivt.IvtChangeTypeEnum; +import org.nl.wms.st.ivt.StoreIvtServiceImpl; +import org.nl.wql.WQL; +import org.nl.wql.core.bean.WQLObject; +import org.springframework.stereotype.Service; + +import java.util.Map; + +@Service +@RequiredArgsConstructor +@Slf4j +public class GroupServiceImpl implements GroupService { + private final AcsToWmsServiceImpl acsToWmsServiceImpl; + + @Override + public Map querytask(Map jsonObject) { + JSONArray arr = WQL.getWO("QPADSERVICE").addParam("flag", "20").process().getResultJSONArray(0); + JSONObject returnjo = new JSONObject(); + returnjo.put("code", "1"); + returnjo.put("desc", "查询成功！"); + returnjo.put("result", arr); + return returnjo; + } + + @Override + public Map submit(JSONObject param) { + String vehicle_code = param.getString("vehicle_code"); + String task_code = param.getString("task_code"); + if (StrUtil.isEmpty(vehicle_code)) { + throw new BadRequestException("托盘号不能为空！"); + } + if (StrUtil.isEmpty(task_code)) { + throw new BadRequestException("任务号不能为空！"); + } + acsToWmsServiceImpl.group(param); + JSONObject returnjo = new JSONObject(); + returnjo.put("code", "1"); + returnjo.put("desc", "操作成功！"); + return returnjo; + } +} diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendMaterial/wql/QPADSERVICE.wql b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendMaterial/wql/QPADSERVICE.wql index dc2d58f..3b63738 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendMaterial/wql/QPADSERVICE.wql +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendMaterial/wql/QPADSERVICE.wql @@ -476,4 +476,18 @@ IF 输入.flag = "19" ENDOPTION ENDSELECT ENDQUERY - ENDIF \ No newline at end of file + ENDIF + + + IF 输入.flag = "20" + QUERY + SELECT + task.task_code, + task.start_point_code, + task.next_point_code + FROM + sch_base_task task + where task.task_status in ('05','06') + ENDSELECT + ENDQUERY + ENDIF \ No newline at end of file