Merge pull request #234 from Jzow/master

Fix storage module bug and add other shipments views and api

core/api/src/main/java/com/wansenai/api/warehouse/OtherShipmentsController.java

@@ -0,0 +1,67 @@
+/*
+ * Copyright 2023-2033 WanSen AI Team, Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance
+ * with the License. A copy of the License is located at
+ *
+ * http://opensource.wansenai.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+ * OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions
+ * and limitations under the License.
+ */
+package com.wansenai.api.warehouse;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.wansenai.dto.warehouse.OtherShipmentDTO;
+import com.wansenai.dto.warehouse.QueryOtherShipmentDTO;
+import com.wansenai.service.warehouse.OtherShipmentsService;
+import com.wansenai.utils.response.Response;
+import com.wansenai.vo.warehouse.OtherShipmentDetailVO;
+import com.wansenai.vo.warehouse.OtherShipmentVO;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("warehouse/otherShipments")
+public class OtherShipmentsController {
+
+    private final OtherShipmentsService otherShipmentsService;
+
+    public OtherShipmentsController(OtherShipmentsService otherShipmentsService) {
+        this.otherShipmentsService = otherShipmentsService;
+    }
+
+    @PostMapping("addOrUpdate")
+    public Response<String> addOrUpdateOtherShipments(@RequestBody OtherShipmentDTO otherShipmentDTO) {
+        return otherShipmentsService.addOrUpdateOtherShipments(otherShipmentDTO);
+    }
+
+    @PostMapping("pageList")
+    public Response<Page<OtherShipmentVO>> getOtherShipmentsPageList(@RequestBody QueryOtherShipmentDTO queryOtherShipmentDTO) {
+        return otherShipmentsService.getOtherShipmentsPageList(queryOtherShipmentDTO);
+    }
+
+    @GetMapping("getDetailById/{id}")
+    public Response<OtherShipmentDetailVO> getOtherShipmentsDetailById(@PathVariable("id") Long id) {
+        return otherShipmentsService.getOtherShipmentsDetail(id);
+    }
+
+    @PutMapping("deleteByIds")
+    public Response<String> deleteOtherShipmentsByIds(@RequestParam("ids") List<Long> ids) {
+        return otherShipmentsService.deleteBatchOtherShipments(ids);
+    }
+
+    @PutMapping("updateStatusByIds")
+    public Response<String> updateOtherShipmentsStatusByIds(@RequestParam("ids") List<Long> ids, @RequestParam("status") Integer status) {
+        return otherShipmentsService.updateOtherShipmentsStatus(ids, status);
+    }
+}

core/domain/src/main/java/com/wansenai/vo/warehouse/AllotReceiptDetailVO.java

@@ -12,20 +12,26 @@
  */
 package com.wansenai.vo.warehouse;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.wansenai.bo.AllotStockBO;
 import com.wansenai.bo.FileDataBO;
 import lombok.Builder;
 import lombok.Data;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Data
 @Builder
 public class AllotReceiptDetailVO {
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long id;
+
     private String receiptNumber;
 
-    private String receiptDate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime receiptDate;
 
     private String remark;
 

core/domain/src/main/java/com/wansenai/vo/warehouse/AssembleReceiptDetailVO.java

@@ -12,20 +12,26 @@
  */
 package com.wansenai.vo.warehouse;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.wansenai.bo.AssembleStockBO;
 import com.wansenai.bo.FileDataBO;
 import lombok.Builder;
 import lombok.Data;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Data
 @Builder
 public class AssembleReceiptDetailVO {
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long id;
+
     private String receiptNumber;
 
-    private String receiptDate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime receiptDate;
 
     private String remark;
 

core/domain/src/main/java/com/wansenai/vo/warehouse/DisassembleReceiptDetailVO.java

@@ -12,20 +12,26 @@
  */
 package com.wansenai.vo.warehouse;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.wansenai.bo.AssembleStockBO;
 import com.wansenai.bo.FileDataBO;
 import lombok.Builder;
 import lombok.Data;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Data
 @Builder
 public class DisassembleReceiptDetailVO {
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long id;
+
     private String receiptNumber;
 
-    private String receiptDate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime receiptDate;
 
     private String remark;
 

core/domain/src/main/java/com/wansenai/vo/warehouse/OtherShipmentDetailVO.java

@@ -18,20 +18,25 @@
 import lombok.Builder;
 import lombok.Data;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Data
 @Builder
 public class OtherShipmentDetailVO {
 
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long id;
+
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long customerId;
 
     private String customerName;
 
     private String receiptNumber;
 
-    private String receiptDate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime receiptDate;
 
     private String remark;