Merge branch 'master' of http://120.46.159.163:7400/ezhizao/ezhizao_dms_p2_api

src/main/java/cn/ezhizao/project/business/controller/Inc10100Controller.java

@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import javax.xml.ws.FaultAction;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;

src/main/java/cn/ezhizao/project/business/controller/Sfc10300Controller.java

@@ -32,14 +32,12 @@ import java.util.List;
 @RequestMapping("/business/sfc10300")
 public class Sfc10300Controller  extends BaseController {
 
-
     @Resource
     private IBizPullP2TimeService pullP2TimeService;
     @Resource
     private ISfc10300Service sfc10300Service;
     @Resource
     private IBizProcessService processService;
-
     @Resource
     private ISysUserService sysUserService;
     @Resource

src/main/java/cn/ezhizao/project/business/controller/Sfc10500Controller.java

@@ -0,0 +1,35 @@
+package cn.ezhizao.project.business.controller;
+
+import cn.ezhizao.framework.web.controller.BaseController;
+import cn.ezhizao.framework.web.domain.AjaxResult;
+import cn.ezhizao.project.business.domain.Sfc10500;
+import cn.ezhizao.project.business.service.impl.Sfc10500ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+
+/**
+ * sfc10300Controller
+ *
+ * @author ezhizao_zx
+ */
+@RestController
+@RequestMapping("/business/sfc10500")
+public class Sfc10500Controller extends BaseController {
+@Resource
+private Sfc10500ServiceImpl sfc10500Service;
+
+    @GetMapping(value = "/getLotAmount")
+    private AjaxResult getLotAmount(Sfc10500 sfc10500) {
+        //查找批次单批重量
+        QueryWrapper<Sfc10500> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("lotseq",sfc10500.getLotseq());
+        queryWrapper.like("lotno",sfc10500.getLotno());
+        return success( sfc10500Service.getList(queryWrapper));
+    }
+
+}

src/main/java/cn/ezhizao/project/business/domain/Sfc10500.java

@@ -0,0 +1,154 @@
+package cn.ezhizao.project.business.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@TableName(value = "sfc10500")
+public class Sfc10500 {
+    /** 版本号 */
+    @ApiModelProperty(value = "${comment}")
+    private String lot;
+    /** 产品编码 */
+    @ApiModelProperty(value = "${comment}")
+    private String lotcode;
+    /** 轴类型码 */
+    @ApiModelProperty(value = "${comment}")
+    private Date phdate;
+    /** 轴类助记码EPS */
+    @ApiModelProperty(value = "${comment}")
+    private String prver;
+    /** 规格 */
+    @ApiModelProperty(value = "${comment}")
+    private String cpart;
+    /** 图号 */
+    @ApiModelProperty(value = "${comment}")
+    private String lotno;
+    /** 工序助记码 */
+    @ApiModelProperty(value = "${comment}")
+    private Integer lotseq;
+    /** 建立者 */
+    @ApiModelProperty(value = "${comment}")
+    private String mingx;
+    @ApiModelProperty(value = "${comment}")
+    private String maxgx;
+    @ApiModelProperty(value = "${comment}")
+    private String minpr;
+    /** 建立日期 */
+    @ApiModelProperty(value = "${comment}")
+    private String maxpr;
+    /** 修改者 */
+    @ApiModelProperty(value = "${comment}")
+    private String minna;
+    /** 修改日期 */
+    @ApiModelProperty(value = "${comment}")
+    private String maxna;
+    /** 参照产品编码 */
+    @ApiModelProperty(value = "${comment}")
+    private Integer txqty;
+    /** 参照规格或图号 */
+    @ApiModelProperty(value = "${comment}")
+    private Integer hgqty;
+    /** 参照版本号 */
+    @ApiModelProperty(value = "${comment}")
+    private Integer xsqty;
+    /** 首序 */
+    @ApiModelProperty(value = "${comment}")
+    private String spec;
+    /** 末序 */
+    @ApiModelProperty(value = "${comment}")
+    private String draw;
+    /** 首序编码 */
+    @ApiModelProperty(value = "${comment}")
+    private String cust;
+    /** 末序编码 */
+    @ApiModelProperty(value = "${comment}")
+    private String khname;
+    /** 首序简称 */
+    @ApiModelProperty(value = "${comment}")
+    private String ztype;
+    /** 末序简称 */
+    @ApiModelProperty(value = "${comment}")
+    private String ztydm;
+    /** 编辑人 */
+    @ApiModelProperty(value = "${comment}")
+    private Integer phsl;
+    /** 更新日期 */
+    @ApiModelProperty(value = "${comment}")
+    private String part;
+    @ApiModelProperty(value = "${comment}")
+    private String status;
+    @ApiModelProperty(value = "${comment}")
+    private String xsyno;
+    @ApiModelProperty(value = "${comment}")
+    private String ddyno;
+    @ApiModelProperty(value = "${comment}")
+    private String facno;
+    @ApiModelProperty(value = "${comment}")
+    private Date wgdate;
+    @ApiModelProperty(value = "${comment}")
+    private BigDecimal pssl;
+    @ApiModelProperty(value = "${comment}")
+    private Integer okqty;
+    @ApiModelProperty(value = "${comment}")
+    private Integer rkqty;
+    @ApiModelProperty(value = "${comment}")
+    private String lotsta;
+    @ApiModelProperty(value = "${comment}")
+    private String reflot;
+    @ApiModelProperty(value = "${comment}")
+    private Date pfdate;
+    @ApiModelProperty(value = "${comment}")
+    private String llbz;
+    @ApiModelProperty(value = "${comment}")
+    private Date lldate;
+    @ApiModelProperty(value = "${comment}")
+    private String llrno;
+    @ApiModelProperty(value = "${comment}")
+    private String lldept;
+    @ApiModelProperty(value = "${comment}")
+    private BigDecimal xeqty;
+    @ApiModelProperty(value = "${comment}")
+    private BigDecimal peqty;
+    @ApiModelProperty(value = "${comment}")
+    private String sjqty;
+    @ApiModelProperty(value = "${comment}")
+    private String wlqty;
+    @ApiModelProperty(value = "${comment}")
+    private String fpxs;
+    @ApiModelProperty(value = "${comment}")
+    private String rkbz;
+    @ApiModelProperty(value = "${comment}")
+    private String writeruser;
+    @ApiModelProperty(value = "${comment}")
+    private Date writedate;
+    @ApiModelProperty(value = "${comment}")
+    private String remark;
+    @ApiModelProperty(value = "${comment}")
+    private Integer trqty;
+    @ApiModelProperty(value = "${comment}")
+    private String zjbz;
+    @ApiModelProperty(value = "${comment}")
+    private String type;
+    @ApiModelProperty(value = "${comment}")
+    private String descr;
+    @ApiModelProperty(value = "${comment}")
+    private String jasta;
+    @ApiModelProperty(value = "${comment}")
+    private Date jadate;
+    @ApiModelProperty(value = "${comment}")
+    private String luhao;
+    @ApiModelProperty(value = "${comment}")
+    private Date cldate;
+    @ApiModelProperty(value = "${comment}")
+    private String vena;
+    @ApiModelProperty(value = "${comment}")
+    private Integer ngqty;
+
+
+}

src/main/java/cn/ezhizao/project/business/mapper/Sfc10500Mapper.java

@@ -0,0 +1,14 @@
+package cn.ezhizao.project.business.mapper;
+
+import cn.ezhizao.project.business.domain.Sfc10300;
+import cn.ezhizao.project.business.domain.Sfc10401;
+import cn.ezhizao.project.business.domain.Sfc10500;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+public interface Sfc10500Mapper extends BaseMapper<Sfc10500>
+{
+    List<Sfc10300> getList(Sfc10500 sfc10500);
+}

src/main/java/cn/ezhizao/project/business/service/ISfc10500Service.java

@@ -0,0 +1,16 @@
+package cn.ezhizao.project.business.service;
+
+import cn.ezhizao.project.business.domain.Sfc10400;
+import cn.ezhizao.project.business.domain.Sfc10401;
+import cn.ezhizao.project.business.domain.Sfc10500;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+public interface ISfc10500Service extends IService<Sfc10500>
+{
+    List<Sfc10500> getList(QueryWrapper<Sfc10500> queryWrapper);
+
+}

src/main/java/cn/ezhizao/project/business/service/impl/Sfc10500ServiceImpl.java

@@ -0,0 +1,30 @@
+package cn.ezhizao.project.business.service.impl;
+
+import cn.ezhizao.framework.aspectj.lang.annotation.DataSource;
+import cn.ezhizao.framework.aspectj.lang.enums.DataSourceType;
+import cn.ezhizao.project.business.domain.Sfc10400;
+import cn.ezhizao.project.business.domain.Sfc10500;
+import cn.ezhizao.project.business.mapper.Sfc10500Mapper;
+import cn.ezhizao.project.business.service.ISfc10500Service;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.List;
+
+@Service
+public class Sfc10500ServiceImpl extends ServiceImpl<Sfc10500Mapper, Sfc10500> implements ISfc10500Service
+{
+    @Resource
+    private Sfc10500Mapper sfc10500Mapper;
+
+
+    @Override
+    @DataSource(value = DataSourceType.SLAVE)
+    public List<Sfc10500> getList(QueryWrapper<Sfc10500> queryWrapper)
+    {
+        return sfc10500Mapper.selectList(queryWrapper);
+    }
+}

src/main/resources/application-dev.yml

@@ -25,11 +25,10 @@ spring:
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: com.mysql.cj.jdbc.Driver
-        druid:
-            # 主库数据源
+        druid: # 主库数据源
             master:
                 driverClassName: com.mysql.cj.jdbc.Driver
-                url: jdbc:mysql://120.46.159.163:7306/ezhizao_dms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&rewriteBatchedStatements=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://120.46.159.163:7306/ezhizao_dms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&rewriteBatchedStatements=true&serverTimezone=GMT%2B8&connectTimeout=60000&socketTimeout=60000
                 username: root
                 password: ezhizao.cn123456
             # 从库数据源
@@ -37,12 +36,12 @@ spring:
                 driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
                 # 从数据源开关/默认关闭
                 enabled: true
-#                url: jdbc:sqlserver://120.46.159.163:1433;DatabaseName=p240_dianzi_xz
-#                username: sa
-#                password: ezhizao.cn123456
+                # url: jdbc:sqlserver://120.46.159.163:1433;DatabaseName=p240_dianzi_xz
+                # username: sa
+                # password: ezhizao.cn123456
                 url: jdbc:sqlserver://localhost:1433;DatabaseName=p240_dianzi_xz
                 username: sa
-                password: sa12345678
+                password: sa123456
             # 初始连接数
             initialSize: 5
             # 最小连接池数量

src/main/resources/application.yml

@@ -51,7 +51,8 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 192.168.10.40:8848 # Nacos服务器地址
+#        server-addr: 192.168.10.40:8848 # Nacos服务器地址
+        server-addr: 120.46.159.163:7148 # Nacos服务器地址
         namespace: ezhizao_dms # 命名空间
         #config:
         #server-addr: 114.116.195.82:8848 # Nacos服务器地址

src/main/resources/mybatis/business/Sfc10500Mapper.xml

@@ -0,0 +1,18 @@
+<?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="cn.ezhizao.project.business.mapper.Sfc10500Mapper">
+
+    <resultMap type="cn.ezhizao.project.business.domain.Sfc10500" id="Sfc10500Result">
+        <id column="lot" property="lot"/>
+    </resultMap>
+    <select id="getList" parameterType="Sfc10500" resultMap="Sfc10500Result">
+        select top 1 * from sfc10500
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            <if test="lotno != null "> AND lotno like concat('%', #{lotno}, '%')</if>
+            <if test="lotseq != null "> AND lotseq = #{lotseq}</if>
+        </trim>
+        order by peqty
+    </select>
+</mapper>