From d3d9a620f39292b61d85087970d9dc81b6369d4c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 07 三月 2025 16:29:46 +0800
Subject: [PATCH] # 新增 1. 新增ASN单据 2. 新增ASN明细单据
---
rsf-server/src/main/java/asnOrder.sql | 1
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ErpApiServiceImpl.java | 2 -
rsf-server/src/main/java/asnOrderItem.sql | 9 ++--
rsf-server/src/main/java/com/vincent/rsf/server/common/config/SysStockProperties.java | 3 -
rsf-admin/src/i18n/zh.js | 36 +++++++++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java | 4 +-
rsf-admin/src/i18n/en.js | 36 +++++++++++++++++
rsf-admin/src/page/ResourceContent.js | 6 +++
rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java | 2
rsf-server/src/main/java/com/vincent/rsf/server/api/config/RemotesInfoProperties.java | 2
rsf-server/src/main/resources/application-dev.yml | 2
11 files changed, 88 insertions(+), 15 deletions(-)
diff --git a/rsf-admin/src/i18n/en.js b/rsf-admin/src/i18n/en.js
index 052d395..361b5b5 100644
--- a/rsf-admin/src/i18n/en.js
+++ b/rsf-admin/src/i18n/en.js
@@ -135,6 +135,8 @@
companys: 'Companys',
serialRuleItem: 'SerialRuleItem',
serialRule: 'SerialRule',
+ asnOrder: 'AsnOrder',
+ asnOrderItem: 'AsnOrderItem',
whMat: 'Warehouse Mat',
},
table: {
@@ -396,7 +398,39 @@
size: "size",
minWeight: "minWeight",
maxWeight: "maxWeight",
- }
+ },
+ asnOrder: {
+ code: "Code",
+ poCode: "poCode",
+ poId: "poId",
+ type: "Type",
+ wkType: "wkType",
+ anfme: "anfme",
+ qty: "qty",
+ logisNo: "logisNo",
+ arrTime: "Arrived",
+ rleStatus: "Release",
+ ntyStatus: "Notify",
+ },
+ asnOrderItem: {
+ asnId: "asnId",
+ asnCode: "asnCode",
+ poDetlId: "poDetlId",
+ poDetlCode: "poDetlCode",
+ matnrId: "matnrId",
+ matnk: "matnk",
+ anfme: "anfme",
+ stockUnit: "stockUnit",
+ purQty: "purQty",
+ purUnit: "purUnit",
+ qty: "qty",
+ splrCode: "splrCode",
+ splrName: "splrName",
+ qrcode: "qrcode",
+ barcode: "barcode",
+ packName: "packName",
+ ntyStatus: "ntyStatus",
+ },
}
},
page: {
diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js
index 4711164..13d96ee 100644
--- a/rsf-admin/src/i18n/zh.js
+++ b/rsf-admin/src/i18n/zh.js
@@ -134,6 +134,8 @@
companys: '寰�鏉ヤ紒涓�',
serialRuleItem: '缂栫爜瑙勫垯瀛愯〃',
serialRule: '缂栫爜瑙勫垯',
+ asnOrder: '鏀惰揣閫氱煡鍗�',
+ asnOrderItem: '鏀惰揣鏄庣粏',
whMat: '搴撳尯鐗╂枡鍏崇郴',
},
table: {
@@ -396,7 +398,39 @@
size: "灏哄",
minWeight: "鏈�灏忛噸閲�",
maxWeight: "鏈�澶ч噸閲�",
- }
+ },
+ asnOrder: {
+ code: "缂栫爜",
+ poCode: "PO缂栫爜",
+ poId: "PO鏍囪瘑",
+ type: "鍗曟嵁绫诲瀷",
+ wkType: "涓氬姟绫诲瀷",
+ anfme: "鏁伴噺",
+ qty: "宸插畬鎴愭暟閲�",
+ logisNo: "logisNo",
+ arrTime: "棰勮鍒拌揪鏃堕棿",
+ rleStatus: "閲婃斁鐘舵��",
+ ntyStatus: "璐ㄦ涓婃姤鐘舵��",
+ },
+ asnOrderItem: {
+ asnId: "涓诲崟鏍囪瘑",
+ asnCode: "涓诲崟缂栫爜",
+ poDetlId: "PO鍗曟爣璇�",
+ poDetlCode: "PO鍗曠紪鐮�",
+ matnrId: "鐗╂枡鏍囪瘑",
+ matnk: "鐗╂枡鍚嶇О",
+ anfme: "鏁伴噺",
+ stockUnit: "搴撳瓨鍗曚綅",
+ purQty: "閲囪喘鏁伴噺",
+ purUnit: "閲囪喘鍗曚綅",
+ qty: "宸插畬鎴愭暟閲�",
+ splrCode: "渚涘簲鍟嗙紪鐮�",
+ splrName: "渚涘簲鍟嗗悕绉�",
+ qrcode: "浜岀淮鐮�",
+ barcode: "鏉″舰鐮�",
+ packName: "鍖呰鍚嶇О",
+ ntyStatus: "鎶ユ鐘舵��",
+ },
}
},
page: {
diff --git a/rsf-admin/src/page/ResourceContent.js b/rsf-admin/src/page/ResourceContent.js
index c573c0a..cdaf109 100644
--- a/rsf-admin/src/page/ResourceContent.js
+++ b/rsf-admin/src/page/ResourceContent.js
@@ -27,6 +27,8 @@
import serialRuleItem from './system/serialRuleItem';
import serialRule from './system/serialRule';
import whMat from './basicInfo/whMat';
+import asnOrder from './asnOrder';
+import asnOrderItem from './asnOrderItem';
const ResourceContent = (node) => {
@@ -77,6 +79,10 @@
return serialRule;
case 'whMat':
return whMat;
+ case 'asnOrder':
+ return asnOrder;
+ case 'asnOrderItem':
+ return asnOrderItem;
default:
return {
list: ListGuesser,
diff --git a/rsf-server/src/main/java/asnOrder.sql b/rsf-server/src/main/java/asnOrder.sql
index d073bf2..18cbb48 100644
--- a/rsf-server/src/main/java/asnOrder.sql
+++ b/rsf-server/src/main/java/asnOrder.sql
@@ -23,6 +23,7 @@
arrTime: "arrTime",
rleStatus: "rleStatus",
name: "name",
+ ntyStatus: "ntyStatus",
},
-- ResourceContent
diff --git a/rsf-server/src/main/java/asnOrderItem.sql b/rsf-server/src/main/java/asnOrderItem.sql
index 7c92e02..87c7135 100644
--- a/rsf-server/src/main/java/asnOrderItem.sql
+++ b/rsf-server/src/main/java/asnOrderItem.sql
@@ -2,10 +2,10 @@
-- mysql
insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `tenant_id`, `status`) values ( 'menu.asnOrderItem', '0', '/manager/asnOrderItem', 'asnOrderItem', '0' , '0', '1' , '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Query ASN鍗曟嵁', '', '1', 'manager:asnOrderItem:list', '0', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Create ASN鍗曟嵁', '', '1', 'manager:asnOrderItem:save', '1', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Update ASN鍗曟嵁', '', '1', 'manager:asnOrderItem:update', '2', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Delete ASN鍗曟嵁', '', '1', 'manager:asnOrderItem:remove', '3', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Query ASN鍗曟嵁', '139', '1', 'manager:asnOrderItem:list', '0', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Create ASN鍗曟嵁', '139', '1', 'manager:asnOrderItem:save', '1', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Update ASN鍗曟嵁', '139', '1', 'manager:asnOrderItem:update', '2', '1', '1');
+insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Delete ASN鍗曟嵁', '139', '1', 'manager:asnOrderItem:remove', '3', '1', '1');
-- locale menu name
asnOrderItem: 'AsnOrderItem',
@@ -28,6 +28,7 @@
qrcode: "qrcode",
barcode: "barcode",
packName: "packName",
+ ntyStatus: "ntyStatus",
},
-- ResourceContent
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/config/RemotesInfoProperties.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/config/RemotesInfoProperties.java
index 1d07957..b8fae24 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/config/RemotesInfoProperties.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/config/RemotesInfoProperties.java
@@ -32,7 +32,7 @@
@Data
@Configuration
- @ConfigurationProperties(prefix = "platform.erp.apiInfo")
+ @ConfigurationProperties(prefix = "platform.erp.api")
public class ApiInfo {
/**
* 涓�閿笂鎶ヨ川妫�鎺ュ彛
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ErpApiServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ErpApiServiceImpl.java
index 47b143f..6ba6412 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ErpApiServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ErpApiServiceImpl.java
@@ -4,7 +4,6 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.vincent.rsf.common.domain.CommonReponse;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.config.RemotesInfoProperties;
@@ -12,7 +11,6 @@
import com.vincent.rsf.server.api.entity.enums.OrderType;
import com.vincent.rsf.server.api.entity.params.ErpInspectItem;
import com.vincent.rsf.server.api.entity.params.ErpInspectParams;
-import com.vincent.rsf.server.common.config.SysStockFlowProperties;
import com.vincent.rsf.server.manager.entity.AsnOrder;
import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import com.vincent.rsf.server.manager.entity.PurchaseItem;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java
index f118786..cc710a8 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/CodeBuilder.java
@@ -31,7 +31,7 @@
/*
CREATE TABLE `man_tablename` (
`id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT 'ID',
- `uuid` VARCHAR(255) DEFAULT NULL COMMENT '缂栧彿',
+ `code` VARCHAR(255) DEFAULT NULL COMMENT '缂栧彿',
`name` VARCHAR(255) DEFAULT NULL COMMENT '鍚嶇О(*)',
`status` INT(1) NOT NULL DEFAULT '1' COMMENT '鐘舵�亄1:姝ｅ父,0:鍐荤粨}',
`deleted` INT(1) NOT NULL DEFAULT '0' COMMENT '鏄惁鍒犻櫎{1:鏄�,0:鍚',
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/config/SysStockFlowProperties.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/config/SysStockProperties.java
similarity index 92%
rename from rsf-server/src/main/java/com/vincent/rsf/server/common/config/SysStockFlowProperties.java
rename to rsf-server/src/main/java/com/vincent/rsf/server/common/config/SysStockProperties.java
index c08e6c6..306fc3c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/config/SysStockFlowProperties.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/config/SysStockProperties.java
@@ -3,7 +3,6 @@
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
-import org.springframework.stereotype.Component;
/**
* @author Ryan
@@ -15,7 +14,7 @@
@Data
@Configuration
@ConfigurationProperties(prefix = "stock")
-public class SysStockFlowProperties {
+public class SysStockProperties {
/**
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
index eea897f..e811c81 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.common.config.SysStockFlowProperties;
+import com.vincent.rsf.server.common.config.SysStockProperties;
import com.vincent.rsf.server.common.utils.DateUtils;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.service.*;
@@ -44,7 +44,7 @@
private AsnOrderItemService asnOrderItemService;
@Resource
- private SysStockFlowProperties flowProperties;
+ private SysStockProperties flowProperties;
/**
* @author Ryan
* @description 鏍规嵁PO鍗曟嵁鐢熸垚ASN鍗�,鑷姩鐢熸垚ASN鍗曚负鍏ㄩ噺鐢熸垚
diff --git a/rsf-server/src/main/resources/application-dev.yml b/rsf-server/src/main/resources/application-dev.yml
index 34623d8..98555cf 100644
--- a/rsf-server/src/main/resources/application-dev.yml
+++ b/rsf-server/src/main/resources/application-dev.yml
@@ -78,7 +78,7 @@
#鎺ュ搧閾炬帴鍓嶇紑
prePath: rsf-server
#鎺ュ彛鏄庣粏
- apiInfo:
+ api:
#璐ㄦ涓婃姤鎺ュ彛
notifyInspect: /report/inspect
--
Gitblit v1.9.1