diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index bd9ac6d2..561ec873 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -722,6 +722,7 @@ public class UdiRelevanceController extends BaseController { udiRelevanceEntity.setGroupBuy(IntUtil.value(udiProductEntity.getGroupBuy())); udiRelevanceEntity.setPurType(udiProductEntity.getPurType()); udiRelevanceEntity.setAttributeType(udiProductEntity.getAttributeType()); + udiRelevanceEntity.setUpdateTime(new Date()); boolean b = udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); if (udiProductEntity.getRelSupId() != null) { UdiRlSupEntity udiRlSupEntity = new UdiRlSupEntity(); diff --git a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java index cbcf1692..834b96bf 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java @@ -108,7 +108,6 @@ public class UdiRelevanceEntity { @TableField(value = "attributeType") private Integer attributeType; - /** * 是否允许多次使用出库 */ diff --git a/src/main/resources/schemas/schema_v2.3.sql b/src/main/resources/schemas/schema_v2.3.sql index 87948621..bdb88cea 100644 --- a/src/main/resources/schemas/schema_v2.3.sql +++ b/src/main/resources/schemas/schema_v2.3.sql @@ -683,6 +683,43 @@ INSERT ignore INTO basic_product_set(`id`, `parmName`, `parmKey`, `enable`, `sup VALUES (33, '采购类型', 'purType', 1, 1, 1, 0, '采购类型是否必填字段', 65, 1); +CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'splitOrder', 'tinyint', 1); + + + +CREATE TABLE IF NOT EXISTS `thr_hslb` +( + `id` int NOT NULL AUTO_INCREMENT, + `hslb` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL, + `hsmc` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL, + `hsbm` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL, + `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL, + `updateTime` datetime(0) NULL DEFAULT NULL, + `createTime` datetime(0) NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB + AUTO_INCREMENT = 717 + CHARACTER SET = utf8mb4 + COLLATE = utf8mb4_0900_ai_ci + ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Table structure for thr_product_type +-- ---------------------------- +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; + +