加权

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/GeneratorCodeByTables.java

@@ -53,7 +53,7 @@ public class GeneratorCodeByTables {
     }
 
     public static void main(String[] args) throws IOException {
-        generateByTables("Gdc", "com.yh.saas.plugin.yiliangyiyun","open_service_info");
+        generateByTables("Gdc", "com.yh.saas.plugin.yiliangyiyun","weighted_details");
     }
 
     /**

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/WeightedDetailsController.java

@@ -0,0 +1,21 @@
+package com.yh.saas.plugin.yiliangyiyun.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 加权明细 前端控制器
+ * </p>
+ *
+ * @author Gdc
+ * @since 2021-10-08
+ */
+@RestController
+@RequestMapping("/weightedDetails")
+public class WeightedDetailsController {
+
+}
+

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/WeightedDetails.java

@@ -0,0 +1,127 @@
+package com.yh.saas.plugin.yiliangyiyun.entity;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotations.Version;
+
+import com.baomidou.mybatisplus.enums.IdType;
+import com.yh.saas.common.support.entity.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 加权明细
+ * </p>
+ *
+ * @author Gdc
+ * @since 2021-10-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("weighted_details")
+public class WeightedDetails extends BaseModel<WeightedDetails> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.UUID)
+    private String id;
+    /**
+     * 公司id
+     */
+    private String compId;
+    /**
+     * 库点id
+     */
+    private String warehouseId;
+    /**
+     * 库点
+     */
+    private String warehouseName;
+    /**
+     * 货名key
+     */
+    private String goodsNameKey;
+    /**
+     * 货名
+     */
+    private String goodsName;
+    /**
+     * 入库类型key
+     */
+    private String inTypeKey;
+    /**
+     * 入库类型
+     */
+    private String inType;
+    /**
+     * 粮食类型key
+     */
+    private String grainTypeKey;
+    /**
+     * 粮食类型
+     */
+    private String grainType;
+    /**
+     * 净重（吨）
+     */
+    private Float netWeight;
+    /**
+     * 纯重（吨）
+     */
+    private Float pureWeight;
+    /**
+     * 价格（元/吨）
+     */
+    private Float unitPrice;
+    /**
+     * 运费
+     */
+    private Float freight;
+    /**
+     * 原库存量（吨）
+     */
+    private Float originalStock;
+    /**
+     * 入库前加权成本
+     */
+    private Float costBefore;
+    /**
+     * 入库后加权成本
+     */
+    private Float costAfter;
+    /**
+     * 状态标识
+     */
+    private String statusFlag;
+    /**
+     * 状态
+     */
+    private String status;
+    /**
+     * 状态英文
+     */
+    private String statusEn;
+
+
+    /**
+     * 年份
+     */
+    @TableField(exist = false)
+    private String year;
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/WeightedDetailsMapper.java

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.mapper;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.WeightedDetails;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 加权明细 Mapper 接口
+ * </p>
+ *
+ * @author Gdc
+ * @since 2021-10-08
+ */
+public interface WeightedDetailsMapper extends BaseMapper<WeightedDetails> {
+
+}

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IWeightedDetailsService.java

@@ -0,0 +1,25 @@
+package com.yh.saas.plugin.yiliangyiyun.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.yh.saas.plugin.yiliangyiyun.entity.WeightedDetails;
+import com.baomidou.mybatisplus.service.IService;
+
+/**
+ * <p>
+ * 加权明细 服务类
+ * </p>
+ *
+ * @author Gdc
+ * @since 2021-10-08
+ */
+public interface IWeightedDetailsService extends IService<WeightedDetails> {
+
+
+    /**
+     * 列表
+     *
+     * @param weightedDetails
+     * @return
+     */
+    Page<WeightedDetails> selectInventoryCostInfo(WeightedDetails weightedDetails);
+}

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseInOutInfoServiceImpl.java

@@ -253,30 +253,6 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             }
                         }
 
-//                    boolean isStartWorkflow = org.apache.commons.lang3.StringUtils.isBlank(purchaseReceiptReport.getWorkflowId());
-//                    // 不是退回的单子
-//                    if (isStartWorkflow) {
-//                        Workflow workflow = workflowService
-//                                .findLatestWorkflowByBusinessCode("PURCHASE-RECEIPT-REPORT");
-//                        // 没配置审核流程，直接结束并处理信息
-//                        if (workflow == null) {
-//                            throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
-//                        }
-//                        // 开启审核流
-//                        else {
-//
-//                            // 设置状态 已提交审核
-//                            purchaseReceiptReport.setWorkflowId(workflow.getId());
-//                            purchaseReceiptReportService.updateById(purchaseReceiptReport);
-//                            workflowService.startInstance(workflow.getId(), purchaseReceiptReport.getId());
-//                        }
-//                    }
-//                    // 退回的单子 再启用
-//                    else {
-//
-//                        purchaseReceiptReportService.updateById(purchaseReceiptReport);
-//                        workflowService.activateInstance(purchaseReceiptReport.getWorkflowId(), purchaseReceiptReport.getId());
-//                    }
                     }
                 }
                 //常用库出库

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WeightedDetailsServiceImpl.java

@@ -0,0 +1,43 @@
+package com.yh.saas.plugin.yiliangyiyun.service.impl;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.yh.saas.plugin.yiliangyiyun.entity.InventoryCostInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.WeightedDetails;
+import com.yh.saas.plugin.yiliangyiyun.mapper.WeightedDetailsMapper;
+import com.yh.saas.plugin.yiliangyiyun.service.IWeightedDetailsService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 加权明细 服务实现类
+ * </p>
+ *
+ * @author Gdc
+ * @since 2021-10-08
+ */
+@Service
+public class WeightedDetailsServiceImpl extends ServiceImpl<WeightedDetailsMapper, WeightedDetails> implements IWeightedDetailsService {
+
+
+    /**
+     * 列表
+     *
+     * @param weightedDetails
+     * @return
+     */
+    @Override
+    public Page<WeightedDetails> selectInventoryCostInfo(WeightedDetails weightedDetails) {
+        Page<WeightedDetails> weightedDetailsPage = this.selectPage(weightedDetails.getQueryPage(), new EntityWrapper<WeightedDetails>()
+                .eq("warehouse_id", weightedDetails.getWarehouseId())
+                .eq("update_date", weightedDetails.getYear())
+                .eq("goods_name_key", weightedDetails.getGoodsNameKey()));
+        int count = this.selectCount(new EntityWrapper<WeightedDetails>()
+                .eq("warehouse_id", weightedDetails.getWarehouseId())
+                .eq("update_date", weightedDetails.getYear())
+                .eq("goods_name_key", weightedDetails.getGoodsNameKey()));
+        weightedDetailsPage.setSize(count);
+        return weightedDetailsPage;
+    }
+}

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WeightedDetailsMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yh.saas.plugin.yiliangyiyun.mapper.WeightedDetailsMapper">
+
+</mapper>