diff --git a/ruoyi-webapi/src/main/java/com/ruoyi/webapi/controller/ApiController.java b/ruoyi-webapi/src/main/java/com/ruoyi/webapi/controller/ApiController.java index eab9934..c073aa2 100644 --- a/ruoyi-webapi/src/main/java/com/ruoyi/webapi/controller/ApiController.java +++ b/ruoyi-webapi/src/main/java/com/ruoyi/webapi/controller/ApiController.java @@ -1,6 +1,7 @@ package com.ruoyi.webapi.controller; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.ruoyi.common.config.RuoYiConfig; import com.ruoyi.common.core.domain.AjaxResult; @@ -16,6 +17,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import java.io.IOException; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -78,13 +80,22 @@ public class ApiController { } return AjaxResult.error("库位没有维护"); } - + // 接货查询 @PostMapping("/jion/select") public AjaxResult jionSelect(String user) { - List list = service.jionSelect(user); + // List list = service.jionSelect(user); + LedgerInstantBinding query = new LedgerInstantBinding(); + query.setCreateBy(user); + List list = ledgerInstantBindingService.selectList(query); if (list == null || list.isEmpty()) return AjaxResult.error("账号无绑定记录"); return AjaxResult.success(list); } + @PostMapping("/delivery/createTask") + public AjaxResult createDeliveryTask(String json, List files) { + List ids = JSONArray.parseArray(json, Long.class); + +return AjaxResult.success(); + } //交货提交 @PostMapping("/join/jiaoSubmit") @@ -275,6 +286,7 @@ public class ApiController { recordCargoBinding.setCargoFrameEpc(epc1); recordCargoBinding.setWaybillNumber(code); recordCargoBinding.setCreateBy(user); + recordCargoBinding.setLocationInfo(submitBeen.getLocationInfo()); recordCargoBindingService.insertRecordCargoBinding(recordCargoBinding); } }); @@ -291,13 +303,9 @@ public class ApiController { if (apkVersion == null) { apkVersion = new APKVersion(); apkVersion.setUpdateStatus(0); - - } else { apkVersion.setUpdateStatus(1); } - - String s = JSONObject.toJSONString(apkVersion); System.out.println("请求版本信息" + s); return s; diff --git a/ruoyi-webapi/src/main/java/com/ruoyi/webapi/doman/BindingSubmitBeen.java b/ruoyi-webapi/src/main/java/com/ruoyi/webapi/doman/BindingSubmitBeen.java index dfb2471..2c2b0b0 100644 --- a/ruoyi-webapi/src/main/java/com/ruoyi/webapi/doman/BindingSubmitBeen.java +++ b/ruoyi-webapi/src/main/java/com/ruoyi/webapi/doman/BindingSubmitBeen.java @@ -15,6 +15,16 @@ public class BindingSubmitBeen { private List watBills; private String user; private Long basketId; + private String locationInfo; + + + public String getLocationInfo() { + return locationInfo; + } + + public void setLocationInfo(String locationInfo) { + this.locationInfo = locationInfo; + } public Long getBasketId() { return basketId; diff --git a/ruoyi-webapi/src/main/java/com/ruoyi/webapi/doman/JoinSubmitBeen.java b/ruoyi-webapi/src/main/java/com/ruoyi/webapi/doman/JoinSubmitBeen.java index 61d96b2..4521c8d 100644 --- a/ruoyi-webapi/src/main/java/com/ruoyi/webapi/doman/JoinSubmitBeen.java +++ b/ruoyi-webapi/src/main/java/com/ruoyi/webapi/doman/JoinSubmitBeen.java @@ -8,7 +8,7 @@ import java.util.List; */ public class JoinSubmitBeen { private String user; - private List list; + private List list; public String getUser() { return user; @@ -18,11 +18,11 @@ public class JoinSubmitBeen { this.user = user; } - public List getList() { + public List getList() { return list; } - public void setList(List list) { + public void setList(List list) { this.list = list; } } diff --git a/ruoyi-webapi/src/main/resources/mapper/ApiMapper.xml b/ruoyi-webapi/src/main/resources/mapper/ApiMapper.xml index 33fd261..74c902d 100644 --- a/ruoyi-webapi/src/main/resources/mapper/ApiMapper.xml +++ b/ruoyi-webapi/src/main/resources/mapper/ApiMapper.xml @@ -45,7 +45,7 @@