#

luxiaotao1123

2023-12-19 4ac391a11290d21441ad9331076e6ee1a57aa6ee

#

 pom.xml

@@ -53,6 +53,23 @@
                <artifactId>framework</artifactId>
                <version>${cool.version}</version>
            </dependency>
            <!-- mybatis-plus -->
            <dependency>
                <groupId>com.baomidou</groupId>
                <artifactId>mybatis-plus-boot-starter</artifactId>
                <version>3.4.1</version>
            </dependency>
            <dependency>
                <groupId>com.baomidou</groupId>
                <artifactId>mybatis-plus-generator</artifactId>
                <version>3.4.1</version>
            </dependency>
            <!-- swagger -->
            <dependency>
                <groupId>io.springfox</groupId>
                <artifactId>springfox-boot-starter</artifactId>
                <version>3.0.0</version>
            </dependency>
        </dependencies>
    </dependencyManagement>


 zy-asrs-common/pom.xml

@@ -26,6 +26,22 @@
            <artifactId>fastjson</artifactId>
            <version>${fastjson.version}</version>
        </dependency>
        <!-- mybatis-plus -->
        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-boot-starter</artifactId>
            <version>3.4.1</version>
        </dependency>
        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-generator</artifactId>
            <version>3.4.1</version>
        </dependency>
        <dependency>
            <groupId>io.springfox</groupId>
            <artifactId>springfox-boot-starter</artifactId>
            <version>3.0.0</version>
        </dependency>
    </dependencies>

    <build>

 zy-asrs-common/src/main/java/com/zy/asrs/common/CommonApplication.java

File was deleted

 zy-asrs-common/src/main/java/com/zy/asrs/common/dao/PackMapper.java

New file
@@ -0,0 +1,15 @@
package com.zy.asrs.common.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zy.asrs.common.entity.Pack;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

import java.util.List;

@Repository
public interface PackMapper extends BaseMapper<Pack> {

    List<Pack> selectByMatnr(@Param("matnr") String matnr);

}

 zy-asrs-common/src/main/java/com/zy/asrs/common/entity/Pack.java

New file
@@ -0,0 +1,89 @@
package com.zy.asrs.common.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;

@Data
@TableName("man_pack")
public class Pack implements Serializable {

    private static final long serialVersionUID = 1L;

    /**
     * ID
     */
    @ApiModelProperty(value= "ID")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;

    /**
     * 条码
     */
    @ApiModelProperty(value= "条码")
    private String barcode;

    /**
     * 物料号
     */
    @ApiModelProperty(value= "物料号")
    private String matnr;

    /**
     * 序列码
     */
    @ApiModelProperty(value= "序列码")
    private String batch;

    /**
     * 订单状态
     */
    @ApiModelProperty(value= "订单状态")
    private Long settle;

    /**
     * 状态 1: 正常  0: 禁用
     */
    @ApiModelProperty(value= "状态 1: 正常  0: 禁用  ")
    private Integer status;

    /**
     * 添加时间
     */
    @ApiModelProperty(value= "添加时间")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date createTime;

    /**
     * 添加人员
     */
    @ApiModelProperty(value= "添加人员")
    private Long createBy;

    /**
     * 修改时间
     */
    @ApiModelProperty(value= "修改时间")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date updateTime;

    /**
     * 修改人员
     */
    @ApiModelProperty(value= "修改人员")
    private Long updateBy;

    /**
     * 备注
     */
    @ApiModelProperty(value= "备注")
    private String memo;

}

 zy-asrs-common/src/main/java/com/zy/asrs/common/service/PackService.java

New file
@@ -0,0 +1,13 @@
package com.zy.asrs.common.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.common.entity.Pack;
import org.apache.ibatis.annotations.Param;

import java.util.List;

public interface PackService extends IService<Pack> {

    List<Pack> selectByMatnr(String matnr);

}

 zy-asrs-common/src/main/java/com/zy/asrs/common/service/impl/PackServiceImpl.java

New file
@@ -0,0 +1,26 @@
package com.zy.asrs.common.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.common.dao.PackMapper;
import com.zy.asrs.common.entity.Pack;
import com.zy.asrs.common.service.PackService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * Created by vincent on 12/19/2023
 */
