From 3c2af7f1db5d7f2d90b0f1e4fbbde90257db47fa Mon Sep 17 00:00:00 2001 From: psh Date: Tue, 14 May 2024 14:08:21 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=B0=E5=9C=BA=E9=9C=80=E6=B1=82=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../acs/service/impl/AcsToWmsServiceImpl.java | 22 +++- .../src/main/java/org/nl/wms/ext/wql/ext.xls | Bin 54272 -> 74752 bytes .../org/nl/wms/pad/rest/PadController.java | 4 +- .../org/nl/wms/pad/service/PadService.java | 2 +- .../wms/pad/service/impl/PadServiceImpl.java | 17 ++- .../sch/rest/ExtDeliveryNoteController.java | 69 +++++++++++ .../sch/service/ExtDeliveryNoteService.java | 66 ++++++++++ .../sch/service/dto/ExtDeliveryNoteDto.java | 53 ++++++++ .../impl/ExtDeliveryNoteServiceImpl.java | 115 ++++++++++++++++++ 9 files changed, 339 insertions(+), 9 deletions(-) create mode 100644 lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/rest/ExtDeliveryNoteController.java create mode 100644 lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/ExtDeliveryNoteService.java create mode 100644 lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/ExtDeliveryNoteDto.java create mode 100644 lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/ExtDeliveryNoteServiceImpl.java diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 6291f9c..dd28b01 100644 --- a/lms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.exception.BadRequestException; +import org.nl.modules.system.service.DictService; import org.nl.modules.system.util.CodeUtil; import org.nl.utils.SecurityUtils; import org.nl.utils.SpringContextHolder; @@ -21,6 +22,7 @@ import org.nl.wms.sch.service.TaskService; import org.nl.wms.sch.service.dto.TaskDto; import org.nl.wms.sch.tasks.*; import org.nl.wql.core.bean.WQLObject; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -34,6 +36,8 @@ import java.util.Map; @Slf4j public class AcsToWmsServiceImpl implements AcsToWmsService { private final TaskService taskService; + @Autowired + private DictService dictService; /** * task_uuid：任务标识 @@ -427,10 +431,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { String deliveryNo = json.getString("deliveryno"); String deliveryLineNo = json.getString("deliverylineno"); String sku = json.getString("sku"); - String lkCode = json.getString("lkCode"); - String pickDetailKey = json.getString("pickdetailkey"); + String lk_code = json.getString("lk_code"); + String pickdetailkey = json.getString("pickdetailkey"); String qty = json.getString("qty"); String outboundTime = json.getString("outboundtime"); + String skudesc = json.getString("skudesc"); WQLObject noteTab = WQLObject.getWQLObject("ext_delivery_note");//上游系统出库单表 JSONObject orderJson = new JSONObject(); JSONObject res = new JSONObject(); @@ -442,12 +447,21 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { orderJson.put("deliveryno", deliveryNo); orderJson.put("deliverylineno", deliveryLineNo); orderJson.put("sku", sku); - orderJson.put("lkCode", lkCode); - orderJson.put("pickdetailkey", pickDetailKey); + orderJson.put("skudesc",skudesc); + orderJson.put("lk_code", lk_code); + orderJson.put("pickdetailkey", pickdetailkey); orderJson.put("qty", qty); orderJson.put("outboundtime", outboundTime); orderJson.put("request_param", json); orderJson.put("create_time", DateUtil.now()); + orderJson.put("status", "0"); + JSONArray jsonArray=dictService.queryDetailByName("sku"); + for (int i = 0; i < jsonArray.size(); i++) { + JSONObject jo = (JSONObject) jsonArray.get(i); + if(sku.equals(jo.getString("value"))){ + orderJson.put("status", "1"); + } + } res.put("statusCode", HttpStatus.OK.value()); res.put("isSuccess", true); res.put("errCode", 0); diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/ext/wql/ext.xls b/lms/hd/nladmin-system/src/main/java/org/nl/wms/ext/wql/ext.xls index 2f53446d1fcba3c8a0eb197c1214a40a4f0616df..11a6ebd78b9b816476165b1f56e89114e3db19e1 100644 GIT binary patch delta 21023 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 Gx_<*TVjimi diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/pad/rest/PadController.java b/lms/hd/nladmin-system/src/main/java/org/nl/wms/pad/rest/PadController.java index 1171705..ab8e248 100644 --- a/lms/hd/nladmin-system/src/main/java/org/nl/wms/pad/rest/PadController.java +++ b/lms/hd/nladmin-system/src/main/java/org/nl/wms/pad/rest/PadController.java @@ -323,7 +323,7 @@ public class PadController { @PostMapping("/getOrderList") @Log("查询出库单") @ApiOperation("查询出库单") - public ResponseEntity getOrderList() { - return new ResponseEntity<>(padService.getOrderList(), HttpStatus.OK); + public ResponseEntity getOrderList(@RequestBody JSONObject param) { + return new ResponseEntity<>(padService.getOrderList(param), HttpStatus.OK); } } diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/pad/service/PadService.java b/lms/hd/nladmin-system/src/main/java/org/nl/wms/pad/service/PadService.java index 048d61a..9b4b1e9 100644 --- a/lms/hd/nladmin-system/src/main/java/org/nl/wms/pad/service/PadService.java +++ b/lms/hd/nladmin-system/src/main/java/org/nl/wms/pad/service/PadService.java @@ -101,6 +101,6 @@ public interface PadService { */ JSONObject p2p(String startPointCode, String nextPointCode); - JSONObject getOrderList(); + JSONObject getOrderList(JSONObject param); } diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/pad/service/impl/PadServiceImpl.java b/lms/hd/nladmin-system/src/main/java/org/nl/wms/pad/service/impl/PadServiceImpl.java index 1c4b63b..f701e56 100644 --- a/lms/hd/nladmin-system/src/main/java/org/nl/wms/pad/service/impl/PadServiceImpl.java +++ b/lms/hd/nladmin-system/src/main/java/org/nl/wms/pad/service/impl/PadServiceImpl.java @@ -460,10 +460,23 @@ public class PadServiceImpl implements PadService { } @Override - public JSONObject getOrderList() { + public JSONObject getOrderList(JSONObject param) { JSONObject res = new JSONObject(); + String where = "status=1"; + String sku=param.getString("sku"); + String startTime=param.getString("startTime"); + String endTime=param.getString("endTime"); + if(ObjectUtil.isNotEmpty(sku)){ + where += " AND sku like ('%" + sku + "%')"; + } + if(ObjectUtil.isNotEmpty(startTime)){ + where += " AND DATE_FORMAT(outboundtime, '%Y/%m/%d %H:%i:%s')>=DATE_FORMAT('" + startTime+"', '%Y/%m/%d %H:%i:%s')"; + } + if(ObjectUtil.isNotEmpty(endTime)){ + where += " AND DATE_FORMAT(outboundtime, '%Y/%m/%d %H:%i:%s')<=DATE_FORMAT('" + endTime+"', '%Y/%m/%d %H:%i:%s')"; + } JSONArray arrayList = WQLObject.getWQLObject("ext_delivery_note") - .query("", "create_time desc") + .query(where, "create_time desc") .getResultJSONArray(0); res.put("code", "1"); res.put("desc", "查询成功"); diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/rest/ExtDeliveryNoteController.java b/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/rest/ExtDeliveryNoteController.java new file mode 100644 index 0000000..202b5bd --- /dev/null +++ b/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/rest/ExtDeliveryNoteController.java @@ -0,0 +1,69 @@ + +package org.nl.wms.sch.rest; + + +import org.nl.wms.sch.service.ExtDeliveryNoteService; +import org.nl.wms.sch.service.dto.ExtDeliveryNoteDto; +import org.springframework.data.domain.Pageable; +import lombok.RequiredArgsConstructor; +import org.nl.annotation.Log; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.*; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import java.util.Map; +import lombok.extern.slf4j.Slf4j; + +/** + * @author psh + * @date 2024-05-13 + **/ +@RestController +@RequiredArgsConstructor +@Api(tags = "delivery管理") +@RequestMapping("/api/extDeliveryNote") +@Slf4j +public class ExtDeliveryNoteController { + + private final ExtDeliveryNoteService extDeliveryNoteService; + + @GetMapping + @Log("查询delivery") + @ApiOperation("查询delivery") + //@PreAuthorize("@el.check('extDeliveryNote:list')") + public ResponseEntity query(@RequestParam Map whereJson, Pageable page){ + return new ResponseEntity<>(extDeliveryNoteService.queryAll(whereJson,page),HttpStatus.OK); + } + + @PostMapping + @Log("新增delivery") + @ApiOperation("新增delivery") + //@PreAuthorize("@el.check('extDeliveryNote:add')") + public ResponseEntity create(@Validated @RequestBody ExtDeliveryNoteDto dto){ + extDeliveryNoteService.create(dto); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @PutMapping + @Log("修改delivery") + @ApiOperation("修改delivery") + //@PreAuthorize("@el.check('extDeliveryNote:edit')") + public ResponseEntity update(@Validated @RequestBody ExtDeliveryNoteDto dto){ + extDeliveryNoteService.update(dto); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @Log("删除delivery") + @ApiOperation("删除delivery") + //@PreAuthorize("@el.check('extDeliveryNote:del')") + @DeleteMapping + public ResponseEntity delete(@RequestBody String[] ids) { + extDeliveryNoteService.deleteAll(ids); + return new ResponseEntity<>(HttpStatus.OK); + } + +} diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/ExtDeliveryNoteService.java b/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/ExtDeliveryNoteService.java new file mode 100644 index 0000000..6ac7457 --- /dev/null +++ b/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/ExtDeliveryNoteService.java @@ -0,0 +1,66 @@ + +package org.nl.wms.sch.service; + +import org.nl.wms.sch.service.dto.ExtDeliveryNoteDto; +import org.springframework.data.domain.Pageable; +import java.util.Map; +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; + +/** + * @description 服务接口 + * @author psh + * @date 2024-05-13 + **/ +public interface ExtDeliveryNoteService { + + /** + * 查询数据分页 + * @param whereJson 条件 + * @param page 分页参数 + * @return Map + */ + Map queryAll(Map whereJson, Pageable page); + + /** + * 查询所有数据不分页 + * @param whereJson 条件参数 + * @return List + */ + List queryAll(Map whereJson); + + /** + * 根据ID查询 + * @param note_id ID + * @return ExtDeliveryNote + */ + ExtDeliveryNoteDto findById(String note_id); + + /** + * 根据编码查询 + * @param code code + * @return ExtDeliveryNote + */ + ExtDeliveryNoteDto findByCode(String code); + + + /** + * 创建 + * @param dto / + */ + void create(ExtDeliveryNoteDto dto); + + /** + * 编辑 + * @param dto / + */ + void update(ExtDeliveryNoteDto dto); + + /** + * 多选删除 + * @param ids / + */ + void deleteAll(String[] ids); + +} diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/ExtDeliveryNoteDto.java b/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/ExtDeliveryNoteDto.java new file mode 100644 index 0000000..28af705 --- /dev/null +++ b/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/dto/ExtDeliveryNoteDto.java @@ -0,0 +1,53 @@ +package org.nl.wms.sch.service.dto; + +import lombok.Data; +import java.io.Serializable; + +/** + * @description / + * @author psh + * @date 2024-05-13 + **/ +@Data +public class ExtDeliveryNoteDto implements Serializable { + + /** 主键ID */ + private String note_id; + + /** 任务号 */ + private String req_code; + + /** 出库单号 */ + private String deliveryno; + + /** 出库单行号 */ + private String deliverylineno; + + /** 物料 */ + private String sku; + + /** 立库代码 */ + private String lk_code; + + /** 拣货单号 */ + private String pickdetailkey; + + /** 出库数量 */ + private String qty; + + /** 出库时间 */ + private String outboundtime; + + /** 请求参数 */ + private String request_param; + + /** 响应结果 */ + private String response_param; + + /** 创建时间 */ + private String create_time; + + private String skudesc; + + private Integer status; +} diff --git a/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/ExtDeliveryNoteServiceImpl.java b/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/ExtDeliveryNoteServiceImpl.java new file mode 100644 index 0000000..378b2ef --- /dev/null +++ b/lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/ExtDeliveryNoteServiceImpl.java @@ -0,0 +1,115 @@ + +package org.nl.wms.sch.service.impl; + + +import cn.hutool.core.util.StrUtil; +import lombok.RequiredArgsConstructor; +import org.nl.exception.BadRequestException; +import org.nl.wms.sch.service.ExtDeliveryNoteService; +import org.nl.wms.sch.service.dto.ExtDeliveryNoteDto; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import org.springframework.data.domain.Pageable; +import java.util.List; +import java.util.Map; + +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.IdUtil; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.JSON; +import org.nl.utils.SecurityUtils; +import org.nl.wql.core.bean.ResultBean; +import org.nl.wql.core.bean.WQLObject; +import org.nl.wql.util.WqlUtil; +import lombok.extern.slf4j.Slf4j; +import cn.hutool.core.util.ObjectUtil; + +/** + * @description 服务实现 + * @author psh + * @date 2024-05-13 + **/ +@Service +@RequiredArgsConstructor +@Slf4j +public class ExtDeliveryNoteServiceImpl implements ExtDeliveryNoteService { + + @Override + public Map queryAll(Map form, Pageable page){ + WQLObject wo = WQLObject.getWQLObject("ext_delivery_note"); + String where="1=1"; + JSONObject whereJson = JSONObject.parseObject(JSON.toJSONString(form)); + if (StrUtil.isNotEmpty(whereJson.getString("sku"))) { + where += " AND sku like ('%" + whereJson.get("sku") + "%')"; + } + if (StrUtil.isNotEmpty(whereJson.getString("status"))) { + where += " AND status = '" + whereJson.getString("status") + "'"; + } + ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page),where, "create_time desc"); + final JSONObject json = rb.pageResult(); + return json; + } + + @Override + public List queryAll(Map whereJson){ + WQLObject wo = WQLObject.getWQLObject("ext_delivery_note"); + JSONArray arr = wo.query().getResultJSONArray(0); + if (ObjectUtil.isNotEmpty(arr)) return arr.toJavaList(ExtDeliveryNoteDto.class); + return null; + } + + @Override + public ExtDeliveryNoteDto findById(String note_id) { + WQLObject wo = WQLObject.getWQLObject("ext_delivery_note"); + JSONObject json = wo.query("note_id = '" + note_id + "'").uniqueResult(0); + if (ObjectUtil.isNotEmpty(json)){ + return json.toJavaObject( ExtDeliveryNoteDto.class); + } + return null; + } + + @Override + public ExtDeliveryNoteDto findByCode(String code) { + WQLObject wo = WQLObject.getWQLObject("ext_delivery_note"); + JSONObject json = wo.query("code ='" + code + "'").uniqueResult(0); + if (ObjectUtil.isNotEmpty(json)){ + return json.toJavaObject( ExtDeliveryNoteDto.class); + } + return null; + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void create(ExtDeliveryNoteDto dto) { + + WQLObject wo = WQLObject.getWQLObject("ext_delivery_note"); + JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); + wo.insert(json); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(ExtDeliveryNoteDto dto) { + ExtDeliveryNoteDto entity = this.findById(dto.getNote_id()); + if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); + + WQLObject wo = WQLObject.getWQLObject("ext_delivery_note"); + JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); + wo.update(json); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteAll(String[] ids) { + WQLObject wo = WQLObject.getWQLObject("ext_delivery_note"); + for (String note_id: ids) { + JSONObject param = new JSONObject(); + param.put("note_id", String.valueOf(note_id)); + param.put("status", "0"); + wo.update(param); + } + } + +}