Commit Graph
-
d4ce403(HEAD -> develop) Merge pull request '修改更新的条件' (#458) from fix_om into develop by 2022-03-24 11:21:17 +0800 -
bdfbe22(refs/pull/458/head, fix_om) 修改更新的条件 by 2022-03-24 10:44:18 +0800 -
7693957Merge pull request '修包装单号' (#457) from fix_snrTwo into develop by 2022-03-21 15:13:52 +0800 -
c9546ad(refs/pull/457/head, fix_snrTwo) 包装单号升级2.0 by 2022-03-21 15:12:16 +0800 -
994b33a修包装单号 by 2022-03-11 11:36:06 +0800 -
3996863Merge pull request '包装单号修改' (#456) from fix_snr into develop by 2022-03-11 11:20:09 +0800 -
c5f8586(refs/pull/456/head, fix_snr) 包装单号修改 by 2022-03-11 11:16:23 +0800 -
0c70c3aMerge pull request '解决了并发问题' (#455) from fix_packRepair into develop by 2022-02-21 16:13:22 +0800 -
8158d37(refs/pull/455/head, fix_packRepair) 解决了并发问题 by 2022-02-21 16:11:48 +0800 -
98427c8Merge pull request '提交返修条码' (#454) from fix_packRepair into develop by 2022-02-14 15:56:53 +0800 -
462b310(refs/pull/454/head) 提交返修条码 by 2022-02-14 15:55:35 +0800 -
f17b504Merge pull request '修改返修生成的条码规则' (#453) from fix_om into develop by 2022-02-14 15:26:31 +0800 -
90d45ce(refs/pull/453/head) Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into fix_om by 2022-02-14 15:23:39 +0800 -
c680085修改返修生成的条码规则 by 2022-02-14 15:23:25 +0800 -
5d01c5aMerge pull request '返修修改' (#452) from fix_logPackorder into develop by 2022-02-10 11:55:18 +0800 -
58b7b17(refs/pull/452/head, fix_logPackorder) 返修修改 by 2022-02-10 11:53:52 +0800 -
4ead0c5Merge pull request '包装扫描分类' (#451) from fix_logPackorder into develop by 2022-01-18 13:59:54 +0800 -
1d8a922(refs/pull/451/head) 包装扫描分类 by 2022-01-18 13:58:06 +0800 -
37e5256Merge pull request '从mes一次同步10条改为一次同步所有符合条件的' (#450) from fix_om into develop by 2022-01-13 10:05:04 +0800 -
e61f80f(refs/pull/450/head) Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into fix_om by 2022-01-13 10:02:43 +0800 -
12bd181Merge pull request '返修条码进包装变更' (#449) from feature_barcode into develop by 2022-01-13 10:02:19 +0800 -
6299944从mes一次同步10条改为一次同步所有符合条件的 by 2022-01-13 10:01:32 +0800 -
702d523(refs/pull/449/head, feature_barcode) 返修条码进包装变更 by 2022-01-05 09:46:13 +0800 -
b0435c6Merge pull request '条码打印更新及其包装单数量错误' (#448) from feature_barcode into develop by 2021-12-31 17:28:26 +0800 -
f3172c8(refs/pull/448/head) 条码打印更新及其包装单数量错误 by 2021-12-31 17:27:17 +0800 -
9230cfbMerge pull request '修改弧焊机返修订单号' (#447) from fix_editOrder into develop by 2021-12-27 18:10:33 +0800 -
0294ba0(refs/pull/447/head, fix_editOrder) 修改弧焊机返修订单号 by 2021-12-27 18:09:22 +0800 -
b461067Merge pull request '添加打印日志' (#446) from fix_printer1 into develop by 2021-12-20 18:10:27 +0800 -
9d3922a(refs/pull/446/head, fix_printer1) 添加打印日志 by 2021-12-20 16:06:38 +0800 -
c2f9b31Merge pull request '更新数量' (#445) from fix_qty into develop by 2021-11-22 16:30:33 +0800 -
731efc2(refs/pull/445/head, fix_qty) 更新数量 by 2021-11-22 16:29:28 +0800 -
7f469efMerge pull request '返修逻辑添加及其自动打印功能' (#444) from feture_fanxiupack into develop by 2021-11-22 15:15:59 +0800 -
436c09d(refs/pull/444/head, feture_fanxiupack) Merge branch 'develop' into feture_fanxiupack by 2021-11-22 15:15:09 +0800 -
45cf9a0Merge pull request '1.向mes里写入workOrder写入sort字段,2.修改生成的流水号使用的日期为当前日期 不再使用计划开始日期' (#443) from fix_om into develop by 2021-11-22 15:11:16 +0800 -
6a00820返修逻辑添加及其自动打印功能 by 2021-11-22 15:06:33 +0800 -
63bbb7e(refs/pull/443/head) 向mes里写入workOrder写入sort字段 by 2021-11-18 09:01:14 +0800 -
3310866修改读取日志配置的方法 by 2021-11-18 09:00:54 +0800 -
7a9d869Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into fix_om by 2021-11-18 08:56:30 +0800 -
2882871Merge pull request '选中创建的包装单' (#442) from feature_pack into develop by 2021-11-17 11:27:00 +0800 -
2954563(refs/pull/442/head, feature_pack) 选中创建的包装单 by 2021-11-17 11:24:02 +0800 -
9e5133d修改生成的流水号使用的日期为当前日期 不再使用计划开始日期 by 2021-11-16 09:14:28 +0800 -
d7ddbbfMerge pull request '进入发运车的包装不能拆包' (#441) from feature_log into develop by 2021-11-10 11:12:11 +0800 -
ce49103(refs/pull/441/head, feature_log) 进入发运车的包装不能拆包 by 2021-11-10 11:09:54 +0800 -
34b7be4Merge pull request '打印替换客户零件号' (#440) from feature_log into develop by 2021-11-09 15:43:28 +0800 -
c87ca48(refs/pull/440/head) 打印替换客户零件号 by 2021-11-09 15:41:35 +0800 -
7b26fe7(feature_om) Merge pull request '添加支持导入excel中物料是carset类型的解析功能,修改查询workOrder的排序字段' (#439) from feature_om into develop by 2021-11-04 10:10:36 +0800 -
91e9d0a(refs/pull/439/head) 添加支持导入excel中物料是carset类型的解析功能 by 2021-11-04 09:53:10 +0800 -
af818b0修改查询workOrder的排序字段 by 2021-11-04 09:52:07 +0800 -
04694eb定时任务只解析A30的文件需求任务 by 2021-11-04 09:51:29 +0800 -
90746d1修复写入bom出现不是Carset类型 不能写入的bug by 2021-11-04 09:50:34 +0800 -
9f4960fMerge pull request '条码替代零件号' (#438) from fix_print into develop by 2021-11-01 09:17:37 +0800 -
a47f2b6(refs/pull/438/head) 条码替代零件号 by 2021-11-01 09:16:18 +0800 -
6e3db2eMerge pull request '添加所有物料车型的接口' (#437) from feature_base into develop by 2021-10-28 16:17:13 +0800 -
b56b008(refs/pull/437/head) Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into feature_om by 2021-10-28 16:15:24 +0800 -
381490b添加所有物料车型的接口 by 2021-10-28 16:15:08 +0800 -
13f1711Merge pull request '添加字段version' (#436) from feature_om into develop by 2021-10-28 15:08:57 +0800 -
feca711(refs/pull/436/head) Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_BACKEND into feature_om by 2021-10-28 15:07:21 +0800 -
5a8feab添加字段version by 2021-10-28 15:07:12 +0800 -
c846a04Merge pull request '打印模板修改' (#435) from fix_print into develop by 2021-10-28 13:51:48 +0800 -
adf7ae9(refs/pull/435/head) 打印模板修改 by 2021-10-28 13:50:30 +0800 -
0819eb5Merge pull request '包装单扫描进发运车逻辑修改' (#434) from feature_carshippackorder into develop by 2021-10-28 13:02:44 +0800 -
10b793f(refs/pull/434/head) 包装单扫描进发运车逻辑修改 by 2021-10-28 13:01:49 +0800 -
757979eMerge pull request 'article新增字段status 创建订单时校验是否启用' (#433) from feature_om into develop by 2021-10-28 10:01:36 +0800 -
897f541(refs/pull/433/head) 创建订单时校验物料是否启用 by 2021-10-28 09:57:06 +0800 -
d8a335e生成的工单流水号使用article的partId by 2021-10-28 09:56:43 +0800 -
afe1e2a添加新字段status by 2021-10-28 09:56:00 +0800 -
ee23481Merge pull request '修复派生总成下单没有写入生产开关和JPH数据的bug' (#432) from feature_om into develop by 2021-10-27 17:02:36 +0800 -
fcb7a78(refs/pull/432/head) 修复派生总成下单没有写入生产开关和JPH数据的bug by 2021-10-27 17:01:30 +0800 -
1c63adcMerge pull request '侧边栏搜索' (#431) from fix_carshiporder into develop by 2021-10-27 15:30:39 +0800 -
095aced(refs/pull/431/head) debug关闭 by 2021-10-27 15:26:13 +0800 -
d83b6a1侧边栏搜索 by 2021-10-27 15:24:44 +0800 -
f0d8763Merge pull request '发运扫描修改' (#430) from fix_carship into develop by 2021-10-26 17:44:19 +0800 -
32939e1(refs/pull/430/head) 发运扫描修改 by 2021-10-26 17:42:47 +0800 -
e068279Merge pull request '增加序号' (#429) from feature_shipOrder into develop by 2021-10-26 16:47:56 +0800 -
b10c52c(refs/pull/429/head) 增加序号 by 2021-10-26 16:47:09 +0800 -
bdadcbcMerge pull request '包装返回信息' (#428) from fix_car into develop by 2021-10-26 16:44:38 +0800 -
a24b389(refs/pull/428/head) 包装返回信息 by 2021-10-26 16:43:22 +0800 -
26f273bMerge pull request '订单描述取订单号' (#427) from feature_shipOrder into develop by 2021-10-26 16:23:12 +0800 -
140596b(refs/pull/427/head) 订单描述取订单号 by 2021-10-26 16:21:33 +0800 -
340d662Merge pull request '关包校验' (#426) from fix_packorders into develop by 2021-10-26 16:19:41 +0800 -
97b2f43(refs/pull/426/head) 关包校验 by 2021-10-26 16:18:05 +0800 -
c7e4511Merge pull request '运单导入增加对格式列的限制' (#425) from feature_shipOrder into develop by 2021-10-26 15:08:55 +0800 -
8c85c75(refs/pull/425/head) 运单导入增加对格式列的限制 by 2021-10-26 14:29:26 +0800 -
a2decccMerge pull request '包装模板修改' (#424) from feature_carShip into develop by 2021-10-26 14:02:45 +0800 -
4bd2545(refs/pull/424/head) 包装模板修改 by 2021-10-26 13:59:27 +0800 -
a58cd1dMerge pull request '发运扫描' (#423) from feature_carShip into develop by 2021-10-26 13:06:16 +0800 -
6ecf420(refs/pull/423/head) 发运扫描 by 2021-10-26 13:05:11 +0800 -
c1a5857Merge pull request '运费模板bug更新' (#422) from feature_shipOrder into develop by 2021-10-26 11:13:25 +0800 -
ce7c6d9(refs/pull/422/head) 运费模板bug更新 by 2021-10-26 11:11:30 +0800 -
cef04fdMerge pull request '发运单导入完成' (#421) from feature_shipOrder into develop by 2021-10-26 10:52:08 +0800 -
8182056(refs/pull/421/head) 发运单导入完成 by 2021-10-26 10:50:59 +0800 -
08b9f69Merge pull request 'feature_shipOrder -3' (#420) from feature_shipOrder into develop by 2021-10-26 10:06:25 +0800 -
dd54f8f(refs/pull/420/head) 发运模板冲突 -3 by 2021-10-26 10:04:40 +0800 -
644c85fMerge remote-tracking branch 'origin/feature_shipOrder' into feature_shipOrder by 2021-10-26 10:03:51 +0800 -
4a96b8c发货模板 -2 解决冲突 by 2021-10-26 09:55:40 +0800 -
c41da0e(refs/pull/419/head) 发货模板-2 by 2021-10-26 09:33:21 +0800 -
257e69cMerge pull request '打印模板提交' (#418) from feature_packbin into develop by 2021-10-25 17:51:47 +0800 -
641801d(refs/pull/418/head) 打印模板提交 by 2021-10-25 17:50:36 +0800 -
b3bce20Merge pull request 'feature_shipOrder' (#417) from feature_shipOrder into develop by 2021-10-25 17:46:57 +0800 -
1d96ef5(refs/pull/417/head) 运货到导入 by 2021-10-25 17:26:51 +0800