@Service("packService")
public class PackServiceImpl extends ServiceImpl<PackMapper, Pack> implements PackService {

    @Autowired
    private PackMapper packMapper;

    @Override
    public List<Pack> selectByMatnr(String matnr) {
        return this.packMapper.selectByMatnr(matnr);
    }

}

 zy-asrs-common/src/main/resources/application.properties

File was deleted

 zy-asrs-common/src/main/resources/mapper/PackMapper.xml

New file
@@ -0,0 +1,10 @@
<?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.zy.asrs.common.dao.PackMapper">


    <select id="selectByMatnr" resultType="com.zy.asrs.common.entity.Pack">
        select * from man_pack where matnr = #{matnr}
    </select>

</mapper>

 zy-asrs-wcs/src/main/resources/application.properties

File was deleted

 zy-asrs-wcs/src/main/resources/application.yml

New file
@@ -0,0 +1,4 @@
server:
  port: 8081
  servlet:
    context-path: /@pom.build.finalName@

 zy-asrs-wms/pom.xml

@@ -32,6 +32,22 @@
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
        </dependency>
        <dependency>
            <groupId>com.microsoft.sqlserver</groupId>
            <artifactId>mssql-jdbc</artifactId>
            <version>8.2.2.jre8</version>
        </dependency>
        <!-- mybatis-plus -->
        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-boot-starter</artifactId>
            <version>3.4.1</version>
        </dependency>
        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-generator</artifactId>
            <version>3.4.1</version>
        </dependency>

    </dependencies>


 zy-asrs-wms/src/main/java/com/zy/asrs/wms/WmsApplication.java

File was deleted

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/WmsBoot.java

New file
@@ -0,0 +1,19 @@
package com.zy.asrs.wms;

import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.ComponentScans;
import org.springframework.scheduling.annotation.EnableScheduling;

@MapperScan("com.zy.**.mapper")
@EnableScheduling
@SpringBootApplication
public class WmsBoot {

    public static void main(String[] args) {
        SpringApplication.run(WmsBoot.class, args);
    }

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/config/BeanConfig.java

New file
@@ -0,0 +1,12 @@
package com.zy.asrs.wms.config;

import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;

/**
 * Created by vincent on 12/19/2023
 */
@Configuration
@ComponentScan(value = "com.zy.asrs.common")
public class BeanConfig {
}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/PackController.java

New file
@@ -0,0 +1,28 @@
package com.zy.asrs.wms.controller;

import com.alibaba.fastjson.JSON;
import com.zy.asrs.common.entity.Pack;
import com.zy.asrs.common.service.PackService;
import com.zy.asrs.common.service.TestService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;

import java.util.List;

/**
 * Created by vincent on 12/19/2023
 */
@RestController
public class PackController {

    @Autowired
    private PackService packService;

    @GetMapping("/test")
    public String get() {
        List<Pack> packs = packService.selectByMatnr("1");
        return JSON.toJSONString(packs);
    }

}

 zy-asrs-wms/src/main/resources/application.properties

File was deleted

 zy-asrs-wms/src/main/resources/application.yml

New file
@@ -0,0 +1,41 @@
server:
  port: 8081
  servlet:
    context-path: /@pom.build.finalName@

spring:
  application:
    name: @pom.build.finalName@
  jmx:
    enabled: false
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    #url: jdbc:sqlserver://192.168.4.15:1433;databasename=tzskasrs
    url: jdbc:sqlserver://localhost:1433;databasename=jmasrs
    username: sa
    password: sa@123
  mvc:
    static-path-pattern: /**
  servlet:
    multipart:
      maxFileSize: 100MB
      maxRequestSize: 100MB

mybatis-plus:
  mapper-locations: classpath:mapper/*.xml
  #  global-config:
  #    field-strategy: 0
  configuration:
    #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
    map-underscore-to-camel-case: true
    cache-enabled: true
  global-config:
    :banner: false
    db-config:
      id-type: auto
      logic-delete-value: 1
      logic-not-delete-value: 0

logging:
  file:
    path: /stock/out/@pom.build.finalName@/logs