UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增库存出库模式，总库库存，上级库存，当前库存

Browse Source
zyy_db
anthonywj 2 years ago
parent be1475a5da
commit 27cc68ff98
5 changed files with 88 additions and 14 deletions
Show Stats Download Patch File Download Diff File

12
src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java
Unescape Escape View File

@ -172,4 +172,16 @@ public class UdiRelevanceEntity {
@TableField(value = "certIdFk")
private String certIdFk;
/**
* 上传状态 0:未上传；1:已上传；
*/
@TableField(value = "uploadFlag")
private Integer uploadFlag;
/**
* 上传日志信息
*/
@TableField(value = "uploadMsg")
private String uploadMsg;
}

12
src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.res.basic;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import java.math.BigDecimal;
@ -128,6 +129,17 @@ public class UdiRelevanceResponse {
private Long deId;
/**
* 上传状态 0:未上传；1:已上传；
*/
private Integer uploadFlag;
/**
* 上传日志信息
*/
private String uploadMsg;
private Integer bpcrid;
private String hslbName;

2
src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java
Unescape Escape View File

@ -296,7 +296,7 @@ public class InvWarehouseServiceImpl extends ServiceImpl<InvWarehouseDao, InvWar
if (StrUtil.isEmpty(invWarehouseEntity.getParentCode()))
return invWarehouseEntity;
else return findByInvSubByCode(invWarehouseEntity.getParentCode());
} else {
} else if (IntUtil.value(noInvType) == 2) {
while (StrUtil.isNotEmpty(invWarehouseEntity.getParentCode())) {
invWarehouseEntity = invWarehouseDao.selectOne(
new QueryWrapper<InvWarehouseEntity>().eq("code", invWarehouseEntity.getParentCode()).last("limit 1"));

7
src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java
Unescape Escape View File

@ -367,13 +367,18 @@ public class ThrProductsServiceImpl extends ServiceImpl<ThrProductsDao, ThrProdu
postRelProductRequest.setUdiRelevanceResponse(udiRelevanceResponse);
//上传第三方产品信息
BaseResponse baseResponse = erpBasicClient.postRelProduct(postRelProductRequest);
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceDao.selectById(udiRelevanceResponse.getId());
if (baseResponse.getCode() != 20000) {
udiRelevanceEntity.setUploadFlag(2);
udiRelevanceEntity.setUploadMsg(baseResponse.getMessage());
udiRelevanceDao.updateById(udiRelevanceEntity);
return ResultVOUtils.error(500, "上传失败！" + baseResponse.getMessage());
} else {
String thirdCode = (String) baseResponse.getData();
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceDao.selectById(udiRelevanceResponse.getId());
udiRelevanceEntity.setThirdId(thirdCode);
udiRelevanceEntity.setMainId(thirdCode);
udiRelevanceEntity.setUploadFlag(1);
udiRelevanceEntity.setUploadMsg("上传成功！" + thirdCode);
udiRelevanceDao.updateById(udiRelevanceEntity);
spGetHttpClient.postBasicRl(udiRelevanceEntity);
}

57
src/main/resources/schemas/schema_v2.4.sql
Unescape Escape View File

@ -100,15 +100,60 @@ CALL Pro_Temp_ColumnWork('io_order_detail_result', 'sterBatchNo', 'varchar(255)'
CALL Pro_Temp_ColumnWork('io_order_detail_result', 'sterDate', 'varchar(255)', 1);
UPDATE `auth_menu` SET `menu_name` = '耗材字典维护', `parent_id` = 1644, `order_num` = 1, `path` = 'maintain', `component` = 'basic/product/product', `query_param` = '{\"vueRouteSource\":1}', `is_frame` = 1, `is_cache` = 0, `menu_type` = 'C', `visible` = '0', `status` = '0', `perms` = 'basic:product:maintain', `icon` = NULL, `create_by` = '超级用户', `create_time` = '2023-01-11 17:02:20', `update_by` = NULL, `update_time` = NULL, `remark` = NULL WHERE `menu_id` = 1646;
UPDATE `auth_menu` SET `menu_name` = '产品信息导出', `parent_id` = 1616, `order_num` = 2, `path` = 'basic/product/product', `component` = 'basic/product/product', `query_param` = '{\"vueRouteSource\":2}', `is_frame` = 1, `is_cache` = 0, `menu_type` = 'C', `visible` = '0', `status` = '0', `perms` = 'thirdSys:product:export', `icon` = '', `create_by` = '超级用户', `create_time` = '2022-12-28 11:30:58', `update_by` = NULL, `update_time` = NULL, `remark` = NULL WHERE `menu_id` = 1618;
CREATE TABLE IF NOT EXISTS `thr_product_type` (
UPDATE `auth_menu`
SET `menu_name` = '耗材字典维护',
`parent_id` = 1644,
`order_num` = 1,
`path` = 'maintain',
`component` = 'basic/product/product',
`query_param` = '{\"vueRouteSource\":1}',
`is_frame` = 1,
`is_cache` = 0,
`menu_type` = 'C',
`visible` = '0',
`status` = '0',
`perms` = 'basic:product:maintain',
`icon` = NULL,
`create_by` = '超级用户',
`create_time` = '2023-01-11 17:02:20',
`update_by` = NULL,
`update_time` = NULL,
`remark` = NULL
WHERE `menu_id` = 1646;
UPDATE `auth_menu`
SET `menu_name` = '产品信息导出',
`parent_id` = 1616,
`order_num` = 2,
`path` = 'basic/product/product',
`component` = 'basic/product/product',
`query_param` = '{\"vueRouteSource\":2}',
`is_frame` = 1,
`is_cache` = 0,
`menu_type` = 'C',
`visible` = '0',
`status` = '0',
`perms` = 'thirdSys:product:export',
`icon` = '',
`create_by` = '超级用户',
`create_time` = '2022-12-28 11:30:58',
`update_by` = NULL,
`update_time` = NULL,
`remark` = NULL
WHERE `menu_id` = 1618;
CREATE TABLE IF NOT EXISTS `thr_product_type`
(
`id` int NOT NULL,
`code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '类别编码',
`name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '类别名称',
`thirdSys` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '第三系统标识',
`remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '备注',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
) ENGINE = InnoDB
CHARACTER SET = utf8mb4
COLLATE = utf8mb4_0900_ai_ci
ROW_FORMAT = Dynamic;
CALL Pro_Temp_ColumnWork('basic_udirel', 'uploadFlag', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('basic_udirel', 'uploadMsg', 'varchar(1024)', 1);

Write Preview
Loading…
Cancel
Save