Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

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

@@ -29,7 +29,7 @@ public class GeneratorCodeByTables {
 
     private static final String DATA_SOURCE_PREFIX = "spring.datasource.";
 
-    private static final String DATA_SOURCE_URL = "jdbc:mysql://47.100.3.209:3306/yilaingyiyun?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=UTC";
+    private static final String DATA_SOURCE_URL = "jdbc:mysql://47.100.3.209:3306/yiliangyiyun_test?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=UTC";
 
     private static final String DATA_SOURCE_USERNAME = "root";
 
@@ -53,7 +53,7 @@ public class GeneratorCodeByTables {
     }
 
     public static void main(String[] args) throws IOException {
-        generateByTables("Gdc", "com.yh.saas.plugin.yiliangyiyun","trade_warehouse_receipt_appl");
+        generateByTables("Gdc", "com.yh.saas.plugin.yiliangyiyun","common_constant_false");
     }
 
     /**

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

@@ -0,0 +1,38 @@
+package com.yh.saas.plugin.yiliangyiyun.controller;
+
+
+import com.yh.saas.plugin.yiliangyiyun.entity.CommonConstantFalse;
+import com.yh.saas.plugin.yiliangyiyun.service.ICommonConstantFalseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 增量比数据 前端控制器
+ * </p>
+ *
+ * @author Gdc
+ * @since 2021-11-24
+ */
+@RestController
+@RequestMapping("/commonConstantFalse")
+public class CommonConstantFalseController {
+
+    @Autowired
+    private ICommonConstantFalseService commonConstantFalseService;
+
+    /**
+     * 查看
+     */
+    @GetMapping("/getInfo")
+    public List<CommonConstantFalse> getInfo() {
+        return commonConstantFalseService.getInfo();
+    }
+}
+

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

@@ -0,0 +1,62 @@
+package com.yh.saas.plugin.yiliangyiyun.entity;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotations.TableId;
+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-11-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+public class CommonConstantFalse extends BaseModel<CommonConstantFalse> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.UUID)
+    private String id;
+    /**
+     * 车牌号
+     */
+    private String warehouseName;
+    /**
+     * 费用名称
+     */
+    private String expenseName;
+    /**
+     * 毛重（吨）
+     */
+    private Float grossWeight;
+    /**
+     * 皮重（吨）
+     */
+    private Float tare;
+    /**
+     * 净重（吨）
+     */
+    private Float netWeight;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

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

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.mapper;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.CommonConstantFalse;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 增量比数据 Mapper 接口
+ * </p>
+ *
+ * @author Gdc
+ * @since 2021-11-24
+ */
+public interface CommonConstantFalseMapper extends BaseMapper<CommonConstantFalse> {
+
+}

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

@@ -0,0 +1,23 @@
+package com.yh.saas.plugin.yiliangyiyun.service;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.CommonConstantFalse;
+import com.baomidou.mybatisplus.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 增量比数据 服务类
+ * </p>
+ *
+ * @author Gdc
+ * @since 2021-11-24
+ */
+public interface ICommonConstantFalseService extends IService<CommonConstantFalse> {
+
+    /**
+     * 查看
+     * @param
+     */
+    List<CommonConstantFalse> getInfo();
+}

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

@@ -0,0 +1,35 @@
+package com.yh.saas.plugin.yiliangyiyun.service.impl;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.yh.saas.plugin.yiliangyiyun.entity.CommonConstantFalse;
+import com.yh.saas.plugin.yiliangyiyun.mapper.CommonConstantFalseMapper;
+import com.yh.saas.plugin.yiliangyiyun.service.ICommonConstantFalseService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 增量比数据 服务实现类
+ * </p>
+ *
+ * @author Gdc
+ * @since 2021-11-24
+ */
+@Service
+public class CommonConstantFalseServiceImpl extends ServiceImpl<CommonConstantFalseMapper, CommonConstantFalse> implements ICommonConstantFalseService {
+
+    /**
+     * 查看
+     *
+     * @param
+     */
+    @Override
+    public List<CommonConstantFalse> getInfo() {
+        //查看信息
+        List<CommonConstantFalse> commonConstantFalse = this.selectList(new EntityWrapper<CommonConstantFalse>()
+            .eq("delete_flag","0"));
+        return commonConstantFalse;
+    }
+}

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

@@ -256,8 +256,16 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                 InOutWarehouseTask inOutWarehouseTask=inOutWarehouseTaskService.selectOne(new EntityWrapper<InOutWarehouseTask>()
                 .eq("in_out_task_no",warehouseInOutInfo.getInOutTaskNo()));
                 if (inOutWarehouseTask!=null){
+                    //可超出重量
+                    Float overNeight=0.0f;
+                    ContractManagementInfo contractManagementInfo=contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+                    .eq("comp_id",inOutWarehouseTask.getCompId())
+                    .eq("contract_no",inOutWarehouseTask.getContractNo()));
+                    if (contractManagementInfo!=null){
+                        overNeight=inOutWarehouseTask.getWeight()*(contractManagementInfo.getOverShort()/100);
+                    }
                     inOutWarehouseTask.setCompletedQuantity(inOutWarehouseTask.getCompletedQuantity()+warehouseInOutInfo.getNetWeight());
-                    if (inOutWarehouseTask.getCompletedQuantity()>inOutWarehouseTask.getWeight()){
+                    if (inOutWarehouseTask.getCompletedQuantity()>inOutWarehouseTask.getWeight()+overNeight){
                         throw new YException(YExceptionEnum.TASK_WEIGHT_EXCEEDED_ERROR);
                     }
                     else {
@@ -276,8 +284,16 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                 InOutWarehouseTask inOutWarehouseTask=inOutWarehouseTaskService.selectOne(new EntityWrapper<InOutWarehouseTask>()
                         .eq("in_out_task_no",warehouseInOutInfo.getInOutTaskNo()));
                 if (inOutWarehouseTask!=null){
+                    //可超出重量
+                    Float overNeight=0.0f;
+                    ContractManagementInfo contractManagementInfo=contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+                            .eq("comp_id",inOutWarehouseTask.getCompId())
+                            .eq("contract_no",inOutWarehouseTask.getContractNo()));
+                    if (contractManagementInfo!=null){
+                        overNeight=inOutWarehouseTask.getWeight()*(contractManagementInfo.getOverShort()/100);
+                    }
                     inOutWarehouseTask.setCompletedQuantity(inOutWarehouseTask.getCompletedQuantity()+warehouseInOutInfo.getNetWeight());
-                    if (inOutWarehouseTask.getCompletedQuantity()>inOutWarehouseTask.getWeight()){
+                    if (inOutWarehouseTask.getCompletedQuantity()>inOutWarehouseTask.getWeight()+overNeight){
                         throw new YException(YExceptionEnum.TASK_WEIGHT_EXCEEDED_ERROR);
                     }
                     else {

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/CommonConstantFalseMapper.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.CommonConstantFalseMapper">
+
+</mapper>