Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

chenlu

2024-01-22 bcb1185bfbcedced606240aa3808468578513e0b

Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

# Conflicts:
#	north-glass-erp/.idea/workspace.xml

 north-glass-erp/.idea/compiler.xml

File was deleted

 north-glass-erp/.idea/dataSources.local.xml

File was deleted

 north-glass-erp/.idea/dataSources.xml

File was deleted

 north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2.xml

File was deleted

 north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/erp_sd.rUrUsg.meta

File was deleted

 north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/erp_user_info.xjxUZg.meta

File was deleted

 north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/erp_user_info.xjxUZg.zip

Binary files differ

 north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/information_schema.FNRwLQ.meta

File was deleted

 north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/mysql.osA4Bg.meta

File was deleted

 north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/performance_schema.kIw0nw.meta

File was deleted

 north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/sd_kd.B3aDBg.meta

File was deleted

 north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/sys.zb4BAA.meta

File was deleted

 north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/testpp.Ena3yw.meta

File was deleted

 north-glass-erp/.idea/dataSources/165c5447-d19a-4aaf-af5f-cee92ae696c2/storage_v2/_src_/schema/ztest.DHjtBg.meta

File was deleted

 north-glass-erp/.idea/encodings.xml

File was deleted

 north-glass-erp/.idea/google-java-format.xml

File was deleted

 north-glass-erp/.idea/jarRepositories.xml

File was deleted

 north-glass-erp/.idea/misc.xml

File was deleted

 north-glass-erp/.idea/north-glass-erp.iml

File was deleted

 north-glass-erp/.idea/sqldialects.xml

File was deleted

 north-glass-erp/.idea/uiDesigner.xml

File was deleted

 north-glass-erp/.idea/vcs.xml

File was deleted

 north-glass-erp/.idea/workspace.xml

File was deleted

 north-glass-erp/northglass-erp/src/views/sd/product/SelectProduct.vue

