yunxi
/
mes-majoys
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://222.71.165.188:3000/yunxi/mes-majoys into dev

Browse Source
dev
qiuhongwu 3 months ago
parent 0b34e39a91 1f475e7347
commit e5edb57cba
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File

1
mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/service/storage/StorageServiceImpl.java
Unescape View File

@ -382,6 +382,7 @@ public class StorageServiceImpl implements StorageService {
tplusLastestStockDO.setInventoryId(String.valueOf(matDo.getId()));
tplusLastestStockDO.setInventoryName(matDo.getName());
tplusLastestStockDO.setInventoryCode(matDo.getCode());
tplusLastestStockMapper.insert(tplusLastestStockDO);
}
});
}

39
sql/v1.0.0/2.business/1.structure.sql
Unescape View File

@ -563,4 +563,41 @@ CREATE TABLE `base_material_color` (
`deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
`tenant_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '租户编号',
PRIMARY KEY (`id`)
) ENGINE=InnoDB COMMENT='物料颜色表';
) ENGINE=InnoDB COMMENT='物料颜色表';
INSERT INTO `mes-majoys-pro-test`.`base_cn_en` (`cn`, `en`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES ('平板门','FLAT','2', '2024-07-31 16:00:23', '2', '2024-07-31 16:00:23', b'0', 2);
INSERT INTO `mes-majoys-pro-test`.`base_cn_en` (`cn`, `en`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES ('三线门','3VERTICAL','2', '2024-07-31 16:00:23', '2', '2024-07-31 16:00:23', b'0', 2);
INSERT INTO `mes-majoys-pro-test`.`base_cn_en` (`cn`, `en`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES ('四线门','4 LINE','2', '2024-07-31 16:00:23', '2', '2024-07-31 16:00:23', b'0', 2);
INSERT INTO `mes-majoys-pro-test`.`base_cn_en` (`cn`, `en`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES ('走一圈门','ONE PANEL','2', '2024-07-31 16:00:23', '2', '2024-07-31 16:00:23', b'0', 2);
INSERT INTO `mes-majoys-pro-test`.`base_cn_en` (`cn`, `en`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES ('方块门','SQUARE','2', '2024-07-31 16:00:23', '2', '2024-07-31 16:00:23', b'0', 2);
INSERT INTO `mes-majoys-pro-test`.`base_cn_en` (`cn`, `en`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES ('窄玻璃门','NARROW GLASS','2', '2024-07-31 16:00:23', '2', '2024-07-31 16:00:23', b'0', 2);
INSERT INTO `mes-majoys-pro-test`.`base_cn_en` (`cn`, `en`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES ('方块玻璃门','SQUARE GLASS','2', '2024-07-31 16:00:23', '2', '2024-07-31 16:00:23', b'0', 2);
INSERT INTO `mes-majoys-pro-test`.`base_cn_en` (`cn`, `en`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES ('平板移门','FLAT (SLIDE)','2', '2024-07-31 16:00:23', '2', '2024-07-31 16:00:23', b'0', 2);
INSERT INTO `mes-majoys-pro-test`.`base_cn_en` (`cn`, `en`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES ('三线移门','3VERTICAL (SLIDE)','2', '2024-07-31 16:00:23', '2', '2024-07-31 16:00:23', b'0', 2);
INSERT INTO `mes-majoys-pro-test`.`base_cn_en` (`cn`, `en`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES ('四线移门','4 LINE (SLIDE)','2', '2024-07-31 16:00:23', '2', '2024-07-31 16:00:23', b'0', 2);
INSERT INTO `mes-majoys-pro-test`.`base_cn_en` (`cn`, `en`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES ('走一圈移门','ONE PANEL (SLIDE)','2', '2024-07-31 16:00:23', '2', '2024-07-31 16:00:23', b'0', 2);
INSERT INTO `mes-majoys-pro-test`.`base_cn_en` (`cn`, `en`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES ('方块移门','SQUARE (SLIDE)','2', '2024-07-31 16:00:23', '2', '2024-07-31 16:00:23', b'0', 2);
INSERT INTO `mes-majoys-pro-test`.`base_cn_en` (`cn`, `en`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES ('2T型门','2T DOORS LEAF','2', '2024-07-31 16:00:23', '2', '2024-07-31 16:00:23', b'0', 2);
INSERT INTO `mes-majoys-pro-test`.`base_cn_en` (`cn`, `en`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES ('3T型门','3T DOORS LEAF','2', '2024-07-31 16:00:23', '2', '2024-07-31 16:00:23', b'0', 2);
INSERT INTO `mes-majoys-pro-test`.`base_cn_en` (`cn`, `en`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES ('组框门','ASSEMBIED DOOR','2', '2024-07-31 16:00:23', '2', '2024-07-31 16:00:23', b'0', 2);
INSERT INTO `mes-majoys-pro-test`.`base_cn_en` (`cn`, `en`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES ('E100横头','E100 Short head ','2', '2024-07-31 16:00:23', '2', '2024-07-31 16:00:23', b'0', 2);
INSERT INTO `mes-majoys-pro-test`.`base_cn_en` (`cn`, `en`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES ('E120横头','E120 Short head ','2', '2024-07-31 16:00:23', '2', '2024-07-31 16:00:23', b'0', 2);
INSERT INTO `mes-majoys-pro-test`.`base_cn_en` (`cn`, `en`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES ('E140横头','E140 Short head ','2', '2024-07-31 16:00:23', '2', '2024-07-31 16:00:23', b'0', 2);
INSERT INTO `mes-majoys-pro-test`.`base_cn_en` (`cn`, `en`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES ('B180横头','B180 Short head ','2', '2024-07-31 16:00:23', '2', '2024-07-31 16:00:23', b'0', 2);
INSERT INTO `mes-majoys-pro-test`.`base_cn_en` (`cn`, `en`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES ('B220横头','B220 Short head ','2', '2024-07-31 16:00:23', '2', '2024-07-31 16:00:23', b'0', 2);
INSERT INTO `mes-majoys-pro-test`.`base_cn_en` (`cn`, `en`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES ('B260横头','B260 Short head ','2', '2024-07-31 16:00:23', '2', '2024-07-31 16:00:23', b'0', 2);
INSERT INTO `mes-majoys-pro-test`.`base_cn_en` (`cn`, `en`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES ('E100门套','E100 Frame','2', '2024-07-31 16:00:23', '2', '2024-07-31 16:00:23', b'0', 2);
INSERT INTO `mes-majoys-pro-test`.`base_cn_en` (`cn`, `en`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES ('E120门套','E120 Frame','2', '2024-07-31 16:00:23', '2', '2024-07-31 16:00:23', b'0', 2);
INSERT INTO `mes-majoys-pro-test`.`base_cn_en` (`cn`, `en`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES ('E140门套','E140 Frame','2', '2024-07-31 16:00:23', '2', '2024-07-31 16:00:23', b'0', 2);
INSERT INTO `mes-majoys-pro-test`.`base_cn_en` (`cn`, `en`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES ('B180门套','B180 Frame','2', '2024-07-31 16:00:23', '2', '2024-07-31 16:00:23', b'0', 2);
INSERT INTO `mes-majoys-pro-test`.`base_cn_en` (`cn`, `en`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES ('B220门套','B220 Frame','2', '2024-07-31 16:00:23', '2', '2024-07-31 16:00:23', b'0', 2);
INSERT INTO `mes-majoys-pro-test`.`base_cn_en` (`cn`, `en`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES ('B260门套','B260 Frame','2', '2024-07-31 16:00:23', '2', '2024-07-31 16:00:23', b'0', 2);
INSERT INTO `mes-majoys-pro-test`.`base_cn_en` (`cn`, `en`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES ('移门套','SLIDING FRAME','2', '2024-07-31 16:00:23', '2', '2024-07-31 16:00:23', b'0', 2);
INSERT INTO `mes-majoys-pro-test`.`base_cn_en` (`cn`, `en`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES ('移门线条','SLIDING FRAME SHORT','2', '2024-07-31 16:00:23', '2', '2024-07-31 16:00:23', b'0', 2);
INSERT INTO `mes-majoys-pro-test`.`base_cn_en` (`cn`, `en`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES ('E60延长套','E60 Extender','2', '2024-07-31 16:00:23', '2', '2024-07-31 16:00:23', b'0', 2);
INSERT INTO `mes-majoys-pro-test`.`base_cn_en` (`cn`, `en`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES ('E100延长套','E100 Extender','2', '2024-07-31 16:00:23', '2', '2024-07-31 16:00:23', b'0', 2);
INSERT INTO `mes-majoys-pro-test`.`base_cn_en` (`cn`, `en`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES ('T90线条','T90 DRESSING ','2', '2024-07-31 16:00:23', '2', '2024-07-31 16:00:23', b'0', 2);
INSERT INTO `mes-majoys-pro-test`.`base_cn_en` (`cn`, `en`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES ('L60线条','L60 DRESSING ','2', '2024-07-31 16:00:23', '2', '2024-07-31 16:00:23', b'0', 2);
INSERT INTO `mes-majoys-pro-test`.`base_cn_en` (`cn`, `en`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES ('L60*60线条','L60*60 DRESSING ','2', '2024-07-31 16:00:23', '2', '2024-07-31 16:00:23', b'0', 2);
INSERT INTO `mes-majoys-pro-test`.`base_cn_en` (`cn`, `en`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES ('L97*97线条','L97*97 DRESSING ','2', '2024-07-31 16:00:23', '2', '2024-07-31 16:00:23', b'0', 2);
INSERT INTO `mes-majoys-pro-test`.`base_cn_en` (`cn`, `en`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES ('L80线条','L80 DRESSING ','2', '2024-07-31 16:00:23', '2', '2024-07-31 16:00:23', b'0', 2);
INSERT INTO `mes-majoys-pro-test`.`base_cn_en` (`cn`, `en`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES ('L100*42线条','L100*42 DRESSING ','2', '2024-07-31 16:00:23', '2', '2024-07-31 16:00:23', b'0', 2);

Write Preview
Loading…
Cancel
Save