From 4ac391a11290d21441ad9331076e6ee1a57aa6ee Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 19 十二月 2023 10:39:40 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/service/impl/PackServiceImpl.java | 26 ++++
zy-asrs-common/src/main/java/com/zy/asrs/common/service/PackService.java | 13 ++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/PackController.java | 28 ++++
zy-asrs-wms/src/main/resources/application.yml | 41 ++++++
zy-asrs-common/src/main/resources/mapper/PackMapper.xml | 10 +
zy-asrs-common/src/main/java/com/zy/asrs/common/entity/Pack.java | 89 ++++++++++++++
zy-asrs-common/pom.xml | 16 ++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/config/BeanConfig.java | 12 ++
zy-asrs-wcs/src/main/resources/application.yml | 4
pom.xml | 17 ++
zy-asrs-wms/pom.xml | 16 ++
/dev/null | 1
zy-asrs-wms/src/main/java/com/zy/asrs/wms/WmsBoot.java | 19 +++
zy-asrs-common/src/main/java/com/zy/asrs/common/dao/PackMapper.java | 15 ++
14 files changed, 306 insertions(+), 1 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2dda869..09dfdca 100644
--- a/pom.xml
+++ b/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>
diff --git a/zy-asrs-common/pom.xml b/zy-asrs-common/pom.xml
index 2a05c05..e2d13f6 100644
--- a/zy-asrs-common/pom.xml
+++ b/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>
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/CommonApplication.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/CommonApplication.java
deleted file mode 100644
index 89c5415..0000000
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/CommonApplication.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.zy.asrs.common;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class CommonApplication {
-
- public static void main(String[] args) {
- SpringApplication.run(CommonApplication.class, args);
- }
-
-}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/dao/PackMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/dao/PackMapper.java
new file mode 100644
index 0000000..0d31bab
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/dao/PackMapper.java
@@ -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);
+
+}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/entity/Pack.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/entity/Pack.java
new file mode 100644
index 0000000..9e746bb
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/entity/Pack.java
@@ -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;
+
+}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/service/PackService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/service/PackService.java
new file mode 100644
index 0000000..315007f
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/service/PackService.java
@@ -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);
+
+}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/service/impl/PackServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/service/impl/PackServiceImpl.java
new file mode 100644
index 0000000..a7850e9
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/service/impl/PackServiceImpl.java
@@ -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);
+ }
+
+}
diff --git a/zy-asrs-common/src/main/resources/application.properties b/zy-asrs-common/src/main/resources/application.properties
deleted file mode 100644
index 8b13789..0000000
--- a/zy-asrs-common/src/main/resources/application.properties
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/zy-asrs-common/src/main/resources/mapper/PackMapper.xml b/zy-asrs-common/src/main/resources/mapper/PackMapper.xml
new file mode 100644
index 0000000..75e11d8
--- /dev/null
+++ b/zy-asrs-common/src/main/resources/mapper/PackMapper.xml
@@ -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>
diff --git a/zy-asrs-wcs/src/main/resources/application.properties b/zy-asrs-wcs/src/main/resources/application.properties
deleted file mode 100644
index 8b13789..0000000
--- a/zy-asrs-wcs/src/main/resources/application.properties
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/zy-asrs-wcs/src/main/resources/application.yml b/zy-asrs-wcs/src/main/resources/application.yml
new file mode 100644
index 0000000..9018176
--- /dev/null
+++ b/zy-asrs-wcs/src/main/resources/application.yml
@@ -0,0 +1,4 @@
+server:
+ port: 8081
+ servlet:
+ context-path: /@pom.build.finalName@
diff --git a/zy-asrs-wms/pom.xml b/zy-asrs-wms/pom.xml
index 1a4262f..1b146df 100644
--- a/zy-asrs-wms/pom.xml
+++ b/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>
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/WmsApplication.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/WmsApplication.java
deleted file mode 100644
index 1280bc1..0000000
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/WmsApplication.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.zy.asrs.wms;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class WmsApplication {
-
- public static void main(String[] args) {
- SpringApplication.run(WmsApplication.class, args);
- }
-
-}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/WmsBoot.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/WmsBoot.java
new file mode 100644
index 0000000..6b3a1b7
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/WmsBoot.java
@@ -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);
+ }
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/config/BeanConfig.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/config/BeanConfig.java
new file mode 100644
index 0000000..9204f7c
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/config/BeanConfig.java
@@ -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 {
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/PackController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/PackController.java
new file mode 100644
index 0000000..5d700d4
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/PackController.java
@@ -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);
+ }
+
+}
diff --git a/zy-asrs-wms/src/main/resources/application.properties b/zy-asrs-wms/src/main/resources/application.properties
deleted file mode 100644
index 8b13789..0000000
--- a/zy-asrs-wms/src/main/resources/application.properties
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/zy-asrs-wms/src/main/resources/application.yml b/zy-asrs-wms/src/main/resources/application.yml
new file mode 100644
index 0000000..bab83ef
--- /dev/null
+++ b/zy-asrs-wms/src/main/resources/application.yml
@@ -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
\ No newline at end of file
--
Gitblit v1.9.1