@@ -102,6 +102,7 @@
})
request.get("/product/1/100").then((res) => {
  if(res.code==200){
    console.log(res.data)
    produceList = produceList.value.concat(deepClone(res.data))

    xGrid.value.reloadData(produceList)
@@ -169,9 +170,9 @@
    {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
    {type: 'seq',fixed:"left", title: '自序', width: 80 },
    {title: '操作', width: 110, slots: { default: 'button_slot' },fixed:"left"},
    {field: 'prodID', title: '编号',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'id', title: '编号',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'product', title: '名称',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'typeName', title: '所属类别',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'glassTypes.typeName', title: '所属类别',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'query', title: '快速查询',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'remarks', title: '备注',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
    {field: 'creator', title: '创建人',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},

 north-glass-erp/pom.xml

@@ -120,6 +120,11 @@
            <version>1.2.24</version>
            <scope>import</scope>
        </dependency>
        <dependency>
            <groupId>javax</groupId>
            <artifactId>javaee-api</artifactId>
            <version>7.0</version>
        </dependency>

    </dependencies>


 north-glass-erp/src/main/java/com/example/erp/entity/mm/FinishedGoodsInventory.java

New file
@@ -0,0 +1,40 @@
package com.example.erp.entity.mm;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.example.erp.entity.sd.Customer;
import com.example.erp.entity.sd.Order;
import lombok.Data;

import java.time.LocalDate;

@Data
public class FinishedGoodsInventory {
    @TableId(type = IdType.AUTO)

    private Long id;
    private Integer deliveryState;
    private Integer stockState;
    private String deliveryId;
    private String project;
    private String customerName;
    private LocalDate deliveryDate;
    private String payMethod;
    private LocalDate payDate;
    private String salaManId;
    private String salaMan;
    private String createrId;
    private String creator;
    private String contacts;
    private String contactNumber;
    private String deliveryAddress;
    private Double area;
    private Integer quantity;
    private Double money;
    private String remarks;
    private LocalDate createTime;
    private LocalDate updateTime;
    private Order order;
    private Customer customer;

}

 north-glass-erp/src/main/java/com/example/erp/entity/sd/BasicData.java

New file
@@ -0,0 +1,18 @@
package com.example.erp.entity.sd;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;

import java.time.LocalDate;

@Data
public class BasicData {
    @TableId(type = IdType.AUTO)
    private Integer id;
    private String basicType;
    private String name;
    private String type;
    private LocalDate createTime;
    private LocalDate updateTime;
}

 north-glass-erp/src/main/java/com/example/erp/entity/sd/Customer.java

New file
@@ -0,0 +1,18 @@
package com.example.erp.entity.sd;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;

@Data
public class Customer {
    @TableId(type = IdType.AUTO)

    private Long id;
    private String customerName;
    private String grade;
    private Double moneyLimit;
    private String address;
    private String contact;
    private String phone;
}

 north-glass-erp/src/main/java/com/example/erp/entity/sd/Delivery.java

New file
@@ -0,0 +1,39 @@
package com.example.erp.entity.sd;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;

import java.sql.Date;
import java.time.LocalDate;

@Data
public class Delivery {
    @TableId(type = IdType.AUTO)

    private Long id;
    private Integer deliveryState;
    private Integer stockState;
    private String deliveryId;
    private String project;
    private String customerName;
    private LocalDate deliveryDate;
    private String payMethod;
    private LocalDate payDate;
    private String salaManId;
    private String salaMan;
    private String createrId;
    private String creator;
    private String contacts;
    private String contactNumber;
    private String deliveryAddress;
    private Double area;
    private Integer quantity;
    private Double money;
    private String remarks;
    private LocalDate createTime;
    private LocalDate updateTime;
    private  Order order;
    private  Customer customer;

}

 north-glass-erp/src/main/java/com/example/erp/entity/sd/DeliveryDetail.java

New file
@@ -0,0 +1,28 @@
package com.example.erp.entity.sd;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;

import java.sql.Date;
import java.time.LocalDate;

@Data
public class DeliveryDetail {
    @TableId(type = IdType.AUTO)

    private Long id;
    private Integer deliveryNumber;
    private Integer orderNumber;
    private Double area;
    private String quantity;
    private Double money;
    private String deliveryDetailRemakes;
    private Integer deliveryDetailState;
    private LocalDate createTime;
    private LocalDate updateTime;

    private  Delivery delivery;
    private  OrderDetail orderDetail;

}

 north-glass-erp/src/main/java/com/example/erp/entity/sd/GlassType.java

New file
@@ -0,0 +1,21 @@
package com.example.erp.entity.sd;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;

import java.time.LocalDate;

@Data
public class GlassType {
    @TableId(type = IdType.AUTO)

    private Long id;
    private Integer typeGrade;
    private String typeId;
    private String typeName;
    private String parentTypeId;
    private LocalDate createTime;
    private LocalDate updateTime;

}

 north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java

New file
@@ -0,0 +1,56 @@
package com.example.erp.entity.sd;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;

import java.time.LocalDate;

@Data
public class Order {
    @TableId(type = IdType.AUTO)

    private Long id;
    private String orderId;
    private String project;

    private String customerName;
    private String orderType;
    private String orderClassify;
    private String icon;
    private String packType;
    private String deliveryDate;
    private String batch;
    private Integer calculateType;
    private String salesmanId;
    private String salesman;
    private String alType;
    private Double money;
    private String contractId;
    private String customerBatch;
    private String contacts;
    private String contactNumber;
    private String deliveryAddress;
    private Double otherMoney;
    private String otherMoneyRemarks;
    private String processingNote;
    private String otherRemaks;
    private Double area;
    private Long quantity;
    private String verifierId;
    private String verifier;
    private String createrId;
    private String creater;
    private Integer createOrder;
    private Integer processReview;
    private Integer orderReview;
    private Integer productionOrder;
    private Integer processingCard;
    private Integer warehousing;
    private Integer delivery;
    private LocalDate createTime;
    private LocalDate updateTime;

    private Customer  customer;

}

 north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java

New file
@@ -0,0 +1,44 @@
package com.example.erp.entity.sd;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;

import java.time.LocalDate;

@Data
public class OrderDetail {
    @TableId(type = IdType.AUTO)

    private Long id;

    private Integer orderNumber;
    private String buildingNumber;
    private String productName;
    private Double price;
    private Long quantity;
    private Double grossAmount;
    private Double width;
    private Double height;
    private String shape;
    private Double area;
    private Double grossArea;
    private Double computeArea;
    private Double computeGrossArea;
    private String processingNote;
    private String remarks;
    private Integer bendRadius;
    private String edgingType;
    private Double weight;
    private Double perimeter;
    private Integer warehouseNum;
    private Integer deliveryNum;
    private Integer returnNum;
    private Integer state;
    private LocalDate createTime;
    private LocalDate updateTime;

    private Order order;
    private Product product;

}

 north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderGlassDetail.java

New file
@@ -0,0 +1,31 @@
package com.example.erp.entity.sd;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;

import java.time.LocalDate;

@Data
public class OrderGlassDetail {
    @TableId(type = IdType.AUTO)

    private Long id;
    private Integer technologyNumber;
    private String glassAddress;
    private String glassChild;
    private Double childWidth;
    private Double childHeight;
    private String process;
    private String productionId;
    private Integer splittingStatus;
    private String founder;
    private Integer group;
    private LocalDate produtionTime;
    private LocalDate createTime;

    private  Order order;
    private  OrderDetail orderDetail;


}

 north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderProcessDetail.java

New file
@@ -0,0 +1,19 @@
package com.example.erp.entity.sd;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;

@Data
public class OrderProcessDetail {
    @TableId(type = IdType.AUTO)

    private Long id;
    private String process;
    private Integer reportingworkNum;
    private Integer brokenNum;

    private Order order;
    private OrderDetail orderDetail;
    private Product product;
}

 north-glass-erp/src/main/java/com/example/erp/entity/sd/Product.java

@@ -4,21 +4,24 @@
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;



import java.time.LocalDate;

@Data
public class Product {
    @TableId(type = IdType.AUTO)
    private Integer id;
    private String prodID;
    private String product;
    private String glassType;
    private Long id;
    private String productName;
    private String typeName;
    private Double totalThickness;
    private Double thickness;
    private String Query;
    private String query;
    private String remarks;
    private Integer state;
    private String creator;
    private String createTime;
    private String updateTime;
    private LocalDate createTime;
    private LocalDate updateTime;

    private BasicGlassType basicGlassType;
}

 north-glass-erp/src/main/java/com/example/erp/entity/sd/ProductDetail.java

New file
@@ -0,0 +1,23 @@
package com.example.erp.entity.sd;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;


import java.time.LocalDate;


@Data
public class ProductDetail    {
    @TableId(type = IdType.AUTO)
    private Long id;
    private String productName;
    private String detailType;
    private String detail;
    private String process;
    private String separation;
    private LocalDate createTime;

    private Product product;
}

 north-glass-erp/src/main/java/com/example/erp/entity/sd/Returns.java

New file
@@ -0,0 +1,38 @@
package com.example.erp.entity.sd;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;

import java.sql.Date;
import java.time.LocalDate;

@Data
public class Returns {
    @TableId(type = IdType.AUTO)

    private Long id;
    private Integer returnsState;
    private Integer warehousingState;
    private String returnsId;
    private String deliveryId;
    private String project;
    private Long customerId;
    private String customerName;
    private LocalDate returnsDate;
    private String returnsMethod;
    private String salaManId;
    private String salaMan;
    private String createrId;
    private String creator;
    private Double area;
    private Integer quantity;
    private Double money;
    private String remarks;
    private LocalDate createTime;
    private LocalDate updateTime;

    private  Delivery delivery;
    private  Customer customer;

}

 north-glass-erp/src/main/java/com/example/erp/entity/sd/ReturnsDetail.java

New file
@@ -0,0 +1,28 @@
package com.example.erp.entity.sd;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;

import java.time.LocalDate;

@Data
public class ReturnsDetail {
    @TableId(type = IdType.AUTO)

    private Long id;
    private String returnsId;
    private Integer returnsNumber;
    private Integer deliveryNumber;
    private Double area;
    private Long quantity;
    private Double money;
    private String returnsDetailRemakes;
    private Integer returnsDetailState;
    private LocalDate createTime;
    private LocalDate updateTime;

    private  Returns returns;
    private  DeliveryDetail deliveryDetail;

}

 north-glass-erp/src/main/resources/application.yml

@@ -15,7 +15,7 @@
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
        erp_sd:
          url: jdbc:mysql://10.153.19.150:3306/erp_sd?serverTimezone=GMT%2b8
          url: jdbc:mysql://10.153.19.150:3306/sd?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver

 north-glass-erp/src/main/resources/mapper/sd/Product.xml

@@ -3,24 +3,42 @@
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.example.erp.mapper.sd.ProductMapper">
    <select id="defaultProduct">
        select
            a.id,
            prodID,
            product,
            glassType,
            typeName,
            totalThickness,
            thickness,
            Query,
            remarks,
            state,
            creator,
            date(a.createTime) as 'createTime',
            updateTime
        from
            product as a
        left join basic_glass_type bgt on bgt.typeID = a.glassType

<resultMap id="productmap" type="com.example.erp.entity.sd.Product" >
    <id column="id" property="id"/>
    <result column="product" property="product"/>
    <result column="total_thickness" property="totalThickness"/>
    <result column="thickness" property="thickness"/>
    <result column="query" property="query"/>
    <result column="remarks" property="remarks"/>
    <result column="state" property="state"/>
    <result column="creator" property="creator"/>
    <result column="create_time" property="createTime"/>
    <result column="update_time" property="updateTime"/>
    <association property="glassTypes" javaType="com.example.erp.entity.sd.GlassType">
        <result column="type_id" property="typeId"/>
        <result column="type_name" property="typeName"/>
    </association>
    <!--<result column="g_typeId" property="glassTypes.typeId"/>
    <result column="g_type" property="glassTypes.type"/>-->

</resultMap>

    <select id="defaultProduct" resultMap="productmap">
        select a.id                as id,
               a.product,
               a.total_thickness,
               a.thickness,
               a.query,
               a.remarks,
               a.state,
               a.creator,
               date(a.create_time) as create_time,
               a.update_time       as update_time,
               bgt.type_id         as type_id,
               bgt.type            as type
        from product as a
                 left join glass_type bgt on bgt.type_id = a.type_id

        order by id desc
        limit #{offset},#{pageSize}

 north-glass-erp/target/classes/application.yml

@@ -15,7 +15,7 @@
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
        erp_sd:
          url: jdbc:mysql://10.153.19.150:3306/erp_sd?serverTimezone=GMT%2b8
          url: jdbc:mysql://10.153.19.150:3306/sd?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver

 north-glass-erp/target/classes/mapper/sd/Product.xml

@@ -3,24 +3,42 @@
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.example.erp.mapper.sd.ProductMapper">
    <select id="defaultProduct">
        select
            a.id,
            prodID,
            product,
            glassType,
            typeName,
            totalThickness,
            thickness,
            Query,
            remarks,
            state,
            creator,
            date(a.createTime) as 'createTime',
            updateTime
        from
            product as a
        left join basic_glass_type bgt on bgt.typeID = a.glassType

<resultMap id="productmap" type="com.example.erp.entity.sd.Product" >
    <id column="id" property="id"/>
    <result column="product" property="product"/>
    <result column="total_thickness" property="totalThickness"/>
    <result column="thickness" property="thickness"/>
    <result column="query" property="query"/>
    <result column="remarks" property="remarks"/>
    <result column="state" property="state"/>
    <result column="creator" property="creator"/>
    <result column="create_time" property="createTime"/>
    <result column="update_time" property="updateTime"/>
    <association property="glassTypes" javaType="com.example.erp.entity.sd.GlassType">
        <result column="type_id" property="typeId"/>
        <result column="type_name" property="typeName"/>
    </association>
    <!--<result column="g_typeId" property="glassTypes.typeId"/>
    <result column="g_type" property="glassTypes.type"/>-->

</resultMap>

    <select id="defaultProduct" resultMap="productmap">
        select a.id                as id,
               a.product,
               a.total_thickness,
               a.thickness,
               a.query,
               a.remarks,
               a.state,
               a.creator,
               date(a.create_time) as create_time,
               a.update_time       as update_time,
               bgt.type_id         as type_id,
               bgt.type            as type
        from product as a
                 left join glass_type bgt on bgt.type_id = a.type_id

        order by id desc
        limit #{offset},#{pageSize}