init

src/main/java/com/gaotao/modules/po/controller/PoController.java

@@ -0,0 +1,30 @@
+package com.gaotao.modules.po.controller;
+
+
+import com.gaotao.common.utils.R;
+import com.gaotao.modules.po.entity.PurchaseOrder;
+import com.gaotao.modules.po.service.PoService;
+import com.gaotao.modules.sys.controller.AbstractController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RequestMapping("po")
+@RestController
+public class PoController extends AbstractController {
+
+    @Autowired
+    private PoService poService;
+
+    @PostMapping("getPoList")
+    public R getPoList(@RequestBody PurchaseOrder purchaseOrder){
+        List<PurchaseOrder> list = poService.getPoList(purchaseOrder);
+        return R.ok().put("rows",list);
+    }
+
+
+}

src/main/java/com/gaotao/modules/po/dao/PoMapper.java

@@ -0,0 +1,10 @@
+package com.gaotao.modules.po.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.gaotao.modules.po.entity.PurchaseOrder;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface PoMapper extends BaseMapper<PurchaseOrder> {
+
+}

src/main/java/com/gaotao/modules/po/entity/PurchaseOrder.java

@@ -0,0 +1,25 @@
+package com.gaotao.modules.po.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@TableName("PurchaseOrder")
+@Data
+public class PurchaseOrder {
+
+    // PO号码 行号 下达号 商品编码 计量单位 商品名称 订单数量 待收数量 此次接收数量 制造日期 失效日期 批号
+    private String poNumber;
+    private String wdr;
+    private String orderNumber;
+    private String code;
+    private String unit;
+    private String desc;
+    private BigDecimal qty;
+    private BigDecimal recvQty;
+    private BigDecimal thisRecvQty;
+    private String makeDate;
+    private String expireDate;
+    private String batchNumber;
+}

src/main/java/com/gaotao/modules/po/service/PoService.java

@@ -0,0 +1,12 @@
+package com.gaotao.modules.po.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gaotao.modules.po.entity.PurchaseOrder;
+
+import java.util.List;
+
+public interface PoService extends IService<PurchaseOrder> {
+
+    List<PurchaseOrder> getPoList(PurchaseOrder accessSite);
+
+}

src/main/java/com/gaotao/modules/po/service/impl/PoServiceImpl.java

@@ -0,0 +1,87 @@
+package com.gaotao.modules.po.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gaotao.modules.po.dao.PoMapper;
+import com.gaotao.modules.po.entity.PurchaseOrder;
+import com.gaotao.modules.po.service.PoService;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class PoServiceImpl extends ServiceImpl<PoMapper, PurchaseOrder> implements PoService {
+
+    @Override
+    public List<PurchaseOrder> getPoList(PurchaseOrder purchaseOrder) {
+        List<PurchaseOrder> list = new ArrayList<>();
+        PurchaseOrder po = new PurchaseOrder();
+        po.setWdr("1-1");
+        po.setCode("22090897" );
+        po.setUnit("卷" );
+        po.setDesc("PC模 230*230 UE PET" );
+        po.setQty(new BigDecimal(100));
+        po.setRecvQty(new BigDecimal(50));
+        po.setThisRecvQty(new BigDecimal(50));
+        po.setMakeDate("制单日期" );
+        po.setExpireDate("到期日期" );
+        po.setBatchNumber("批次号" );
+        list.add(po);
+
+        PurchaseOrder po1 = new PurchaseOrder();
+        po1.setWdr("1-2");
+        po1.setCode("22090231" );
+        po1.setUnit("卷" );
+        po1.setDesc("PC模 230*230 UE PET" );
+        po1.setQty(new BigDecimal(100));
+        po1.setRecvQty(new BigDecimal(50));
+        po1.setThisRecvQty(new BigDecimal(50));
+        po1.setMakeDate("制单日期" );
+        po1.setExpireDate("到期日期" );
+        po1.setBatchNumber("批次号" );
+        list.add(po1);
+
+        PurchaseOrder po2 = new PurchaseOrder();
+        po2.setWdr("1-3");
+        po2.setCode("45133221" );
+        po2.setUnit("罐" );
+        po2.setDesc("UV油墨 5KG/罐 金利宝" );
+        po2.setQty(new BigDecimal(100));
+        po2.setRecvQty(new BigDecimal(50));
+        po2.setThisRecvQty(new BigDecimal(50));
+        po2.setMakeDate("制单日期" );
+        po2.setExpireDate("到期日期" );
+        po2.setBatchNumber("批次号" );
+        list.add(po2);
+
+        PurchaseOrder po3 = new PurchaseOrder();
+        po3.setWdr("1-4");
+        po3.setCode("398090897" );
+        po3.setUnit("卷" );
+        po3.setDesc("UV油墨 5KG/罐 金利宝" );
+        po3.setQty(new BigDecimal(100));
+        po3.setRecvQty(new BigDecimal(50));
+        po3.setThisRecvQty(new BigDecimal(50));
+        po3.setMakeDate("制单日期" );
+        po3.setExpireDate("到期日期" );
+        po3.setBatchNumber("批次号" );
+        list.add(po3);
+
+        PurchaseOrder po4 = new PurchaseOrder();
+        po4.setWdr("1-5");
+        po4.setCode("132090897" );
+        po4.setUnit("卷" );
+        po4.setDesc("PC模 230*230 UE PET" );
+        po4.setQty(new BigDecimal(100));
+        po4.setRecvQty(new BigDecimal(50));
+        po4.setThisRecvQty(new BigDecimal(50));
+        po4.setMakeDate("制单日期" );
+        po4.setExpireDate("到期日期" );
+        po4.setBatchNumber("批次号" );
+        list.add(po4);
+
+        return list;
+    }
+
+}

src/main/java/com/gaotao/modules/sys/entity/SysUserEntity.java

@@ -22,7 +22,6 @@ import java.util.List;
 @TableName("sys_user")
 public class SysUserEntity implements Serializable {
 	private static final long serialVersionUID = 1L;
-	
 	/**
 	 * 用户ID
 	 */
@@ -32,13 +31,13 @@ public class SysUserEntity implements Serializable {
 	/**
 	 * 用户名
 	 */
-	@NotBlank(message="用户名不能为空", groups = {AddGroup.class, UpdateGroup.class})
+	@NotBlank(message="user.submit.usernamenotblank", groups = {AddGroup.class, UpdateGroup.class})
 	private String username;
 
 	/**
 	 * 密码
 	 */
-	@NotBlank(message="密码不能为空", groups = AddGroup.class)
+	@NotBlank(message="user.submit.passwordnotblank", groups = AddGroup.class)
 	private String password;
 
 	/**

src/main/resources/application-dev.yml

@@ -5,7 +5,7 @@ spring:
       driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
       type: com.alibaba.druid.pool.DruidDataSource
       #url: jdbc:sqlserver://192.168.1.90:1433;databaseName=ckp-tid-report
-      url: jdbc:sqlserver://xujiesoft.vicp.net:11515;databaseName=ckp-tid-report
+      url: jdbc:sqlserver://192.168.1.90:1433;databaseName=ccl_wms
       username: sa
       password: XJsoft123
       initial-size: 10

src/main/resources/application.yml

@@ -4,7 +4,7 @@ server:
     uri-encoding: UTF-8
     max-threads: 1000
     min-spare-threads: 30
-  port: 8086
+  port: 8088
   connection-timeout: 5000ms
 
 spring: