维多利亚

hx-common/code-generator/src/main/java/com/fjhx/modular/Victoriatourist.java

@@ -12,7 +12,7 @@ public class Victoriatourist {
         CodeGenerator.MODULAR_NAME = "victoriatourist";
 
         // 需要生成的表名称,多表用,隔开
-        CodeGenerator.INCLUDE = "product_combination";
+        CodeGenerator.INCLUDE = "logistics_details";
 
         // mysql连接
         CodeGenerator.MYSQL_URL = "36.134.91.96:17330";

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/logistics/LogisticsDetails.java

@@ -1,15 +1,14 @@
 package com.fjhx.entity.logistics;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fjhx.base.BaseEntity;
-import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
+
 /**
  * <p>
  * 物流明细
@@ -44,6 +43,16 @@ public class LogisticsDetails extends BaseEntity {
     private Long applyPurchaseId;
 
     /**
+     * 发货数量
+     */
+    private BigDecimal shipmentQuantity;
+
+    /**
+     * 入库数量
+     */
+    private BigDecimal receiptQuantity;
+
+    /**
      * 逻辑删除 0未删除 1已删除
      */
     @TableField(fill = FieldFill.INSERT)

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/logistics/LogisticsInfo.java

@@ -34,6 +34,11 @@ public class LogisticsInfo extends BaseEntity {
     private String code;
 
     /**
+     * 完成状态 1是 0否
+     */
+    private Integer status;
+
+    /**
      * 逻辑删除 0未删除 1已删除
      */
     @TableField(fill = FieldFill.INSERT)

hx-service/victoriatourist/src/main/java/com/fjhx/controller/logistics/LogisticsInfoController.java

@@ -1,16 +1,18 @@
 package com.fjhx.controller.logistics;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.springblade.core.tool.api.R;
+import com.fjhx.constants.StatusConstant;
 import com.fjhx.entity.logistics.LogisticsInfo;
 import com.fjhx.params.logistics.LogisticsInfoVo;
 import com.fjhx.service.logistics.LogisticsInfoService;
+import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
 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.List;
 import java.util.Map;
 
 /**
@@ -29,28 +31,34 @@ public class LogisticsInfoController {
     private LogisticsInfoService logisticsInfoService;
 
     @PostMapping("/page")
-    public R page(@RequestBody Map<String, Object> condition){
+    public R page(@RequestBody Map<String, Object> condition) {
         Page<LogisticsInfo> result = logisticsInfoService.getPage(condition);
         return R.success(result);
     }
 
     @PostMapping("/add")
-    public R add(@RequestBody LogisticsInfoVo logisticsInfoVo){
+    public R add(@RequestBody LogisticsInfoVo logisticsInfoVo) {
         logisticsInfoService.add(logisticsInfoVo);
         return R.success();
     }
 
     @PostMapping("/edit")
-    public R edit(@RequestBody LogisticsInfoVo logisticsInfoVo){
+    public R edit(@RequestBody LogisticsInfoVo logisticsInfoVo) {
         logisticsInfoService.edit(logisticsInfoVo);
         return R.success();
     }
 
     @PostMapping("/delete")
-    public R delete(@RequestBody LogisticsInfoVo logisticsInfoVo){
+    public R delete(@RequestBody LogisticsInfoVo logisticsInfoVo) {
         logisticsInfoService.delete(logisticsInfoVo);
         return R.success();
     }
 
+    @PostMapping("/list")
+    public R list() {
+        List<LogisticsInfo> list = logisticsInfoService.list(q -> q.eq(LogisticsInfo::getStatus, StatusConstant.NO));
+        return R.success(list);
+    }
+
 }